From 89430bf37204929d9287b787a26217af2aa7469c Mon Sep 17 00:00:00 2001 From: spz Date: Tue, 22 Sep 2009 13:17:00 +0000 Subject: Update of the INN package to the latest stable version (2.5.0). --- news/inn/MESSAGE | 18 +++++------ news/inn/Makefile | 56 +++++++++++++++++---------------- news/inn/PLIST | 79 ++++++++++++++++++++++++----------------------- news/inn/distinfo | 23 +++++++------- news/inn/patches/patch-aa | 10 +++--- news/inn/patches/patch-ab | 6 ++-- news/inn/patches/patch-ac | 37 +++++----------------- news/inn/patches/patch-ad | 8 ++--- news/inn/patches/patch-ag | 10 +++--- news/inn/patches/patch-ah | 33 +++++++++++--------- news/inn/patches/patch-ai | 4 +-- news/inn/patches/patch-aj | 37 ---------------------- 12 files changed, 132 insertions(+), 189 deletions(-) delete mode 100644 news/inn/patches/patch-aj (limited to 'news') diff --git a/news/inn/MESSAGE b/news/inn/MESSAGE index b5c675e2c5b..5a9e9b2cbd6 100644 --- a/news/inn/MESSAGE +++ b/news/inn/MESSAGE @@ -1,19 +1,15 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.5 2008/09/03 06:34:32 spz Exp $ +$NetBSD: MESSAGE,v 1.6 2009/09/22 13:17:00 spz Exp $ -The following programs have been installed suid root on your machine: +The following program has been installed suid root on your machine: - ${PREFIX}/${INN_PATHBIN}/inndstart - ${PREFIX}/${INN_PATHBIN}/startinnfeed + ${PREFIX}/${INN_PATHBIN}/innbind --------------------------------------------------------------------------- -UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING +If you are upgrading from 2.4.6 or earlier: this is a major version bump. +Config files have changed. Read ${PREFIX}/share/doc/inn/NEWS for details. -The directory structure of the package has changed. - -INNs etc is now in ${PREFIX}/etc/inn -the binaries are now in ${PREFIX}/${INN_PATHBIN} - -UPDATE WARNING - UPDATE WARNING - UPDATE WARNING - UPDATE WARNING +If this is a first install: ${PREFIX}/share/doc/inn/INSTALL will help you +getting set up. --------------------------------------------------------------------------- =========================================================================== diff --git a/news/inn/Makefile b/news/inn/Makefile index 9979ab0f492..0a5f319c30b 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.96 2009/03/15 15:00:50 spz Exp $ +# $NetBSD: Makefile,v 1.97 2009/09/22 13:17:00 spz Exp $ -DISTNAME= inn-2.4.6 +DISTNAME= inn-2.5.0 CATEGORIES= news MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \ ftp://ftp.fu-berlin.de/unix/news/inn/ @@ -8,6 +8,7 @@ MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \ MAINTAINER= spz@NetBSD.org HOMEPAGE= http://www.isc.org/software/inn/ COMMENT= The public release of InterNet News (INN) +LICENSE= modified-bsd AND gnu-gpl-v2 CONFLICTS+= libradius-[0-9]* nntpclnt-[0-9]* @@ -25,23 +26,13 @@ MESSAGE_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q} PLIST_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q} -SUBST_CLASSES+= BADPATHBIN -SUBST_STAGE.BADPATHBIN= post-patch -SUBST_MESSAGE.BADPATHBIN= fixing up unfortunate pathbin paths -SUBST_FILES.BADPATHBIN= Makefile.global.in \ - samples/inn.conf.in samples/newsfeeds.in \ - scripts/innshellvars.in scripts/innshellvars.pl.in \ - scripts/innshellvars.tcl.in backends/news2mail.in \ - control/controlbatch.in control/controlchan.in -SUBST_SED.BADPATHBIN= -e 's,@prefix@/bin,${PREFIX}/${INN_PATHBIN:Q},g' -SUBST_SED.BADPATHBIN+= -e 's,$$(PATHNEWS)/bin,${PREFIX}/${INN_PATHBIN:Q},g' - - GNU_CONFIGURE= YES GNU_CONFIGURE_PREFIX= ${INN_PREFIX} GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --enable-setgid-inews \ --enable-largefiles \ + --bindir=${PREFIX}/${INN_PATHBIN} \ + --sbindir=${PREFIX}/${INN_PATHBIN} \ --with-openssl=${SSLBASE:Q} \ --with-etc-dir=${PREFIX}/etc/inn \ --with-doc-dir=${PREFIX}/share/doc/inn \ @@ -49,9 +40,10 @@ CONFIGURE_ARGS+= --enable-setgid-inews \ --with-filter-dir=${PREFIX}/${INN_PATHBIN}/filter \ --with-tmp-dir=${INN_DATA_DIR}/tmp \ --with-db-dir=${INN_DATA_DIR}/db \ + --with-http-dir=${INN_DATA_DIR}/http \ --with-log-dir=${INN_DATA_DIR}/log \ --with-run-dir=${INN_DATA_DIR}/run \ - --includedir=${PREFIX}/include/inn \ + --includedir=${PREFIX}/include \ --with-spool-dir=${INN_SPOOL:Q} \ --with-news-user=${INN_USER:Q} \ --with-news-group=${INN_GROUP:Q} @@ -63,6 +55,9 @@ CONFIGURE_ENV+= _PATH_SORT=${TOOLS_SORT:Q} CONFIGURE_ENV+= GZIP=${TOOLS_GZIP_CMD:Q} USE_TOOLS+= awk egrep gzip perl:run sed sh sort yacc +DEPENDS+= p5-MIME-tools>0:../../mail/p5-MIME-tools +DEPENDS+= p5-GD>0:../../graphics/p5-GD + PKG_GROUPS_VARS+= INN_GROUP PKG_USERS_VARS+= INN_USER @@ -74,10 +69,15 @@ PKG_SHELL.${INN_USER}= ${SH} PKG_SYSCONFDIR.inn= ${PREFIX}/etc/inn EXAMPLEDIR= ${PREFIX}/share/examples/inn -INN_DATADIRS= log log/OLD run tmp db spool +INN_DATADIRS= log log/OLD run tmp db spool http INN_SPOOLDIRS= archive articles overview incoming incoming/bad \ outgoing uniover innfeed +INSTALLATION_DIRS+= etc/nntp +INSTALLATION_DIRS+= sbin +INSTALLATION_DIRS+= bin +INSTALLATION_DIRS+= ${EXAMPLEDIR} + MAKE_DIRS+= ${PREFIX}/bin MAKE_DIRS+= ${PREFIX}/sbin MAKE_DIRS+= ${PREFIX}/lib @@ -101,13 +101,15 @@ MAKE_DIRS_PERMS+= ${INN_DATA_DIR}/spool/${dir} \ .endfor CFILES= actsync.cfg actsync.ign buffindexed.conf \ - control.ctl cycbuff.conf distrib.pats \ + control.ctl control.ctl.local cycbuff.conf \ + distrib.pats distributions \ expire.ctl incoming.conf inn.conf innfeed.conf \ - innreport.conf innwatch.ctl moderators \ + innreport.conf innwatch.ctl \ + localgroups moderators \ motd.news news2mail.cf newsfeeds nnrpd.track \ - nntpsend.ctl ovdb.conf overview.fmt passwd.nntp \ - radius.conf readers.conf sasl.conf storage.conf \ - subscriptions + nntpsend.ctl nocem.ctl ovdb.conf passwd.nntp \ + radius.conf readers.conf send-uucp.cf \ + storage.conf subscriptions .for file in ${CFILES} CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${PKG_SYSCONFDIR}/${file} \ ${INN_USER} ${INN_GROUP} 0664 @@ -118,6 +120,10 @@ CONF_FILES_PERMS+= ${EXAMPLEDIR}/newsgroups.minimal ${INN_DATA_DIR}/db/news DBFILES= active.times history +HTTPFILES= innreport.css + +CONF_FILES_PERMS+= ${EXAMPLEDIR}/innreport.css ${INN_DATA_DIR}/http/innreport.css ${INN_USER} ${INN_GROUP} 0664 + .for file in ${DBFILES} CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${INN_DATA_DIR}/db/${file} \ ${INN_USER} ${INN_GROUP} 0664 @@ -142,25 +148,21 @@ GCC_REQD+= 2.95.3 .include "options.mk" pre-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLEDIR} for FILE in ${CFILES} active.minimal newsgroups.minimal; do \ ${INSTALL_DATA} ${WRKSRC}/site/$$FILE \ ${DESTDIR}${EXAMPLEDIR}; \ done - for FILE in ${DBFILES} ; do \ + for FILE in ${DBFILES} ${HTTPFILES}; do \ ${TOUCH} ${WRKSRC}/site/$$FILE ; \ ${INSTALL_DATA} ${WRKSRC}/site/$$FILE \ ${DESTDIR}${EXAMPLEDIR}; \ done post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/etc/nntp - ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/sbin - for FILE in cnfsstat ctlinnd inndstart makehistory ; do \ + for FILE in cnfsstat ctlinnd makehistory innbind; do \ ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/$$FILE \ ${DESTDIR}${PREFIX}/sbin ; \ done - ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/inews \ ${DESTDIR}${PREFIX}/bin ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/rnews \ diff --git a/news/inn/PLIST b/news/inn/PLIST index 45dd8bfe767..51cd17b9177 100644 --- a/news/inn/PLIST +++ b/news/inn/PLIST @@ -1,28 +1,31 @@ -@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:10:06 joerg Exp $ +@comment $NetBSD: PLIST,v 1.19 2009/09/22 13:17:00 spz Exp $ bin/inews bin/rnews -include/inn/conffile.h -include/inn/config.h -include/inn/dbz.h -include/inn/inn/buffer.h -include/inn/inn/confparse.h -include/inn/inn/defines.h -include/inn/inn/hashtab.h -include/inn/inn/history.h -include/inn/inn/innconf.h -include/inn/inn/list.h -include/inn/inn/md5.h -include/inn/inn/messages.h -include/inn/inn/mmap.h -include/inn/inn/qio.h -include/inn/inn/sequence.h -include/inn/inn/system.h -include/inn/inn/timer.h -include/inn/inn/tst.h -include/inn/inn/vector.h -include/inn/inn/version.h -include/inn/inn/wire.h +include/inn/buffer.h +include/inn/confparse.h +include/inn/defines.h +include/inn/dispatch.h +include/inn/hashtab.h +include/inn/history.h +include/inn/innconf.h include/inn/inndcomm.h +include/inn/list.h +include/inn/md5.h +include/inn/messages.h +include/inn/mmap.h +include/inn/network.h +include/inn/newsuser.h +include/inn/options.h +include/inn/overview.h +include/inn/qio.h +include/inn/sequence.h +include/inn/system.h +include/inn/timer.h +include/inn/tst.h +include/inn/utility.h +include/inn/vector.h +include/inn/version.h +include/inn/wire.h include/inn/libinn.h include/inn/nntp.h include/inn/ov.h @@ -39,7 +42,6 @@ ${INN_PATHBIN}/actmerge ${INN_PATHBIN}/actsync ${INN_PATHBIN}/actsyncd ${INN_PATHBIN}/archive -${INN_PATHBIN}/auth/passwd/auth_smb ${INN_PATHBIN}/auth/passwd/ckpasswd ${INN_PATHBIN}/auth/passwd/radius ${INN_PATHBIN}/auth/resolv/domain @@ -68,7 +70,6 @@ ${INN_PATHBIN}/expirerm ${INN_PATHBIN}/fastrm ${INN_PATHBIN}/filechan ${INN_PATHBIN}/filter/INN.py -${INN_PATHBIN}/filter/filter.tcl ${INN_PATHBIN}/filter/filter_innd.pl ${INN_PATHBIN}/filter/filter_innd.py ${INN_PATHBIN}/filter/filter_nnrpd.pl @@ -78,10 +79,8 @@ ${INN_PATHBIN}/filter/nnrpd_access.py ${INN_PATHBIN}/filter/nnrpd_auth.pl ${INN_PATHBIN}/filter/nnrpd_auth.py ${INN_PATHBIN}/filter/nnrpd_dynamic.py -${INN_PATHBIN}/filter/startup.tcl ${INN_PATHBIN}/filter/startup_innd.pl ${INN_PATHBIN}/getlist -${INN_PATHBIN}/gpgverify ${INN_PATHBIN}/grephistory ${INN_PATHBIN}/imapfeed ${INN_PATHBIN}/inews @@ -89,7 +88,6 @@ ${INN_PATHBIN}/inncheck ${INN_PATHBIN}/innconfval ${INN_PATHBIN}/innd ${INN_PATHBIN}/inndf -${INN_PATHBIN}/inndstart ${INN_PATHBIN}/innfeed ${INN_PATHBIN}/innmail ${INN_PATHBIN}/innreport @@ -136,7 +134,6 @@ ${INN_PATHBIN}/shrinkfile ${INN_PATHBIN}/signcontrol ${INN_PATHBIN}/simpleftp ${INN_PATHBIN}/sm -${INN_PATHBIN}/startinnfeed ${INN_PATHBIN}/tally.control ${INN_PATHBIN}/tdx-util ${INN_PATHBIN}/writelog @@ -156,7 +153,7 @@ man/man1/shlock.1 man/man1/shrinkfile.1 man/man1/simpleftp.1 man/man1/sm.1 -man/man1/startinnfeed.1 +man/man3/INN::Config.3pm man/man3/clientlib.3 man/man3/dbz.3 man/man3/inndcomm.3 @@ -165,7 +162,6 @@ man/man3/libinn.3 man/man3/libinnhist.3 man/man3/libstorage.3 man/man3/list.3 -man/man3/parsedate.3 man/man3/qio.3 man/man3/tst.3 man/man3/uwildmat.3 @@ -175,30 +171,31 @@ man/man5/buffindexed.conf.5 man/man5/control.ctl.5 man/man5/cycbuff.conf.5 man/man5/distrib.pats.5 +man/man5/distributions.5 man/man5/expire.ctl.5 man/man5/history.5 man/man5/incoming.conf.5 man/man5/inn.conf.5 man/man5/innfeed.conf.5 man/man5/innwatch.ctl.5 +man/man5/localgroups.5 man/man5/moderators.5 man/man5/motd.news.5 man/man5/newsfeeds.5 +man/man5/newsgroups.5 man/man5/newslog.5 man/man5/nnrpd.track.5 man/man5/nntpsend.ctl.5 +man/man5/nocem.ctl.5 man/man5/ovdb.5 -man/man5/overview.fmt.5 man/man5/passwd.nntp.5 man/man5/radius.conf.5 man/man5/readers.conf.5 -man/man5/sasl.conf.5 man/man5/storage.conf.5 man/man5/subscriptions.5 man/man8/actsync.8 man/man8/actsyncd.8 man/man8/archive.8 -man/man8/auth_smb.8 man/man8/batcher.8 man/man8/buffchan.8 man/man8/ckpasswd.8 @@ -207,6 +204,7 @@ man/man8/cnfsstat.8 man/man8/controlchan.8 man/man8/ctlinnd.8 man/man8/cvtbatch.8 +man/man8/docheckgroups.8 man/man8/domain.8 man/man8/expire.8 man/man8/expireover.8 @@ -214,9 +212,9 @@ man/man8/expirerm.8 man/man8/filechan.8 man/man8/ident.8 man/man8/inncheck.8 +man/man8/innbind.8 man/man8/innd.8 man/man8/inndf.8 -man/man8/inndstart.8 man/man8/innreport.8 man/man8/innstat.8 man/man8/innupgrade.8 @@ -247,10 +245,10 @@ man/man8/send-uucp.8 man/man8/sendinpaths.8 man/man8/tally.control.8 man/man8/tdx-util.8 +man/man8/tinyleaf.8 man/man8/writelog.8 sbin/cnfsstat sbin/ctlinnd -sbin/inndstart sbin/makehistory share/doc/inn/CONTRIBUTORS share/doc/inn/GPL @@ -260,15 +258,14 @@ share/doc/inn/LICENSE share/doc/inn/NEWS share/doc/inn/README share/doc/inn/TODO -share/doc/inn/compliance-nntp share/doc/inn/config-design share/doc/inn/config-semantics share/doc/inn/config-syntax share/doc/inn/external-auth share/doc/inn/history +share/doc/inn/history-innfeed share/doc/inn/hook-perl share/doc/inn/hook-python -share/doc/inn/hook-tcl share/doc/inn/sample-control share/examples/inn/active.minimal share/examples/inn/active.times @@ -276,15 +273,19 @@ share/examples/inn/actsync.cfg share/examples/inn/actsync.ign share/examples/inn/buffindexed.conf share/examples/inn/control.ctl +share/examples/inn/control.ctl.local share/examples/inn/cycbuff.conf share/examples/inn/distrib.pats +share/examples/inn/distributions share/examples/inn/expire.ctl share/examples/inn/history share/examples/inn/incoming.conf share/examples/inn/inn.conf share/examples/inn/innfeed.conf share/examples/inn/innreport.conf +share/examples/inn/innreport.css share/examples/inn/innwatch.ctl +share/examples/inn/localgroups share/examples/inn/moderators share/examples/inn/motd.news share/examples/inn/news2mail.cf @@ -292,12 +293,12 @@ share/examples/inn/newsfeeds share/examples/inn/newsgroups.minimal share/examples/inn/nntpsend.ctl share/examples/inn/nnrpd.track +share/examples/inn/nocem.ctl share/examples/inn/ovdb.conf -share/examples/inn/overview.fmt share/examples/inn/passwd.nntp share/examples/inn/radius.conf share/examples/inn/readers.conf -share/examples/inn/sasl.conf +share/examples/inn/send-uucp.cf share/examples/inn/storage.conf share/examples/inn/subscriptions share/examples/rc.d/innd diff --git a/news/inn/distinfo b/news/inn/distinfo index ecec6bfe63d..3c5a489c286 100644 --- a/news/inn/distinfo +++ b/news/inn/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.20 2009/03/15 15:00:50 spz Exp $ +$NetBSD: distinfo,v 1.21 2009/09/22 13:17:00 spz Exp $ -SHA1 (inn-2.4.6.tar.gz) = e9ef0a356c48f14cf89f50d8c9584959e061a795 -RMD160 (inn-2.4.6.tar.gz) = 58c35418a89fe26b1b2f44f6d2114865acce0b14 -Size (inn-2.4.6.tar.gz) = 1942874 bytes -SHA1 (patch-aa) = 908b169b944cd10a385428de8897fa55c05b858c -SHA1 (patch-ab) = a681fdecf562088cfb25e8625be1380b32331af0 -SHA1 (patch-ac) = 586748ecfbe0bb48dd42b422f262a1741cef9e90 -SHA1 (patch-ad) = 1f4d4b15a478d6d35185977d8bc32a4e161665c5 -SHA1 (patch-ag) = d70bbbfd0fd2d33d33884000bf3e46b7c33fd15a -SHA1 (patch-ah) = 9927418280dc39bee87bb0bd0c97348276ccfe9c -SHA1 (patch-ai) = 9d99bd095dc5cb4b9c99274c0adeaab779ca2c2d -SHA1 (patch-aj) = a53726b9a510ba4e6e7a9e0905b91b9820cf86c8 +SHA1 (inn-2.5.0.tar.gz) = f009da670e2594d9079e7fb26f32d10c640d24e6 +RMD160 (inn-2.5.0.tar.gz) = 0b9583eef8fe86131297d403323ab6ff2906fe06 +Size (inn-2.5.0.tar.gz) = 2380748 bytes +SHA1 (patch-aa) = 8ed86de4d20ab8510c7521528a9979c1d3e6d9e8 +SHA1 (patch-ab) = ba794956728066ec7deffc5506b257a9276b9467 +SHA1 (patch-ac) = 2b801b9b8c5eae1feacaa3532e78b4c46210f755 +SHA1 (patch-ad) = d36131ad21a1d8ea0edb463dfff6f1800dc8291d +SHA1 (patch-ag) = 8041d7d78c26fd7b505d9955dbdb91f2b8cb8ab2 +SHA1 (patch-ah) = bf0a72348958a89dc28d08dd324e5ee9acfae2c8 +SHA1 (patch-ai) = 28ab36f22920a3bcd2c99578a5b75db3012cf106 diff --git a/news/inn/patches/patch-aa b/news/inn/patches/patch-aa index c3c4c953df6..825f5acd958 100644 --- a/news/inn/patches/patch-aa +++ b/news/inn/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.11 2008/06/23 09:10:53 spz Exp $ +$NetBSD: patch-aa,v 1.12 2009/09/22 13:17:00 spz Exp $ ---- configure.orig 2004-01-08 09:47:19.000000000 +1100 +--- configure.orig 2009-05-21 20:08:33.000000000 +0000 +++ configure -@@ -6522,7 +6521,7 @@ else - echo "$ac_t""no" 1>&6 +@@ -13549,7 +13549,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. + # 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/news/inn/patches/patch-ab b/news/inn/patches/patch-ab index 12f79573af3..d7558eb154b 100644 --- a/news/inn/patches/patch-ab +++ b/news/inn/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2004/07/24 23:55:28 grant Exp $ +$NetBSD: patch-ab,v 1.7 2009/09/22 13:17:00 spz Exp $ ---- scripts/news.daily.in.orig 2004-01-08 09:47:19.000000000 +1100 +--- scripts/news.daily.in.orig 2009-05-21 20:08:33.000000000 +0000 +++ scripts/news.daily.in -@@ -223,6 +223,10 @@ fi +@@ -253,6 +253,10 @@ fi cd ${PATHETC} diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac index e1b7fd85175..6c8c7d058f7 100644 --- a/news/inn/patches/patch-ac +++ b/news/inn/patches/patch-ac @@ -1,36 +1,13 @@ -$NetBSD: patch-ac,v 1.10 2008/06/23 09:10:53 spz Exp $ +$NetBSD: patch-ac,v 1.11 2009/09/22 13:17:00 spz Exp $ ---- Makefile.global.in.orig 2008-06-22 19:21:59.000000000 +0000 +--- Makefile.global.in.orig 2009-05-21 20:08:33.000000000 +0000 +++ Makefile.global.in -@@ -258,19 +258,19 @@ INSTALL = $(top)/support/install +@@ -302,7 +302,7 @@ INSTALL = $(top)/support/install-sh -c ## files like active and newsgroups that should have the same permissions as ## article files. --LI_SPRI = $(LIBTOOL) $(INSTALL) -o root -g $(NEWSGROUP) -m 4550 -B .OLD --LI_XPRI = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0550 -B .OLD --LI_XPUB = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0555 -B .OLD -- --LI_INEWS = $(LIBTOOL) $(INSTALL) $(OWNER) -m $(INEWSMODE) -B .OLD --LI_RNEWS = $(LIBTOOL) $(INSTALL) $(ROWNER) -m $(RNEWSMODE) -B .OLD -- --CP_RPRI = $(INSTALL) $(OWNER) -m 0640 -B .OLD --CP_RPUB = $(INSTALL) $(OWNER) -m 0644 -B .OLD --CP_XPRI = $(INSTALL) $(OWNER) -m 0550 -B .OLD --CP_XPUB = $(INSTALL) $(OWNER) -m 0555 -B .OLD -+LI_SPRI = $(LIBTOOL) $(INSTALL) -o root -g $(NEWSGROUP) -m 4550 -+LI_XPRI = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0550 -+LI_XPUB = $(LIBTOOL) $(INSTALL) $(OWNER) -m 0555 -+ -+LI_INEWS = $(LIBTOOL) $(INSTALL) $(OWNER) -m $(INEWSMODE) -+LI_RNEWS = $(LIBTOOL) $(INSTALL) $(ROWNER) -m $(RNEWSMODE) -+ -+CP_RPRI = $(INSTALL) $(OWNER) -m 0640 -+CP_RPUB = $(INSTALL) $(OWNER) -m 0644 -+CP_XPRI = $(INSTALL) $(OWNER) -m 0550 -+CP_XPUB = $(INSTALL) $(OWNER) -m 0555 +-BACKUP_OPTION = -B .OLD ++#BACKUP_OPTION = -B .OLD --CP_DATA = $(INSTALL) $(OWNER) -m $(FILEMODE) -B .OLD -+CP_DATA = $(INSTALL) $(OWNER) -m $(FILEMODE) - - ## How to install man pages. Pick one of SOURCE, BSD4.4, NROFF-PACK, or - ## NROFF-PACK-SCO. Used by doc/man/putman.sh; read that script for more + LI_SPRI = $(LIBTOOLINST) $(INSTALL) -o root -g $(RUNASGROUP) -m 4550 $(BACKUP_OPTION) + LI_XPRI = $(LIBTOOLINST) $(INSTALL) $(OWNER) -m 0550 $(BACKUP_OPTION) diff --git a/news/inn/patches/patch-ad b/news/inn/patches/patch-ad index 14ea08e44c2..cb477bc4e4f 100644 --- a/news/inn/patches/patch-ad +++ b/news/inn/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.6 2004/07/24 23:55:28 grant Exp $ +$NetBSD: patch-ad,v 1.7 2009/09/22 13:17:00 spz Exp $ ---- scripts/rc.news.in.orig 2004-01-08 09:47:19.000000000 +1100 +--- scripts/rc.news.in.orig 2009-05-21 20:08:33.000000000 +0000 +++ scripts/rc.news.in -@@ -76,6 +76,9 @@ Xstop) +@@ -77,6 +77,9 @@ Xstop) ;; esac @@ -10,5 +10,5 @@ $NetBSD: patch-ad,v 1.6 2004/07/24 23:55:28 grant Exp $ +ulimit -n `ulimit -H -n` + ## Pick ${INND} or ${INNDSTART} - WHAT=${INNDSTART} + WHAT=${INND} diff --git a/news/inn/patches/patch-ag b/news/inn/patches/patch-ag index a9bcbe1aa88..1854b807ab9 100644 --- a/news/inn/patches/patch-ag +++ b/news/inn/patches/patch-ag @@ -1,11 +1,11 @@ -$NetBSD: patch-ag,v 1.9 2006/03/31 17:58:40 tron Exp $ +$NetBSD: patch-ag,v 1.10 2009/09/22 13:17:00 spz Exp $ ---- 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 @@ +--- control/pgpverify.in.orig 2009-05-21 20:08:33.000000000 +0000 ++++ control/pgpverify.in +@@ -131,7 +131,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. + # INN::Config module, the value of $INN::Config::pgp will override this. -$pgp = '/usr/local/bin/pgp'; +$pgp = ''@_PATH_PGP@'; diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah index 2275ef198ac..e8b0599363c 100644 --- a/news/inn/patches/patch-ah +++ b/news/inn/patches/patch-ah @@ -1,36 +1,41 @@ -$NetBSD: patch-ah,v 1.11 2008/12/21 16:00:05 spz Exp $ +$NetBSD: patch-ah,v 1.12 2009/09/22 13:17:00 spz Exp $ ---- site/Makefile.orig 2008-06-29 17:56:57.000000000 +0000 +--- site/Makefile.orig 2009-05-21 20:08:33.000000000 +0000 +++ site/Makefile -@@ -74,28 +74,16 @@ +@@ -73,32 +73,17 @@ REST = \ ALL = $(MOST) $(REST) REST_INSTALLED = \ - $D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \ - $D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \ - $D$(PATH_CONFIG) $D$(PATH_MODERATORS) \ -- $D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl \ -- $D$(PATHETC)/innreport.conf \ -- $D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_SCHEMA) \ +- $D$(PATH_CONTROLCTL) $D$(PATH_CONTROLCTLLOCAL) $D$(PATH_EXPIRECTL) \ +- $D$(PATHETC)/nntpsend.ctl \ +- $D$(PATHETC)/innreport.conf $D$(PATHHTTP)/innreport.css \ +- $D$(PATHETC)/localgroups \ +- $D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) \ - $D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \ - $D$(PATH_MOTD) $D$(PATH_STORAGECONF) \ -- $D$(PATH_OVERVIEWCTL) $D$(PATH_CYCBUFFCONFIG) $D$(PATH_BUFFINDEXED) \ +- $D$(PATH_CYCBUFFCONFIG) $D$(PATH_BUFFINDEXED) \ - $D$(PATH_INNFEEDCTL) $D$(PATH_PERL_STARTUP_INND) \ + $D$(PATH_PERL_STARTUP_INND) \ $D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \ $D$(PATH_PYTHON_FILTER_INND) $D$(PATH_PYTHON_INN_MODULE) \ - $D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) $D$(PATH_PYTHON_NNRPD_MODULE) \ + $D$(PATH_PYTHON_NNRPD_MODULE) \ + $D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \ +- $D$(PATHETC)/nocem.ctl \ - $D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \ -- $D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \ - $D$(PATH_NNRPYACCESS) $D$(PATH_NNRPYDYNAMIC) \ -- $D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS) -+ $D$(PATH_NNRPAUTH) $D$(PATH_NNRPYAUTH) $D$(PATH_NNRPACCESS) +- $D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_NNRPYACCESS) $D$(PATH_NNRPYDYNAMIC) \ +- $D$(PATH_OVDB_CONF) \ +- $D$(PATH_SENDUUCP_CF) $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS) ++ $D$(PATH_NNRPAUTH) $D$(PATH_NNRPACCESS) \ ++ $D$(PATH_NNRPYAUTH) $D$(PATH_NNRPYACCESS) $D$(PATH_NNRPYDYNAMIC) ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED) -SPECIAL = $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \ - $D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY) -+SPECIAL = ++SPECIAL = ## Get new versions of everything from samples directory. - all: $(P) $(ALL) config + all: $(ALL) config diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai index 5b07297fbcd..a48ae115d3e 100644 --- a/news/inn/patches/patch-ai +++ b/news/inn/patches/patch-ai @@ -1,6 +1,6 @@ -$NetBSD: patch-ai,v 1.5 2004/07/24 23:55:28 grant Exp $ +$NetBSD: patch-ai,v 1.6 2009/09/22 13:17:00 spz Exp $ ---- include/dbz.h.orig 2004-01-08 09:47:19.000000000 +1100 +--- include/dbz.h.orig 2009-05-21 20:08:33.000000000 +0000 +++ include/dbz.h @@ -38,7 +38,7 @@ typedef struct { bool nonblock; diff --git a/news/inn/patches/patch-aj b/news/inn/patches/patch-aj deleted file mode 100644 index ef66d5446e4..00000000000 --- a/news/inn/patches/patch-aj +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2006/03/31 17:58:40 tron Exp $ - ---- 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 - --AWK=@_PATH_AWK@ --SED=@_PATH_SED@ -+AWK="@_PATH_AWK@" -+SED="@_PATH_SED@" - INNDF=${NEWSBIN}/inndf --EGREP=@_PATH_EGREP@ --PERL=@_PATH_PERL@ --GPGV=@PATH_GPGV@ --PGP=@_PATH_PGP@ -+EGREP="@_PATH_EGREP@" -+PERL="@_PATH_PERL@" -+GPGV="@PATH_GPGV@" -+PGP="@_PATH_PGP@" - SORT="@_PATH_SORT@" - GETFTP="@GETFTP@" - UUX=@_PATH_UUX@ - --COMPRESS=@COMPRESS@ --GZIP=@GZIP@ -+COMPRESS="@COMPRESS@" -+GZIP="@GZIP@" - UNCOMPRESS="@UNCOMPRESS@" --LOG_COMPRESS=@LOG_COMPRESS@ --Z=@LOG_COMPRESSEXT@ -+LOG_COMPRESS="@LOG_COMPRESS@" -+Z="@LOG_COMPRESSEXT@" - - if [ "$OVMETHOD" = "ovdb" ]; then - DB_HOME="${PATHOVERVIEW}" -- cgit v1.2.3