From 12ea1359778151be026f19bfa64111352af12bba Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 18 Jul 1999 23:34:12 +0000 Subject: Update INN package to version 2.2. This update is based on the patches supplied by Chris Jones in PR pkg/7597. --- news/inn/Makefile | 46 ++++-- news/inn/files/md5 | 4 +- news/inn/files/patch-sum | 11 +- news/inn/patches/patch-aa | 44 +++--- news/inn/patches/patch-ab | 9 +- news/inn/patches/patch-ac | 3 +- news/inn/patches/patch-ad | 14 ++ news/inn/patches/patch-ae | 22 +++ news/inn/pkg/DEINSTALL | 12 +- news/inn/pkg/DESCR | 2 +- news/inn/pkg/INSTALL | 37 +++++ news/inn/pkg/PLIST | 361 +++++++++++++++++++++++----------------------- news/inn/pkg/install | 45 ------ 13 files changed, 333 insertions(+), 277 deletions(-) create mode 100644 news/inn/patches/patch-ad create mode 100644 news/inn/patches/patch-ae create mode 100644 news/inn/pkg/INSTALL delete mode 100644 news/inn/pkg/install (limited to 'news/inn') diff --git a/news/inn/Makefile b/news/inn/Makefile index aac09e484a8..ea025877925 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,34 +1,52 @@ -# $NetBSD: Makefile,v 1.3 1998/10/17 18:09:32 bad Exp $ +# $NetBSD: Makefile,v 1.4 1999/07/18 23:34:12 tron Exp $ -DISTNAME= inn-2.1 +DISTNAME= inn-2.2 CATEGORIES= news -MASTER_SITES= ftp://wuarchive.wustl.edu/packages/news/transport/inn/ +MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \ + ftp://ftp.sunet.se/pub/news/nntp/inn/ \ + ftp://ftp.fu-berlin.de/unix/news/inn/ -MAINTAINER= root@garbled.net +MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.isc.org/inn.html BUILD_DEPENDS+= bison:../../devel/bison CONFLICTS+= nntpclnt-* -INN_SPOOL?= /var/spool/news +INN_DATA_DIR?= /var/news USE_PERL5= yes USE_LIBTOOL= yes -CONFIGURE_ARGS+= --with-perl --with-spool-dir=${INN_SPOOL} -CONFIGURE_ARGS+= --with-tmp-path=/tmp --with-sendmail=/usr/sbin/sendmail -CONFIGURE_ENV+= _PATH_PERL=${LOCALBASE}/bin/perl GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-perl --with-tmp-path=/tmp \ + --with-sendmail=/usr/sbin/sendmail \ + --with-db-dir=${INN_DATA_DIR}/db \ + --with-etc-dir=${INN_DATA_DIR}/etc \ + --with-log-dir=${INN_DATA_DIR}/log \ + --with-run-dir=${INN_DATA_DIR}/run \ + --with-spool-dir=${INN_DATA_DIR}/spool +CONFIGURE_ENV+= _PATH_PERL=${LOCALBASE}/bin/perl + +DEINSTALL_FILE= ${WRKDIR}/DEINSTALL +INSTALL_FILE= ${WRKDIR}/INSTALL +#INSTALL_TARGET= update -INSTALL_FILE= ${WRKDIR}/.INSTALL +post-build: +.for FILE in DEINSTALL INSTALL + ${SED} -e 's#@@INN_DATA_DIR@@#${INN_DATA_DIR}#g' \ + -e 's#@@PREFIX@@#${PREFIX}#g' \ + ${PKGDIR}/${FILE} >${WRKDIR}/${FILE} +.endfor -post-patch: - ${SED} -e 's@XXXINN_SPOOLXXX@${INN_SPOOL}@g' \ - -e 's@XXXPREFIXXXX@${PREFIX}@g' \ - ${PKGDIR}/install > ${INSTALL_FILE} +pre-install: + ${MKDIR} ${INN_DATA_DIR} post-install: ${MKDIR} ${PREFIX}/share/examples/inn - ${CP} -R ${WRKSRC}/samples/* ${PREFIX}/share/examples/inn + for FILE in `ls -1 ${WRKSRC}/samples/* | \ + ${EGREP} -v '\.(in|orig)$'`; do \ + ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/inn; \ + done +# @${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL .include "../../mk/bsd.pkg.mk" diff --git a/news/inn/files/md5 b/news/inn/files/md5 index f1ebeb94d39..cd53ea7dfdc 100644 --- a/news/inn/files/md5 +++ b/news/inn/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1 1998/09/05 03:21:11 garbled Exp $ +$NetBSD: md5,v 1.2 1999/07/18 23:34:13 tron Exp $ -MD5 (inn-2.1.tar.gz) = 5c0fc548295474f82cb15e27c78eed7f +MD5 (inn-2.2.tar.gz) = 9c8cb250d56428af06c7c49f7d8d1a29 diff --git a/news/inn/files/patch-sum b/news/inn/files/patch-sum index 7668a0df2b9..a6a87e87fc5 100644 --- a/news/inn/files/patch-sum +++ b/news/inn/files/patch-sum @@ -1,5 +1,8 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:33 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/07/18 23:34:13 tron Exp $ -MD5 (patch-aa) = 95e14f5445bdf0855e25dd31a9b98a51 -MD5 (patch-ab) = 120d16170d7b1c4f779495b3e985ad33 -MD5 (patch-ac) = 99cb771f77c90c33b0b6eb0f3eac798a +MD5 (patch-aa) = 2390c877da186d1501bfb499a9f27096 +MD5 (patch-ab) = 69a4b8bfa51950f4d1fac766e906cc97 +MD5 (patch-ac) = f5aebc01ed0ec6a29bb40b343f308050 +MD5 (patch-ad) = 3eec593f7b8efe5ec284887f713d4ddd +MD5 (patch-ae) = 084256092f1179105004da3f000ee33f +MD5 (patch-af) = d8eac199c981d82eed4b454bc20115f7 diff --git a/news/inn/patches/patch-aa b/news/inn/patches/patch-aa index f8386f172ed..c5b5354baa5 100644 --- a/news/inn/patches/patch-aa +++ b/news/inn/patches/patch-aa @@ -1,26 +1,28 @@ -$NetBSD: patch-aa,v 1.4 1998/10/18 09:58:55 matthias Exp $ +$NetBSD: patch-aa,v 1.5 1999/07/18 23:34:13 tron Exp $ ---- configure.orig Fri Jul 24 15:13:00 1998 -+++ configure Thu Oct 8 11:39:49 1998 -@@ -960,7 +960,7 @@ +--- configure.orig Mon May 17 10:25:36 1999 ++++ configure Mon May 17 10:25:41 1999 +@@ -959,20 +959,9 @@ -- -+if false; then - LIBTOOL='$(SHELL) ../libtool' - UPLIBTOOL='$(SHELL) ../../libtool' - EXTOBJ='lo' -@@ -1057,7 +1057,11 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -- -+else -+UPLIBTOOL=$LIBTOOL -+EXTLIB=la -+EXTOBJ=lo -+fi +-LIBTOOL='' +-UPLIBTOOL='' +-EXTOBJ='o' +-EXTLIB='a' +-# Check whether --enable-libtool or --disable-libtool was given. +-if test "${enable_libtool+set}" = set; then +- enableval="$enable_libtool" +- if test "$enableval" = yes; then +- LIBTOOL='$(SHELL) ../libtool' +- UPLIBTOOL='$(SHELL) ../../libtool' +- EXTOBJ='lo' +- EXTLIB='la' +-fi +-fi ++UPLIBTOOL="${LIBTOOL}" ++EXTOBJ='lo' ++EXTLIB='la' + + - test "x$prefix" = xNONE && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix=$ac_default_prefix diff --git a/news/inn/patches/patch-ab b/news/inn/patches/patch-ab index 9b041d9d153..40b1027efd2 100644 --- a/news/inn/patches/patch-ab +++ b/news/inn/patches/patch-ab @@ -1,13 +1,14 @@ -$NetBSD: patch-ab,v 1.3 1999/02/11 07:52:43 frueauf Exp $ +$NetBSD: patch-ab,v 1.4 1999/07/18 23:34:13 tron Exp $ ---- samples/news.daily.in-orig Fri Jul 24 15:13:00 1998 -+++ samples/news.daily.in Thu Feb 11 08:47:18 1999 -@@ -224,6 +224,9 @@ +--- samples/news.daily.in.orig Mon May 17 10:26:41 1999 ++++ samples/news.daily.in Mon May 17 10:27:14 1999 +@@ -226,6 +226,10 @@ cd ${PATHETC} +## Unlimit +ulimit -d `ulimit -H -d` ++ulimit -n `ulimit -H -n` + ## Show the status of the news system. ${DOSTAT} && { diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac index 40441b1de5f..a5ed22c0b94 100644 --- a/news/inn/patches/patch-ac +++ b/news/inn/patches/patch-ac @@ -1,4 +1,5 @@ -$NetBSD: patch-ac,v 1.1 1998/09/05 03:21:11 garbled Exp $ +$NetBSD: patch-ac,v 1.2 1999/07/18 23:34:13 tron Exp $ + --- Makefile.global.in.orig Fri Aug 28 12:34:15 1998 +++ Makefile.global.in Fri Aug 28 12:29:51 1998 @@ -34,7 +34,7 @@ diff --git a/news/inn/patches/patch-ad b/news/inn/patches/patch-ad new file mode 100644 index 00000000000..670242135d4 --- /dev/null +++ b/news/inn/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.3 1999/07/18 23:34:14 tron Exp $ + +--- samples/rc.news.in.orig Mon May 17 11:48:11 1999 ++++ samples/rc.news.in Mon May 17 11:48:38 1999 +@@ -6,6 +6,9 @@ + + . @LIBDIR@/innshellvars + ++## Unlimit ++ulimit -n `ulimit -H -n` ++ + AZ=ABCDEFGHIJKLMNOPQRSTUVWXYZ + az=abcdefghijklmnopqrstuvwxyz + ## Pick ${INND} or ${INNDSTART} diff --git a/news/inn/patches/patch-ae b/news/inn/patches/patch-ae new file mode 100644 index 00000000000..a9010a14626 --- /dev/null +++ b/news/inn/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.3 1999/07/18 23:34:14 tron Exp $ + +--- backends/actsyncd.sh.in.orig Sat Oct 17 03:07:27 1998 ++++ backends/actsyncd.sh.in Sun Jul 18 01:47:43 1999 +@@ -156,7 +156,7 @@ + if [ -z "$ftp" ]; then + echo "getlist -h $host" >>$out + if getlist -h $host > active 2>>$out; then +- : ++ status=0 + else + status=$NOSYNC + fi +@@ -172,7 +172,7 @@ + # does not understand gzip. + *.gz|*.Z) echo "$COMPRESS -d active" >>$out + if $COMPRESS -d active >>$out 2>&1; then +- : ++ status=0 + else + status=1 + fi ;; diff --git a/news/inn/pkg/DEINSTALL b/news/inn/pkg/DEINSTALL index f9ceac60cd5..6312685c0e8 100644 --- a/news/inn/pkg/DEINSTALL +++ b/news/inn/pkg/DEINSTALL @@ -1,18 +1,15 @@ #! /bin/sh # -# $NetBSD: DEINSTALL,v 1.1 1998/09/05 03:21:12 garbled Exp $ -# +# $NetBSD: DEINSTALL,v 1.2 1999/07/18 23:34:14 tron Exp $ case "$2" in DEINSTALL) cat <