diff options
Diffstat (limited to 'news')
| -rw-r--r-- | news/inn/Makefile | 5 | ||||
| -rw-r--r-- | news/inn/PLIST | 3 | ||||
| -rw-r--r-- | news/inn/distinfo | 16 | ||||
| -rw-r--r-- | news/inn/patches/patch-ae | 17 | ||||
| -rw-r--r-- | news/inn/patches/patch-af | 20 | ||||
| -rw-r--r-- | news/inn/patches/patch-ag | 14 | ||||
| -rw-r--r-- | news/inn/patches/patch-ah | 4 | ||||
| -rw-r--r-- | news/inn/patches/patch-aj | 13 |
8 files changed, 25 insertions, 67 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index ab6bc3c2707..8637e612d99 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.78 2006/03/02 19:03:20 joerg Exp $ +# $NetBSD: Makefile,v 1.79 2006/03/31 17:58:39 tron Exp $ -DISTNAME= inn-2.4.1 -PKGREVISION= 8 +DISTNAME= inn-2.4.3 CATEGORIES= news MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \ ftp://ftp.sunet.se/pub/news/nntp/inn/ \ diff --git a/news/inn/PLIST b/news/inn/PLIST index c10b3dfc8c2..58b3a682c45 100644 --- a/news/inn/PLIST +++ b/news/inn/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2005/09/22 15:38:39 tron Exp $ +@comment $NetBSD: PLIST,v 1.10 2006/03/31 17:58:40 tron Exp $ bin/inews include/inn/config.h include/inn/dbz.h @@ -255,7 +255,6 @@ man/man8/ovdb_stat.8 man/man8/overchan.8 man/man8/perl-nocem.8 man/man8/prunehistory.8 -man/man8/pullnews.8 man/man8/radius.8 man/man8/rc.news.8 man/man8/scanlogs.8 diff --git a/news/inn/distinfo b/news/inn/distinfo index 81cba862374..b6515569106 100644 --- a/news/inn/distinfo +++ b/news/inn/distinfo @@ -1,15 +1,13 @@ -$NetBSD: distinfo,v 1.14 2005/11/19 12:03:22 rillig Exp $ +$NetBSD: distinfo,v 1.15 2006/03/31 17:58:40 tron Exp $ -SHA1 (inn-2.4.1.tar.gz) = f36267eca56a643a37ed6c2903cd6fbb71e407f5 -RMD160 (inn-2.4.1.tar.gz) = ce3271fec204a68e7eb0648d1afa176ba1d3e601 -Size (inn-2.4.1.tar.gz) = 1849845 bytes +SHA1 (inn-2.4.3.tar.gz) = 95c30835b0990a3c432858948266dd4db639a3e1 +RMD160 (inn-2.4.3.tar.gz) = f9465f3fe905d1173fb30c00d591ab8f9cbaecfc +Size (inn-2.4.3.tar.gz) = 1871994 bytes SHA1 (patch-aa) = 548acc9d7b8386ed055fae772c8c26e5c6225da6 SHA1 (patch-ab) = a681fdecf562088cfb25e8625be1380b32331af0 SHA1 (patch-ac) = c37aa2ea182fafd01ee4a20dbcd67816217a8587 SHA1 (patch-ad) = 1f4d4b15a478d6d35185977d8bc32a4e161665c5 -SHA1 (patch-ae) = 28c36db3fee701d7a46e656e0911356b0fa40c59 -SHA1 (patch-af) = fda097d52bd77500d287e30af8332d7e817a46a2 -SHA1 (patch-ag) = 0d513b856f1dc75e8d72294dc6e88ca52b0b9cd3 -SHA1 (patch-ah) = 0d3dbaab7fa70c96528beec8e7b3f05f74822512 +SHA1 (patch-ag) = d70bbbfd0fd2d33d33884000bf3e46b7c33fd15a +SHA1 (patch-ah) = f8f641895dd663289366815037f654a0e56dd791 SHA1 (patch-ai) = 9d99bd095dc5cb4b9c99274c0adeaab779ca2c2d -SHA1 (patch-aj) = b8b9c5009d5ff3d3667e0a45d58bc0402e758f14 +SHA1 (patch-aj) = a53726b9a510ba4e6e7a9e0905b91b9820cf86c8 diff --git a/news/inn/patches/patch-ae b/news/inn/patches/patch-ae deleted file mode 100644 index bf740030d45..00000000000 --- a/news/inn/patches/patch-ae +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ae,v 1.9 2004/07/24 23:55:28 grant Exp $ - ---- frontends/rnews.c.orig 2004-01-08 09:47:19.000000000 +1100 -+++ frontends/rnews.c -@@ -822,10 +822,12 @@ int main(int ac, char *av[]) - message_handlers_warn(1, message_log_syslog_err); - message_handlers_die(1, message_log_syslog_err); - -+#if !defined(__FreeBSD__) && !defined(__bsdi__) && !defined (__NetBSD__) - if (setgid(getegid()) < 0) - die("cannot setgid to %lu", (unsigned long) getegid()); - if (setuid(geteuid()) < 0) - die("cannot setuid to %lu", (unsigned long) geteuid()); -+#endif - - if (!innconf_read(NULL)) - exit(1); diff --git a/news/inn/patches/patch-af b/news/inn/patches/patch-af deleted file mode 100644 index 6aaf017b2c3..00000000000 --- a/news/inn/patches/patch-af +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-af,v 1.8 2004/07/24 23:55:28 grant Exp $ - ---- innd/inndstart.c.orig 2004-01-08 09:47:19.000000000 +1100 -+++ innd/inndstart.c -@@ -136,6 +136,7 @@ main(int argc, char *argv[]) - if (p && strcmp(p, "all") != 0 && strcmp(p, "any") != 0) { - if (!inet_aton(p, &address)) - die("invalid bindaddress in inn.conf (%s)", p); -+ addr_specified = true; - } - #ifdef HAVE_INET6 - address6 = in6addr_any; -@@ -143,6 +144,7 @@ main(int argc, char *argv[]) - if (p && strcmp(p, "all") != 0 && strcmp(p, "any") != 0) { - if (inet_pton(AF_INET6, p, &address6) < 1) - die("invalid bindaddress6 in inn.conf (%s)", p); -+ addr_specified = true; - } - #endif - diff --git a/news/inn/patches/patch-ag b/news/inn/patches/patch-ag index 698844e520a..a9bcbe1aa88 100644 --- a/news/inn/patches/patch-ag +++ b/news/inn/patches/patch-ag @@ -1,13 +1,13 @@ -$NetBSD: patch-ag,v 1.8 2004/07/24 23:55:28 grant Exp $ +$NetBSD: patch-ag,v 1.9 2006/03/31 17:58:40 tron Exp $ ---- control/pgpverify.in.orig 2004-01-08 09:47:19.000000000 +1100 -+++ control/pgpverify.in -@@ -97,7 +97,7 @@ do '@LIBDIR@/innshellvars.pl'; - # 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 +--- control/pgpverify.in.orig 2006-03-20 04:14:57.000000000 +0000 ++++ control/pgpverify.in 2006-03-31 17:17:00.000000000 +0100 +@@ -127,7 +127,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 # innshellvars.pl file, the value of $inn::pgp will override this. -$pgp = '/usr/local/bin/pgp'; -+$pgp = '@_PATH_PGP@'; ++$pgp = ''@_PATH_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/news/inn/patches/patch-ah b/news/inn/patches/patch-ah index a722354778e..6a29303f311 100644 --- a/news/inn/patches/patch-ah +++ b/news/inn/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.7 2004/07/24 23:55:28 grant Exp $ +$NetBSD: patch-ah,v 1.8 2006/03/31 17:58:40 tron Exp $ --- site/Makefile.orig 2004-01-08 09:47:19.000000000 +1100 +++ site/Makefile @@ -22,7 +22,7 @@ $NetBSD: patch-ah,v 1.7 2004/07/24 23:55:28 grant Exp $ $D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \ - $D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \ - $D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \ -- $D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS) +- $D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS) + $D$(PATH_NNRPAUTH) $D$(PATH_NNRPYAUTH) ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED) diff --git a/news/inn/patches/patch-aj b/news/inn/patches/patch-aj index 4754329474a..ef66d5446e4 100644 --- a/news/inn/patches/patch-aj +++ b/news/inn/patches/patch-aj @@ -1,11 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2005/11/19 12:03:22 rillig Exp $ +$NetBSD: patch-aj,v 1.2 2006/03/31 17:58:40 tron Exp $ -Use double quotes around command variables to make them work even if -they consist of multiple words. - ---- scripts/innshellvars.in.orig Wed Jan 7 23:47:19 2004 -+++ scripts/innshellvars.in Sat Nov 19 12:57:17 2005 -@@ -67,20 +67,20 @@ SERVERPID=${INNDDIR}/innd.pid +--- scripts/innshellvars.in.orig 2006-03-20 04:14:57.000000000 +0000 ++++ scripts/innshellvars.in 2006-03-31 17:44:43.000000000 +0100 +@@ -67,22 +67,22 @@ INNWSTATUS=${INNDDIR}/innwatch.status WATCHPID=${INNDDIR}/innwatch.pid @@ -24,6 +21,8 @@ they consist of multiple words. +PGP="@_PATH_PGP@" SORT="@_PATH_SORT@" GETFTP="@GETFTP@" + UUX=@_PATH_UUX@ + -COMPRESS=@COMPRESS@ -GZIP=@GZIP@ +COMPRESS="@COMPRESS@" |