diff options
Diffstat (limited to 'news')
| -rw-r--r-- | news/inn/Makefile | 23 | ||||
| -rw-r--r-- | news/inn/PLIST | 24 | ||||
| -rw-r--r-- | news/inn/distinfo | 5 | ||||
| -rw-r--r-- | news/inn/patches/patch-ah | 21 |
4 files changed, 44 insertions, 29 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index e1fed06a3a1..df3feef8b24 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.106 2011/08/14 14:16:34 obache Exp $ +# $NetBSD: Makefile,v 1.107 2011/09/25 13:58:31 spz Exp $ DISTNAME= inn-2.5.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= news MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \ ftp://ftp.fu-berlin.de/unix/news/inn/ @@ -85,6 +85,7 @@ INSTALLATION_DIRS+= etc/nntp INSTALLATION_DIRS+= sbin INSTALLATION_DIRS+= bin INSTALLATION_DIRS+= ${EXAMPLEDIR} +INSTALLATION_DIRS+= ${EXAMPLEDIR}/filter MAKE_DIRS+= ${PREFIX}/bin MAKE_DIRS+= ${PREFIX}/sbin @@ -95,6 +96,7 @@ INN_DIRS+= ${PREFIX}/etc/inn INN_DIRS+= ${INN_DATA_DIR} OWN_DIRS+= ${PREFIX}/${INN_PATHBIN} +OWN_DIRS+= ${PREFIX}/${INN_PATHBIN}/filter OWN_DIRS+= ${EXAMPLEDIR} .for dir in ${INN_DIRS} @@ -137,6 +139,16 @@ CONF_FILES_PERMS+= ${EXAMPLEDIR}/${file} ${INN_DATA_DIR}/db/${file} \ ${INN_USER} ${INN_GROUP} 0664 .endfor +FILTERFILES= INN.py filter_innd.py nnrpd.py nnrpd_access.py \ + nnrpd_auth.py nnrpd_dynamic.py \ + filter_innd.pl filter_nnrpd.pl nnrpd_access.pl \ + nnrpd_auth.pl startup_innd.pl + +.for file in ${FILTERFILES} +CONF_FILES_PERMS+= ${EXAMPLEDIR}/filter/${file} ${INN_PATHBIN}/filter/${file} \ + ${INN_USER} ${INN_GROUP} 0664 +.endfor + RCD_SCRIPTS= innd PKG_DESTDIR_SUPPORT= destdir @@ -163,6 +175,9 @@ pre-install: ${TOUCH} ${WRKSRC}/site/${file} ${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR} .endfor +.for file in ${FILTERFILES} + ${INSTALL_DATA} ${WRKSRC}/site/${file} ${DESTDIR}${EXAMPLEDIR}/filter +.endfor post-install: .for file in cnfsstat ctlinnd makehistory innbind @@ -170,10 +185,10 @@ post-install: ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/${file} \ ${DESTDIR}${PREFIX}/sbin .endfor - ${RM} -f ${DESTDIR}${PREFIX}/sbin/inews + ${RM} -f ${DESTDIR}${PREFIX}/bin/inews ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/inews \ ${DESTDIR}${PREFIX}/bin - ${RM} -f ${DESTDIR}${PREFIX}/sbin/rnews + ${RM} -f ${DESTDIR}${PREFIX}/bin/rnews ${LN} -s ${DESTDIR}${PREFIX}/${INN_PATHBIN}/rnews \ ${DESTDIR}${PREFIX}/bin .for file in libinn.a libstorage.a libinnhist.a diff --git a/news/inn/PLIST b/news/inn/PLIST index ef969688eeb..f36746aba65 100644 --- a/news/inn/PLIST +++ b/news/inn/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2009/12/16 22:10:25 spz Exp $ +@comment $NetBSD: PLIST,v 1.22 2011/09/25 13:58:31 spz Exp $ bin/inews bin/rnews include/inn/buffer.h @@ -72,17 +72,6 @@ ${INN_PATHBIN}/expireover ${INN_PATHBIN}/expirerm ${INN_PATHBIN}/fastrm ${INN_PATHBIN}/filechan -${INN_PATHBIN}/filter/INN.py -${INN_PATHBIN}/filter/filter_innd.pl -${INN_PATHBIN}/filter/filter_innd.py -${INN_PATHBIN}/filter/filter_nnrpd.pl -${INN_PATHBIN}/filter/nnrpd.py -${INN_PATHBIN}/filter/nnrpd_access.pl -${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_innd.pl ${INN_PATHBIN}/getlist ${INN_PATHBIN}/grephistory ${INN_PATHBIN}/imapfeed @@ -285,6 +274,17 @@ share/examples/inn/cycbuff.conf share/examples/inn/distrib.pats share/examples/inn/distributions share/examples/inn/expire.ctl +share/examples/inn/filter/INN.py +share/examples/inn/filter/filter_innd.pl +share/examples/inn/filter/filter_innd.py +share/examples/inn/filter/filter_nnrpd.pl +share/examples/inn/filter/nnrpd.py +share/examples/inn/filter/nnrpd_access.pl +share/examples/inn/filter/nnrpd_access.py +share/examples/inn/filter/nnrpd_auth.pl +share/examples/inn/filter/nnrpd_auth.py +share/examples/inn/filter/nnrpd_dynamic.py +share/examples/inn/filter/startup_innd.pl share/examples/inn/history share/examples/inn/incoming.conf share/examples/inn/inn.conf diff --git a/news/inn/distinfo b/news/inn/distinfo index d68150eb633..46f2394e5c8 100644 --- a/news/inn/distinfo +++ b/news/inn/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2010/04/13 21:18:00 spz Exp $ +$NetBSD: distinfo,v 1.27 2011/09/25 13:58:32 spz Exp $ SHA1 (inn-2.5.2.tar.gz) = e7a9512acb5fa09ecdf116a4bde39c9f5efe65db RMD160 (inn-2.5.2.tar.gz) = 2fce7fade8bd8df3fe7f813b6feb37ff2b2bf07c @@ -8,6 +8,7 @@ SHA1 (patch-ab) = 5f98336273de9763c38df3bb122f141cbd16527a SHA1 (patch-ac) = 2b801b9b8c5eae1feacaa3532e78b4c46210f755 SHA1 (patch-ad) = d36131ad21a1d8ea0edb463dfff6f1800dc8291d SHA1 (patch-ag) = ec28feef2392567cbc607e7b27fe85f1acd349a7 -SHA1 (patch-ah) = 48c2440ed361668c934194e53dc91fe0fa24dc2f +SHA1 (patch-ah) = a71cdb9940012098cb5737e5fa48435309cbda83 SHA1 (patch-ai) = cf0af9de01dc7e06c5f9f7f1dd91ac2201e8c212 SHA1 (patch-ak) = 1b92f93a78a08b570c2f9b5360982644d6d2d065 +SHA1 (patch-al) = a3d9fad5c045dc7a240e0f0c0a88a5321e6135d5 diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah index 83d1cb7b95f..e36094b6133 100644 --- a/news/inn/patches/patch-ah +++ b/news/inn/patches/patch-ah @@ -1,11 +1,12 @@ -$NetBSD: patch-ah,v 1.13 2009/12/16 22:10:25 spz Exp $ +$NetBSD: patch-ah,v 1.14 2011/09/25 13:58:32 spz Exp $ ---- site/Makefile.orig 2009-05-21 20:08:33.000000000 +0000 +--- site/Makefile.orig 2010-03-24 20:10:36.000000000 +0000 +++ site/Makefile -@@ -73,32 +73,17 @@ +@@ -72,33 +72,11 @@ REST = \ + ALL = $(MOST) $(REST) - REST_INSTALLED = \ +-REST_INSTALLED = \ - $D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \ - $D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \ - $D$(PATH_CONFIG) $D$(PATH_MODERATORS) \ @@ -18,18 +19,16 @@ $NetBSD: patch-ah,v 1.13 2009/12/16 22:10:25 spz Exp $ - $D$(PATH_MOTD) $D$(PATH_STORAGECONF) \ - $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_PYTHON_NNRPD_MODULE) \ - $D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \ +- $D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \ +- $D$(PATH_PYTHON_FILTER_INND) $D$(PATH_PYTHON_INN_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_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) ++REST_INSTALLED = ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED) |