pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

inn: Fix pkglint errors and warnings



Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Wed Sep 4 13:29:47 2019 +0200
Changeset:	e0ed48937099cd23cec1ac29f61c50807ec3b0f7

Modified Files:
	inn/Makefile
	inn/Makefile.common
	inn/distinfo
Added Files:
	inn/patches/patch-Makefile.global.in
	inn/patches/patch-configure
	inn/patches/patch-control_pgpverify.in
	inn/patches/patch-lib_fdlimit.c
	inn/patches/patch-perl_INN_Config.pm.in
	inn/patches/patch-scripts_news.daily.in
	inn/patches/patch-scripts_rc.news.in
	inn/patches/patch-site_Makefile
Removed Files:
	inn/patches/patch-aa
	inn/patches/patch-ab
	inn/patches/patch-ac
	inn/patches/patch-ad
	inn/patches/patch-ag
	inn/patches/patch-ah
	inn/patches/patch-ak
	inn/patches/patch-al

Log Message:
inn: Fix pkglint errors and warnings

- Add USE_LIBBTOOL=yes
- Do not define INN_DATA_DIR (provided by mk/bsd.prefs.mk)
- Do not add INN_DATA_DIR to BUILD_DEFS twice
- Rebuild patches for version 2.6.3 and document them
  (some comments can be improved with better knowledge of the program)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e0ed48937099cd23cec1ac29f61c50807ec3b0f7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 inn/Makefile                            |  5 ++++-
 inn/Makefile.common                     |  3 ++-
 inn/distinfo                            | 16 ++++++++--------
 inn/patches/patch-Makefile.global.in    | 15 +++++++++++++++
 inn/patches/patch-aa                    | 13 -------------
 inn/patches/patch-ab                    | 15 ---------------
 inn/patches/patch-ac                    | 13 -------------
 inn/patches/patch-ad                    | 14 --------------
 inn/patches/patch-ag                    | 13 -------------
 inn/patches/patch-ah                    | 24 ------------------------
 inn/patches/patch-ak                    | 13 -------------
 inn/patches/patch-al                    | 15 ---------------
 inn/patches/patch-configure             | 15 +++++++++++++++
 inn/patches/patch-control_pgpverify.in  | 15 +++++++++++++++
 inn/patches/patch-lib_fdlimit.c         | 18 ++++++++++++++++++
 inn/patches/patch-perl_INN_Config.pm.in | 15 +++++++++++++++
 inn/patches/patch-scripts_news.daily.in | 18 ++++++++++++++++++
 inn/patches/patch-scripts_rc.news.in    | 16 ++++++++++++++++
 inn/patches/patch-site_Makefile         | 26 ++++++++++++++++++++++++++
 19 files changed, 152 insertions(+), 130 deletions(-)

diffs:
diff --git a/inn/Makefile b/inn/Makefile
index 9c61556b76..eddffb02c4 100644
--- a/inn/Makefile
+++ b/inn/Makefile
@@ -14,9 +14,12 @@ LICENSE=		modified-bsd AND gnu-gpl-v2
 
 CONFLICTS+=		libradius-[0-9]* nntpclnt-[0-9]*
 
+USE_LIBTOOL=		yes
+
 .include "../../news/inn/Makefile.common"
 
-BUILD_DEFS+=		INN_DATA_DIR
+# Already done in Makefile.common
+#BUILD_DEFS+=		INN_DATA_DIR
 BUILD_DEFS+=		VARBASE
 
 FILES_SUBST+=		INN_DATA_DIR=${INN_DATA_DIR}
diff --git a/inn/Makefile.common b/inn/Makefile.common
index e3b743f76d..cd7ae2567f 100644
--- a/inn/Makefile.common
+++ b/inn/Makefile.common
@@ -5,7 +5,8 @@
 
 INN_PREFIX?=	${PREFIX}
 INN_PATHBIN?=	libexec/inn
-INN_DATA_DIR?=	${VARBASE}/news
+# Provided via mk/bsd.prefs.mk
+#INN_DATA_DIR?=	${VARBASE}/news
 INN_SPOOL?=	${INN_DATA_DIR}/spool
 
 BUILD_DEFS+=	INN_DATA_DIR
diff --git a/inn/distinfo b/inn/distinfo
index f1d01ed0e0..cd25618bec 100644
--- a/inn/distinfo
+++ b/inn/distinfo
@@ -4,11 +4,11 @@ SHA1 (inn-2.6.3.tar.gz) = 2a6646030c77b2332d167bcadfcda797822932d0
 RMD160 (inn-2.6.3.tar.gz) = 13a4a8a034f4e914b5579000f378203ad4037370
 SHA512 (inn-2.6.3.tar.gz) = 123881d474ce1df21983b3093827915706670a400d48c3945c32635cd2fa7f52be2470c39ad54b84cc31b5454d7a3be31feb306802957954a3450146e31f52cb
 Size (inn-2.6.3.tar.gz) = 2586168 bytes
-SHA1 (patch-aa) = 1801206391e5f37e75edad0955cfc426d4701e45
-SHA1 (patch-ab) = 28b341559ba7d132e8a6dbb0989e964b1d5849fd
-SHA1 (patch-ac) = edb03ca5998873627278764ed4e528f13f3f74fd
-SHA1 (patch-ad) = 96a38291dcd9a836dcaaa9f48ec6a8d2133dc7c6
-SHA1 (patch-ag) = 31bee657a4e35475e902cd179716328aa39ee4b1
-SHA1 (patch-ah) = 231ccb7c0402441760692c32fa0dafcf5c6a72aa
-SHA1 (patch-ak) = cdc37267d5f5151300b4c595b9274dc984c66651
-SHA1 (patch-al) = 3751913f2e7f1e530db9b2f6e762bdda314fd4fd
+SHA1 (patch-Makefile.global.in) = b10fc0785ea790aad7b38989351fc74cadaebfec
+SHA1 (patch-configure) = 8b054a697f559980a5de00fa3132e08c390b4cc3
+SHA1 (patch-control_pgpverify.in) = bed9a7783f24792bac9c390981161ab4467331b1
+SHA1 (patch-lib_fdlimit.c) = 65dcb372deb477d93ae31379f23137b7c210fb88
+SHA1 (patch-perl_INN_Config.pm.in) = eb1ee267dd6d358d0d0a508206e4dd70fa784770
+SHA1 (patch-scripts_news.daily.in) = e2b86b8e9f190c00b047862529447c7fe063ca4a
+SHA1 (patch-scripts_rc.news.in) = bae7637dcdeb5c3eb200044ec8f0616fc954d9fb
+SHA1 (patch-site_Makefile) = dd294f61a6bb6a11d71c2b4f12cad7719b7cee8a
diff --git a/inn/patches/patch-Makefile.global.in b/inn/patches/patch-Makefile.global.in
new file mode 100644
index 0000000000..c8b7aca977
--- /dev/null
+++ b/inn/patches/patch-Makefile.global.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use default backup suffix for install.
+
+--- Makefile.global.in.orig	2019-02-07 15:02:22.000000000 +0000
++++ Makefile.global.in
+@@ -335,7 +335,7 @@ INSTALL		= $(top)/support/install-sh -c
+ ##  files like active and newsgroups that should have the same permissions as
+ ##  article files.
+ 
+-BACKUP_OPTION	= -B .OLD
++#BACKUP_OPTION	= -B .OLD
+ 
+ LI_SPRI		= $(LIBTOOLINST) $(INSTALL) -o root -g $(RUNASGROUP) -m 4550 $(BACKUP_OPTION)
+ LI_XPRI		= $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0550 $(BACKUP_OPTION)
diff --git a/inn/patches/patch-aa b/inn/patches/patch-aa
deleted file mode 100644
index fadf6c1753..0000000000
--- a/inn/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2014/08/03 17:33:34 spz Exp $
-
---- configure.orig	2014-05-17 08:24:49.000000000 +0000
-+++ configure
-@@ -13018,7 +13018,7 @@ else
-   RANLIB="$ac_cv_prog_RANLIB"
- fi
- 
--for ac_prog in 'bison -y' byacc
-+for ac_prog in 'bison -y' byacc yacc
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/inn/patches/patch-ab b/inn/patches/patch-ab
deleted file mode 100644
index 01a7895003..0000000000
--- a/inn/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2014/08/03 17:33:34 spz Exp $
-
---- scripts/news.daily.in.orig	2014-05-17 08:24:49.000000000 +0000
-+++ scripts/news.daily.in
-@@ -276,6 +276,10 @@ fi
- 
- cd ${PATHETC}
- 
-+## Unlimit
-+ulimit -d `ulimit -H -d`
-+ulimit -n `ulimit -H -n`
-+
- ##  Show the status of the news system.
- ${DOSTAT} && {
-     ${INNSTAT}
diff --git a/inn/patches/patch-ac b/inn/patches/patch-ac
deleted file mode 100644
index d3f138cd1b..0000000000
--- a/inn/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.12 2014/08/03 17:33:34 spz Exp $
-
---- Makefile.global.in.orig	2014-05-17 08:24:49.000000000 +0000
-+++ Makefile.global.in
-@@ -303,7 +303,7 @@ INSTALL		= $(top)/support/install-sh -c
- ##  files like active and newsgroups that should have the same permissions as
- ##  article files.
- 
--BACKUP_OPTION	= -B .OLD
-+#BACKUP_OPTION	= -B .OLD
- 
- LI_SPRI		= $(LIBTOOLINST) $(INSTALL) -o root -g $(RUNASGROUP) -m 4550 $(BACKUP_OPTION)
- LI_XPRI		= $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0550 $(BACKUP_OPTION)
diff --git a/inn/patches/patch-ad b/inn/patches/patch-ad
deleted file mode 100644
index 805b17ccff..0000000000
--- a/inn/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2014/08/03 17:33:34 spz Exp $
-
---- scripts/rc.news.in.orig	2014-05-17 08:24:49.000000000 +0000
-+++ scripts/rc.news.in
-@@ -77,6 +77,9 @@ Xstop)
- ;;
- esac
- 
-+## Unlimit
-+ulimit -n `ulimit -H -n`
-+
- ##  Pick ${INND} or ${INNDSTART}
- WHAT=${INND}
- 
diff --git a/inn/patches/patch-ag b/inn/patches/patch-ag
deleted file mode 100644
index a888d2e59e..0000000000
--- a/inn/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.13 2014/08/03 17:33:34 spz Exp $
-
---- control/pgpverify.in.orig	2014-05-17 08:24:49.000000000 +0000
-+++ control/pgpverify.in
-@@ -139,7 +139,7 @@
- # Path to pgp binary; for PGP 5.0, set the path to the pgpv binary.  If
- # you have INN and the script is able to successfully include your
- # INN::Config module, the value of $INN::Config::pgp will override this.
--$pgp = '/usr/local/bin/pgp';
-+# $pgp = '/usr/local/bin/pgp';
- 
- # If you keep your keyring somewhere that is not the default used by pgp,
- # uncomment the next line and set appropriately.  If you have INN and the
diff --git a/inn/patches/patch-ah b/inn/patches/patch-ah
deleted file mode 100644
index 8a41b00ea0..0000000000
--- a/inn/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.17 2017/05/20 06:53:05 spz Exp $
-
---- site/Makefile.orig	2016-11-27 14:03:42.000000000 +0000
-+++ site/Makefile
-@@ -75,7 +75,8 @@ REST		= \
- 
- ALL		= $(REST)
- 
--REST_INSTALLED	= \
-+REST_INSTALLED	= 
-+NOTUSED		= \
- 	$D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
- 	$D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
- 	$D$(PATH_CONFIG) $D$(PATH_MODERATORS) \
-@@ -102,7 +103,8 @@ REST_INSTALLED	= \
- 
- ALL_INSTALLED	= $(REST_INSTALLED)
- 
--SPECIAL		= $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
-+SPECIAL		=
-+NOTUSED2	= $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
- 		$D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY)
- 
- ##  Get new versions of everything from samples directory.
diff --git a/inn/patches/patch-ak b/inn/patches/patch-ak
deleted file mode 100644
index 4a9c32b1ce..0000000000
--- a/inn/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2014/08/03 17:33:34 spz Exp $
-
---- perl/INN/Config.pm.in.orig	2014-05-17 08:24:49.000000000 +0000
-+++ perl/INN/Config.pm.in
-@@ -20,7 +20,7 @@ our $exec_prefix = "@exec_prefix@";
- 
- ##  Then, process the variables provided by innconfval.
- my @INNCONFVAR = ();
--my @values = `${exec_prefix}/bin/innconfval -p`;
-+my @values = `@bindir@/innconfval -p`;
- foreach my $line (@values) {
-   eval 'our '.$line;
-   if ($line =~ /^(.*?) = /m) {
diff --git a/inn/patches/patch-al b/inn/patches/patch-al
deleted file mode 100644
index 39c6460f0d..0000000000
--- a/inn/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.2 2014/08/03 17:33:34 spz Exp $
-
---- lib/fdlimit.c.orig	2014-05-17 08:24:49.000000000 +0000
-+++ lib/fdlimit.c
-@@ -59,6 +59,10 @@ setfdlimit(unsigned int limit)
-     }
- #endif
- 
-+    /* will we mind if the limit is higher? I think not. */
-+    if (rl.rlim_cur >= limit)
-+	return 0;
-+
-     rl.rlim_cur = limit;
-     if (limit > rl.rlim_max)
-         rl.rlim_max = limit;
diff --git a/inn/patches/patch-configure b/inn/patches/patch-configure
new file mode 100644
index 0000000000..39da118a51
--- /dev/null
+++ b/inn/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Add yacc to list of parser generators to check for in configure phase.
+
+--- configure.orig	2019-02-07 15:02:22.000000000 +0000
++++ configure
+@@ -14959,7 +14959,7 @@ else
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+ 
+-for ac_prog in 'bison -y' byacc
++for ac_prog in 'bison -y' byacc yacc
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
diff --git a/inn/patches/patch-control_pgpverify.in b/inn/patches/patch-control_pgpverify.in
new file mode 100644
index 0000000000..0a48d249d5
--- /dev/null
+++ b/inn/patches/patch-control_pgpverify.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+XXX: This is wrong!
+
+--- control/pgpverify.in.orig	2019-02-07 15:02:22.000000000 +0000
++++ control/pgpverify.in
+@@ -152,7 +152,7 @@
+ # Path to pgp binary; for PGP 5.0, set the path to the pgpv binary.  If
+ # you have INN and the script is able to successfully include your
+ # INN::Config module, the value of $INN::Config::pgp will override this.
+-$pgp = '/usr/local/bin/pgp';
++# $pgp = '/usr/local/bin/pgp';
+ 
+ # If you keep your keyring somewhere that is not the default used by pgp,
+ # uncomment the next line and set appropriately.  If you have INN and the
diff --git a/inn/patches/patch-lib_fdlimit.c b/inn/patches/patch-lib_fdlimit.c
new file mode 100644
index 0000000000..07c9d2aa43
--- /dev/null
+++ b/inn/patches/patch-lib_fdlimit.c
@@ -0,0 +1,18 @@
+$NetBSD$
+
+This patch makes calls to setfdlimit() behave as NOP, setrlimit() is not
+called, if the new limit is lower than the current limit.
+
+--- lib/fdlimit.c.orig	2019-02-07 15:02:22.000000000 +0000
++++ lib/fdlimit.c
+@@ -60,6 +60,10 @@ setfdlimit(unsigned int limit)
+     }
+ #endif
+ 
++    /* will we mind if the limit is higher? I think not. */
++    if (rl.rlim_cur >= limit)
++	return 0;
++
+     rl.rlim_cur = limit;
+     if (limit > rl.rlim_max)
+         rl.rlim_max = limit;
diff --git a/inn/patches/patch-perl_INN_Config.pm.in b/inn/patches/patch-perl_INN_Config.pm.in
new file mode 100644
index 0000000000..5075a4f515
--- /dev/null
+++ b/inn/patches/patch-perl_INN_Config.pm.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix path to inconfval.
+
+--- perl/INN/Config.pm.in.orig	2019-02-07 15:02:22.000000000 +0000
++++ perl/INN/Config.pm.in
+@@ -20,7 +20,7 @@ our $exec_prefix = "@exec_prefix@";
+ 
+ ##  Then, process the variables provided by innconfval.
+ my @INNCONFVAR = ();
+-my @values = `${exec_prefix}/bin/innconfval -p`;
++my @values = `@bindir@/innconfval -p`;
+ foreach my $line (@values) {
+   eval 'our '.$line;
+   if ($line =~ /^(.*?) = /m) {
diff --git a/inn/patches/patch-scripts_news.daily.in b/inn/patches/patch-scripts_news.daily.in
new file mode 100644
index 0000000000..d63efb66ab
--- /dev/null
+++ b/inn/patches/patch-scripts_news.daily.in
@@ -0,0 +1,18 @@
+$NetBSD$
+
+Increase limits for data segment size and number of open files per process
+to hard limits of system.
+
+--- scripts/news.daily.in.orig	2019-02-07 15:02:22.000000000 +0000
++++ scripts/news.daily.in
+@@ -276,6 +276,10 @@ fi
+ 
+ cd ${PATHETC}
+ 
++## Unlimit
++ulimit -d `ulimit -H -d`
++ulimit -n `ulimit -H -n`
++
+ ##  Show the status of the news system.
+ ${DOSTAT} && {
+     ${INNSTAT}
diff --git a/inn/patches/patch-scripts_rc.news.in b/inn/patches/patch-scripts_rc.news.in
new file mode 100644
index 0000000000..18b6aa5758
--- /dev/null
+++ b/inn/patches/patch-scripts_rc.news.in
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Increase limit for open files per process to hard limits of system.
+
+--- scripts/rc.news.in.orig	2019-02-07 15:02:22.000000000 +0000
++++ scripts/rc.news.in
+@@ -77,6 +77,9 @@ Xstop)
+ ;;
+ esac
+ 
++## Unlimit
++ulimit -n `ulimit -H -n`
++
+ ##  Pick ${INND} or ${INNDSTART}
+ WHAT=${INND}
+ 
diff --git a/inn/patches/patch-site_Makefile b/inn/patches/patch-site_Makefile
new file mode 100644
index 0000000000..5fff616626
--- /dev/null
+++ b/inn/patches/patch-site_Makefile
@@ -0,0 +1,26 @@
+$NetBSD$
+
+Clear macros REST_INSTALLED and SPECIAL.
+
+--- site/Makefile.orig	2019-02-07 15:02:22.000000000 +0000
++++ site/Makefile
+@@ -75,7 +75,8 @@ REST		= \
+ 
+ ALL		= $(REST)
+ 
+-REST_INSTALLED	= \
++REST_INSTALLED	= 
++NOTUSED		= \
+ 	$D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
+ 	$D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
+ 	$D$(PATH_CONFIG) $D$(PATH_MODERATORS) \
+@@ -102,7 +103,8 @@ REST_INSTALLED	= \
+ 
+ ALL_INSTALLED	= $(REST_INSTALLED)
+ 
+-SPECIAL		= $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
++SPECIAL		=
++NOTUSED2	= $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \
+ 		$D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY)
+ 
+ ##  Get new versions of everything from samples directory.


Home | Main Index | Thread Index | Old Index