summaryrefslogtreecommitdiff
path: root/news/inn
diff options
context:
space:
mode:
authortron <tron>2004-06-02 11:43:55 +0000
committertron <tron>2004-06-02 11:43:55 +0000
commit031288b70d1607402da52ff319673ea83b886c0d (patch)
tree43a0dad844971535c93bdc9d15650a844c276971 /news/inn
parenta370c4f6008fc4e5faa37a466bfb63725e1f5edd (diff)
downloadpkgsrc-031288b70d1607402da52ff319673ea83b886c0d.tar.gz
Update INN package to version 2.4.1. Major changes since version 2.3.x:
- builtin IPv6 support - new configuration parser - completely rewriten "send-uucp" which replaces "sendbatch"
Diffstat (limited to 'news/inn')
-rw-r--r--news/inn/Makefile29
-rw-r--r--news/inn/PLIST114
-rw-r--r--news/inn/distinfo18
-rw-r--r--news/inn/patches/patch-ad13
-rw-r--r--news/inn/patches/patch-ae13
-rw-r--r--news/inn/patches/patch-af67
-rw-r--r--news/inn/patches/patch-ag6
-rw-r--r--news/inn/patches/patch-ah5
-rw-r--r--news/inn/patches/patch-ai10
9 files changed, 104 insertions, 171 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 22ccd4254b8..d149938b6bf 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2004/05/23 14:40:00 tron Exp $
+# $NetBSD: Makefile,v 1.57 2004/06/02 11:43:55 tron Exp $
-DISTNAME= inn-${INN_VERSION}
-PKGREVISION= 1
+DISTNAME= inn-2.4.1
CATEGORIES= news
MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \
ftp://ftp.sunet.se/pub/news/nntp/inn/ \
@@ -13,7 +12,6 @@ COMMENT= The public release of InterNet News (INN)
CONFLICTS+= nntpclnt-[0-9]*
-INN_VERSION= 2.3.5
.include "Makefile.common"
BUILD_DEFS+= INN_DATA_DIR INN_USER INN_GROUP
FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR}
@@ -25,7 +23,9 @@ GNU_CONFIGURE_PREFIX= ${INN_PREFIX}
CONFIGURE_ARGS+= --enable-setgid-inews \
--enable-uucp-rnews \
--mandir=${PREFIX}/man \
- --with-perl --with-tmp-path=${INN_DATA_DIR}/tmp \
+ --with-perl \
+ --with-openssl=${SSLBASE} \
+ --with-tmp-dir=${INN_DATA_DIR}/tmp \
--with-db-dir=${INN_DATA_DIR}/db \
--with-etc-dir=${INN_DATA_DIR}/etc \
--with-log-dir=${INN_DATA_DIR}/log \
@@ -69,17 +69,7 @@ RCD_SCRIPTS= innd
.include "../../mk/bsd.prefs.mk"
-# IPv6 support
-#
-# The IPv6 patch is somewhat broken unfortunately. It uses APIs which often
-# are not available under operating systems without IPv4 support. We therefore
-# apply it only if we really want IPv6 support.
-
.if defined(USE_INET6) && ${USE_INET6} == YES
-PATCH_SITES= ftp://ftp.north.ad.jp/pub/IPv6/INN/
-PATCHFILES= inn-${INN_VERSION}-v6-20030327.diff.gz
-PATCH_DIST_STRIP= -p1
-
CONFIGURE_ARGS+= --enable-ipv6
.endif
@@ -115,10 +105,10 @@ post-install:
${RM} -f ${PREFIX}/bin/inews
${LN} -s ../inn/bin/inews ${PREFIX}/bin/inews
${INSTALL_DATA_DIR} ${PREFIX}/include/inn
- ${INSTALL_DATA} ${WRKSRC}/include/config.h ${PREFIX}/include/inn
- ${INSTALL_DATA} ${WRKSRC}/include/dbz.h ${PREFIX}/include/inn
- ${INSTALL_DATA} ${WRKSRC}/include/libinn.h ${PREFIX}/include/inn
- ${INSTALL_DATA} ${WRKSRC}/include/storage.h ${PREFIX}/include/inn
+ cd ${PREFIX}/include/inn; \
+ for FILE in config.h dbz.h libinn.h storage.h; do \
+ ${LN} -s ${INN_PREFIX}/include/$$FILE $$FILE; \
+ done
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
for FILE in `ls -1 ${WRKSRC}/samples/* | \
${EGREP} -v '(Makefile|.*\.(in|orig)$$)'`; do \
@@ -126,4 +116,5 @@ post-install:
done
.include "../../lang/perl5/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/news/inn/PLIST b/news/inn/PLIST
index 5fd528c471b..78c783e641a 100644
--- a/news/inn/PLIST
+++ b/news/inn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/23 22:07:57 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/06/02 11:43:55 tron Exp $
bin/inews
include/inn/config.h
include/inn/dbz.h
@@ -8,8 +8,8 @@ inn/bin/actmerge
inn/bin/actsync
inn/bin/actsyncd
inn/bin/archive
+inn/bin/auth/passwd/auth_smb
inn/bin/auth/passwd/ckpasswd
-inn/bin/auth/passwd/pwcheck
inn/bin/auth/passwd/radius
inn/bin/auth/resolv/domain
inn/bin/auth/resolv/ident
@@ -17,29 +17,20 @@ inn/bin/batcher
inn/bin/buffchan
inn/bin/cnfsheadconf
inn/bin/cnfsstat
-inn/bin/control/checkgroups
inn/bin/control/checkgroups.pl
-inn/bin/control/default
-inn/bin/control/ihave
inn/bin/control/ihave.pl
-inn/bin/control/newgroup
inn/bin/control/newgroup.pl
-inn/bin/control/rmgroup
inn/bin/control/rmgroup.pl
-inn/bin/control/sendme
inn/bin/control/sendme.pl
-inn/bin/control/sendsys
inn/bin/control/sendsys.pl
-inn/bin/control/senduuname
inn/bin/control/senduuname.pl
-inn/bin/control/version
inn/bin/control/version.pl
inn/bin/controlbatch
inn/bin/controlchan
inn/bin/convdate
inn/bin/ctlinnd
inn/bin/cvtbatch
-inn/bin/dbprocs
+inn/bin/docheckgroups
inn/bin/expire
inn/bin/expireover
inn/bin/expirerm
@@ -57,6 +48,7 @@ inn/bin/filter/startup_innd.pl
inn/bin/getlist
inn/bin/gpgverify
inn/bin/grephistory
+inn/bin/imapfeed
inn/bin/inews
inn/bin/inncheck
inn/bin/innconfval
@@ -67,6 +59,7 @@ inn/bin/innfeed
inn/bin/innmail
inn/bin/innreport
inn/bin/innstat
+inn/bin/innupgrade
inn/bin/innwatch
inn/bin/innxbatch
inn/bin/innxmit
@@ -76,14 +69,16 @@ inn/bin/makehistory
inn/bin/mod-active
inn/bin/news.daily
inn/bin/news2mail
-inn/bin/newsrequeue
+inn/bin/ninpaths
inn/bin/nnrpd
inn/bin/nntpget
inn/bin/nntpsend
-inn/bin/ovdb_recover
-inn/bin/ovdb_upgrade
+inn/bin/ovdb_init
+inn/bin/ovdb_monitor
+inn/bin/ovdb_server
+inn/bin/ovdb_stat
inn/bin/overchan
-inn/bin/parsecontrol
+inn/bin/perl-nocem
inn/bin/pgpverify
inn/bin/procbatch
inn/bin/prunehistory
@@ -99,7 +94,7 @@ inn/bin/scanspool
inn/bin/send-ihave
inn/bin/send-nntp
inn/bin/send-uucp
-inn/bin/sendbatch
+inn/bin/sendinpaths
inn/bin/sendxbatches
inn/bin/shlock
inn/bin/shrinkfile
@@ -108,13 +103,59 @@ inn/bin/simpleftp
inn/bin/sm
inn/bin/startinnfeed
inn/bin/tally.control
+inn/bin/tdx-util
inn/bin/writelog
-inn/lib/docheckgroups
+inn/doc/CONTRIBUTORS
+inn/doc/GPL
+inn/doc/HACKING
+inn/doc/INSTALL
+inn/doc/LICENSE
+inn/doc/NEWS
+inn/doc/README
+inn/doc/TODO
+inn/doc/compliance-nntp
+inn/doc/config-design
+inn/doc/config-semantics
+inn/doc/config-syntax
+inn/doc/external-auth
+inn/doc/history
+inn/doc/hook-perl
+inn/doc/hook-python
+inn/doc/hook-tcl
+inn/doc/sample-control
+inn/include/conffile.h
+inn/include/config.h
+inn/include/dbz.h
+inn/include/inn/buffer.h
+inn/include/inn/confparse.h
+inn/include/inn/defines.h
+inn/include/inn/hashtab.h
+inn/include/inn/history.h
+inn/include/inn/innconf.h
+inn/include/inn/list.h
+inn/include/inn/md5.h
+inn/include/inn/messages.h
+inn/include/inn/mmap.h
+inn/include/inn/qio.h
+inn/include/inn/sequence.h
+inn/include/inn/system.h
+inn/include/inn/timer.h
+inn/include/inn/tst.h
+inn/include/inn/vector.h
+inn/include/inn/version.h
+inn/include/inn/wire.h
+inn/include/inndcomm.h
+inn/include/libinn.h
+inn/include/nntp.h
+inn/include/ov.h
+inn/include/paths.h
+inn/include/storage.h
inn/lib/innreport_inn.pm
inn/lib/innshellvars
inn/lib/innshellvars.pl
inn/lib/innshellvars.tcl
inn/lib/libinn.a
+inn/lib/libinnhist.a
inn/lib/libstorage.a
man/man1/convdate.1
man/man1/fastrm.1
@@ -137,7 +178,6 @@ man/man3/libinn.3
man/man3/libstorage.3
man/man3/parsedate.3
man/man3/qio.3
-man/man3/wildmat.3
man/man5/active.5
man/man5/control.ctl.5
man/man5/cycbuff.conf.5
@@ -151,7 +191,6 @@ man/man5/innwatch.ctl.5
man/man5/moderators.5
man/man5/motd.news.5
man/man5/newsfeeds.5
-man/man5/nnrp.access.5
man/man5/nnrpd.track.5
man/man5/nntpsend.ctl.5
man/man5/overview.fmt.5
@@ -184,16 +223,13 @@ man/man8/makehistory.8
man/man8/mod-active.8
man/man8/news.daily.8
man/man8/news2mail.8
-man/man8/newsrequeue.8
man/man8/nnrpd.8
man/man8/nntpsend.8
man/man8/overchan.8
-man/man8/pgpverify.8
man/man8/prunehistory.8
man/man8/pullnews.8
man/man8/scanlogs.8
man/man8/send-uucp.8
-man/man8/sm.8
man/man8/tally.control.8
man/man8/writelog.8
share/examples/inn/INN.py
@@ -201,20 +237,14 @@ share/examples/inn/active.minimal
share/examples/inn/actsync.cfg
share/examples/inn/actsync.ign
share/examples/inn/buffindexed.conf
-share/examples/inn/checkgroups
-share/examples/inn/checkgroups.pl
share/examples/inn/control.ctl
share/examples/inn/cycbuff.conf
-share/examples/inn/default
share/examples/inn/distrib.pats
-share/examples/inn/docheckgroups
share/examples/inn/expire.ctl
share/examples/inn/filter.tcl
-share/examples/inn/filter_innd.py
share/examples/inn/filter_innd.pl
+share/examples/inn/filter_innd.py
share/examples/inn/filter_nnrpd.pl
-share/examples/inn/ihave
-share/examples/inn/ihave.pl
share/examples/inn/incoming.conf
share/examples/inn/inn.conf
share/examples/inn/innfeed.conf
@@ -222,39 +252,35 @@ share/examples/inn/innreport.conf
share/examples/inn/innwatch.ctl
share/examples/inn/moderators
share/examples/inn/motd.news
-share/examples/inn/newgroup
-share/examples/inn/newsgroups.minimal
-share/examples/inn/newgroup.pl
share/examples/inn/news2mail.cf
share/examples/inn/newsfeeds
+share/examples/inn/newsgroups.minimal
share/examples/inn/nnrpd.py
share/examples/inn/nnrpd.track
+share/examples/inn/nnrpd_access.pl
+share/examples/inn/nnrpd_access_wrapper.pl
+share/examples/inn/nnrpd_access_wrapper.py
share/examples/inn/nnrpd_auth.pl
share/examples/inn/nnrpd_auth.py
+share/examples/inn/nnrpd_auth_wrapper.pl
+share/examples/inn/nnrpd_auth_wrapper.py
+share/examples/inn/nnrpd_dynamic_wrapper.py
share/examples/inn/nntpsend.ctl
share/examples/inn/ovdb.conf
share/examples/inn/overview.fmt
-share/examples/inn/parsecontrol
share/examples/inn/passwd.nntp
share/examples/inn/radius.conf
share/examples/inn/readers.conf
-share/examples/inn/rmgroup
-share/examples/inn/rmgroup.pl
share/examples/inn/sasl.conf
-share/examples/inn/sendme
-share/examples/inn/sendme.pl
-share/examples/inn/sendsys
-share/examples/inn/sendsys.pl
-share/examples/inn/senduuname
-share/examples/inn/senduuname.pl
share/examples/inn/startup.tcl
share/examples/inn/startup_innd.pl
share/examples/inn/storage.conf
share/examples/inn/subscriptions
-share/examples/inn/version
-share/examples/inn/version.pl
@dirrm share/examples/inn
@dirrm inn/lib
+@dirrm inn/include/inn
+@dirrm inn/include
+@dirrm inn/doc
@dirrm inn/bin/rnews.libexec
@dirrm inn/bin/filter
@dirrm inn/bin/control
diff --git a/news/inn/distinfo b/news/inn/distinfo
index 5939f2db559..c94ebcaa533 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,15 +1,11 @@
-$NetBSD: distinfo,v 1.8 2003/07/29 16:27:27 wiz Exp $
+$NetBSD: distinfo,v 1.9 2004/06/02 11:43:55 tron Exp $
-SHA1 (inn-2.3.5.tar.gz) = 9fff9ce731f8f62d768eaa4a742bb8d91960b59d
-Size (inn-2.3.5.tar.gz) = 1421702 bytes
-SHA1 (inn-2.3.5-v6-20030327.diff.gz) = b3fb3cd02d94e5cdb3a3b4ab05a689d32a6ddb03
-Size (inn-2.3.5-v6-20030327.diff.gz) = 53828 bytes
+SHA1 (inn-2.4.1.tar.gz) = f36267eca56a643a37ed6c2903cd6fbb71e407f5
+Size (inn-2.4.1.tar.gz) = 1849845 bytes
SHA1 (patch-aa) = 39fcd03440ece2246503197d217e04e4724bbb8d
SHA1 (patch-ab) = c3360248137c07c0e1750860de79aa1f372a6352
SHA1 (patch-ac) = dafbd4918eb771cf0bb49b9d2503125812fe6852
-SHA1 (patch-ad) = 9c23ed46cd3bde1c9ac3797e166bc69a2218ef42
-SHA1 (patch-ae) = cdf3e9783c13a4481bb8ff48bdc5fb0bddf68f62
-SHA1 (patch-af) = 49ce07f3d2b2cc17b91f48ee4e9c7044695a2919
-SHA1 (patch-ag) = 1087421f2a893c030d5299850b0ad0c4f6a37ecd
-SHA1 (patch-ah) = f7ed6195149c03551a5e5d7bb1d5a24bc71bb48c
-SHA1 (patch-ai) = d09c6dd78677f0336f9f4b2911287b4e6f69ebd2
+SHA1 (patch-ad) = c782b0510c460a8942bb272e18e6d8d78901d4c9
+SHA1 (patch-ag) = d91e1710a12d6bf39564f550947f4705b0ffd585
+SHA1 (patch-ah) = 719ed7d26c23ce5170275995e4bd9e5a337199b9
+SHA1 (patch-ai) = 30caac4e6b269dc7cfac507ca1f8f0fe5ac11329
diff --git a/news/inn/patches/patch-ad b/news/inn/patches/patch-ad
index 2704850f350..58df5b67fc2 100644
--- a/news/inn/patches/patch-ad
+++ b/news/inn/patches/patch-ad
@@ -1,13 +1,14 @@
-$NetBSD: patch-ad,v 1.4 2001/02/08 16:23:07 tron Exp $
+$NetBSD: patch-ad,v 1.5 2004/06/02 11:43:55 tron Exp $
---- scripts/rc.news.in.orig Thu Jan 11 09:55:23 2001
-+++ scripts/rc.news.in Mon Feb 5 11:39:49 2001
-@@ -48,6 +48,8 @@
+--- scripts/rc.news.in.orig 2004-01-07 23:47:19.000000000 +0100
++++ scripts/rc.news.in 2004-06-02 11:36:29.000000000 +0200
+@@ -76,6 +76,9 @@
;;
esac
+## Unlimit
+ulimit -n `ulimit -H -n`
++
+ ## Pick ${INND} or ${INNDSTART}
+ WHAT=${INNDSTART}
- AZ=ABCDEFGHIJKLMNOPQRSTUVWXYZ
- az=abcdefghijklmnopqrstuvwxyz
diff --git a/news/inn/patches/patch-ae b/news/inn/patches/patch-ae
deleted file mode 100644
index 5c5497e3dcb..00000000000
--- a/news/inn/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2001/02/08 16:23:07 tron Exp $
-
---- backends/actsyncd.in.orig Wed Jul 19 01:54:07 2000
-+++ backends/actsyncd.in Fri Sep 1 21:05:19 2000
-@@ -163,7 +163,7 @@
- if [ -z "$ftp" ]; then
- echo "getlist -h $host" >>$out
- if getlist -h $host > active 2>>$out; then
-- :
-+ status=0
- else
- status=$NOSYNC
- fi
diff --git a/news/inn/patches/patch-af b/news/inn/patches/patch-af
deleted file mode 100644
index 5dc9e9aabe9..00000000000
--- a/news/inn/patches/patch-af
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-af,v 1.5 2002/07/06 15:04:58 tron Exp $
-
---- backends/sendbatch.in.orig Thu Sep 17 08:15:02 1998
-+++ backends/sendbatch.in Mon Jul 19 01:23:35 1999
-@@ -37,6 +37,10 @@
- DEFBYTES=`expr "${SITE}" : '-s\(.*\)'`
- continue
- ;;
-+ -t*)
-+ TRANSHOST=`expr "${SITE}" : '-t\(.*\)'`
-+ continue
-+ ;;
- -m*)
- BYTESQUEUED=`expr "${SITE}" : '-m\(.*\)'`
- continue
-@@ -75,6 +79,16 @@
- ECHO="echo '#! cunbatch'"
- continue
- ;;
-+ -cg)
-+ COMP="; exec gzip -9"
-+ ECHO="echo '#! cunbatch'"
-+ continue
-+ ;;
-+ -g)
-+ COMP="; exec gzip -9"
-+ ECHO="echo '#! gunbatch'"
-+ continue
-+ ;;
- +c)
- COMP=''
- C7=''
-@@ -160,12 +174,20 @@
- fi
- # fi
-
-+ if [ ${TRANSHOST-none} != none ]; then
-+ SITE_SPOOLDIR=${UUSPOOL}/${TRANSHOST}
-+ UUCPPATH=${TRANSHOST}!${SITE}
-+ else
-+ UUCPPATH=${SITE}
-+ SITE_SPOOLDIR=${UUSPOOL}/${SITE}
-+ fi
-+
- ## Check the host's queue size?
- QUEUE=0
- if [ -n "${BYTESQUEUED}" ] ; then
-- if [ -d ${UUSPOOL}/${SITE} ] ; then
-+ if [ -d ${SITE_SPOOLDIR} ] ; then
- # Get queue size from directory size
-- QUEUE=`du -s "${UUSPOOL}/${SITE}" \
-+ QUEUE=`du -s "${SITE_SPOOLDIR}" \
- | ${AWK} '{ printf("%s000\n", $1); }'`
-
- else
-@@ -199,9 +221,9 @@
- if [ -f ${SITE}.cmd ] ; then
- UUXCOM="`cat ${SITE}.cmd`"
- elif [ -n "${ECHO}" -o -n "${COMP}" ]; then
-- UUXCOM="( ${ECHO} ${COMP} ) | ${UUX} - ${UUXFLAGS} ${SITE}!${RNEWS}"
-+ UUXCOM="( ${ECHO} ${COMP} ) | ${UUX} - ${UUXFLAGS} ${UUCPPATH}!${RNEWS}"
- else
-- UUXCOM="${UUX} - ${UUXFLAGS} ${SITE}!${RNEWS}"
-+ UUXCOM="${UUX} - ${UUXFLAGS} ${UUCPPATH}!${RNEWS}"
- fi
-
- ## Create batches.
diff --git a/news/inn/patches/patch-ag b/news/inn/patches/patch-ag
index 2b64118b0e1..d9830b29cc9 100644
--- a/news/inn/patches/patch-ag
+++ b/news/inn/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.6 2002/07/06 15:04:58 tron Exp $
+$NetBSD: patch-ag,v 1.7 2004/06/02 11:43:55 tron Exp $
---- backends/pgpverify.in.orig Mon May 6 08:02:07 2002
-+++ backends/pgpverify.in Sat Jul 6 16:58:05 2002
+--- control/pgpverify.in.orig Mon May 6 08:02:07 2002
++++ control/pgpverify.in Sat Jul 6 16:58:05 2002
@@ -90,7 +90,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
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
index 855274ba9f1..334ed43b03f 100644
--- a/news/inn/patches/patch-ah
+++ b/news/inn/patches/patch-ah
@@ -1,9 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2001/07/10 16:02:12 tron Exp $
+$NetBSD: patch-ah,v 1.6 2004/06/02 11:43:55 tron Exp $
--- site/Makefile.orig Thu May 3 22:27:32 2001
+++ site/Makefile Sun Jun 24 13:01:33 2001
-@@ -84,22 +84,11 @@
- $D$(CTLBIN)/sendsys.pl $D$(CTLBIN)/senduuname.pl $D$(CTLBIN)/version.pl
+@@ -85,21 +85,10 @@
REST_INSTALLED = \
- $D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai
index ba1f000a5ae..39a7dfef732 100644
--- a/news/inn/patches/patch-ai
+++ b/news/inn/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.3 2003/07/29 16:27:27 wiz Exp $
+$NetBSD: patch-ai,v 1.4 2004/06/02 11:43:55 tron Exp $
---- include/dbz.h.orig 2002-12-23 00:00:38.000000000 +0100
-+++ include/dbz.h
-@@ -42,7 +42,7 @@ typedef struct {
- BOOL nonblock;
+--- include/dbz.h.orig 2004-01-07 23:47:19.000000000 +0100
++++ include/dbz.h 2004-06-02 13:02:04.000000000 +0200
+@@ -38,7 +38,7 @@
+ bool nonblock;
} dbzoptions;
-#ifdef __GNUC__