From root@test.badcow.com.tw Fri May 26 13:03:19 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CA64016A42F for ; Fri, 26 May 2006 13:03:19 +0000 (UTC) (envelope-from root@test.badcow.com.tw) Received: from test.badcow.com.tw (NK210-200-247-199.cl.static.apol.com.tw [210.200.247.199]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23B7F43D46 for ; Fri, 26 May 2006 13:03:16 +0000 (GMT) (envelope-from root@test.badcow.com.tw) Received: by test.badcow.com.tw (Postfix, from userid 0) id 2591119E9D8; Fri, 26 May 2006 21:03:13 +0800 (CST) Message-Id: <20060526130313.2591119E9D8@test.badcow.com.tw> Date: Fri, 26 May 2006 21:03:13 +0800 (CST) From: Charlie & To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [PATCH] news/inn-stable: update to 2.4.4-stable X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 97955 >Category: ports >Synopsis: [PATCH] news/inn-stable: update to 2.4.4-stable >Confidential: no >Severity: non-critical >Priority: low >Responsible: shaun >State: closed >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri May 26 13:10:17 GMT 2006 >Closed-Date: Tue Oct 31 16:37:15 GMT 2006 >Last-Modified: Tue Oct 31 16:37:15 GMT 2006 >Originator: Hong-Yi Chen >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD test.badcow.com.tw 6.1-STABLE FreeBSD 6.1-STABLE #3: Tue May 9 13:39:17 CST >Description: Update to 2.4.4-20060525-snapshot >How-To-Repeat: >Fix: --- inn-stable-20060525.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # inn-stable # inn-stable/Makefile # inn-stable/distinfo # inn-stable/pkg-descr # inn-stable/pkg-install # inn-stable/pkg-plist # inn-stable/files # inn-stable/files/innd.sh # inn-stable/files/patch-configure # inn-stable/files/patch-site:Makefile # echo c - inn-stable mkdir -p inn-stable > /dev/null 2>&1 echo x - inn-stable/Makefile sed 's/^X//' >inn-stable/Makefile << 'END-of-inn-stable/Makefile' X# New ports collection makefile for: inn-stable X# Date created: 20 Oct 1994 (1.4), 18 Dec 1996 (1.5.1), 14 Feb 1999 (2.2) X# Whom: torstenb X# X# $FreeBSD$ X# X XPORTNAME= inn XPORTVERSION= ${SNAPSHOT} XCATEGORIES= news ipv6 XMASTER_SITES= http://ftp.isc.org/isc/inn/snapshots/ XPKGNAMESUFFIX= -${BRANCH} XDISTNAME= ${PORTNAME}-${BRANCH:U}-${SNAPSHOT} X XMAINTAINER= gaod@hychen.org XCOMMENT= InterNetNews -- the Internet meets Netnews X XBRANCH= stable XSNAPSHOT= 20060525 X XNO_LATEST_LINK= yes XUSE_GMAKE= yes XUSE_PERL5= yes XUSE_OPENSSL= yes X XCONFLICTS= inn-2.4.0* inn-current-* X X.if exists(/var/news) && !defined(PACKAGE_BUILDING) XINN_NEWSSPOOL?=/var/news X.elif exists(/var/spool/news) && !defined(PACKAGE_BUILDING) XINN_NEWSSPOOL?=/var/spool/news X.else XINN_NEWSSPOOL?=${PREFIX}/news/spool X.endif XINN_NEWSLOG?=/var/log/news X XHAS_CONFIGURE= yes XCONFIGURE_ENV+= LOCALBASE=${LOCALBASE} XCONFIGURE_ARGS+= --mandir=${PREFIX}/man \ X --prefix=${PREFIX}/news \ X --with-spool-dir=${INN_NEWSSPOOL} \ X --with-log-dir=${INN_NEWSLOG} \ X --with-perl \ X --with-tmp-dir=${INN_NEWSSPOOL}/tmp \ X --with-openssl=${OPENSSLBASE} \ X --enable-ipv6 \ X --with-etc-dir=${ETC_DIR} X X.if defined(WITH_BERKELEYDB) XCONFIGURE_ARGS+= --with-berkeleydb X. if !defined(WITH_BDB_VER) XWITH_BDB_VER= 4 X. endif X. if (${WITH_BDB_VER} == 3) || (${WITH_BDB_VER} == 4) || (${WITH_BDB_VER} == 41) XLIB_DEPENDS+= db${WITH_BDB_VER}:${PORTSDIR}/databases/db${WITH_BDB_VER} X. elif ${WITH_BDB_VER} == 2 XBROKEN= Does not compile with db2 X. else XBROKEN= Unknown BerkeleyDB version X. endif XCONFIGURE_ENV+= DB_VER=db${WITH_BDB_VER} XCONFIGURE_ARGS+= --with-berkeleydb=${LOCALBASE} X.endif X X.if defined(WITH_PYTHON) XUSE_PYTHON= YES XCONFIGURE_ARGS+= --with-python X.endif X X.if defined(WITH_TCL) XCONFIGURE_ARGS+= --with-tcl=${LOCALBASE} XBUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83 X.endif X X.if defined (WITH_MAXSOCKET) XCONFIGURE_ARGS+= --with-max-sockets=${WITH_MAXSOCKET} X.endif X X.if defined(WITH_KEYWORDS) XCONFIGURE_ARGS+= --enable-keywords X.endif X X.if defined(WITH_SASL) XCONFIGURE_ARGS+= --with-sasl=${LOCALBASE} XLIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 X.endif X X.if defined(WITH_TAGGED_HASH) XCONFIGURE_ARGS+= --enable-tagged-hash XDBZ_FILES= dir pag XPLIST_SUB= SUB_WITH_TAGGED_HASH="" XPLIST_SUB+= SUB_WITHOUT_TAGGED_HASH="@comment " X.else XCONFIGURE_ARGS+= --enable-largefiles XDBZ_FILES= dir hash index XPLIST_SUB= SUB_WITH_TAGGED_HASH="@comment " XPLIST_SUB+= SUB_WITHOUT_TAGGED_HASH="" X.endif X XEXTRA= CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO XHEADERS= clibrary.h config.h dbz.h libinn.h storage.h X XMAN1= convdate.1 fastrm.1 getlist.1 grephistory.1 inews.1 innconfval.1 \ X innfeed.1 innmail.1 nntpget.1 pgpverify.1 pullnews.1 rnews.1 shlock.1 \ X shrinkfile.1 simpleftp.1 sm.1 startinnfeed.1 XMAN3= clientlib.3 dbz.3 inndcomm.3 libauth.3 libinn.3 libinnhist.3 \ X libstorage.3 list.3 parsedate.3 qio.3 tst.3 uwildmat.3 XMAN5= active.5 active.times.5 buffindexed.conf.5 control.ctl.5 \ X cycbuff.conf.5 distrib.pats.5 expire.ctl.5 history.5 incoming.conf.5 \ X inn.conf.5 innfeed.conf.5 innwatch.ctl.5 moderators.5 motd.news.5 \ X newsfeeds.5 newslog.5 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \ X overview.fmt.5 passwd.nntp.5 radius.conf.5 readers.conf.5 \ X sasl.conf.5 storage.conf.5 subscriptions.5 XMAN8= actsync.8 actsyncd.8 archive.8 auth_smb.8 batcher.8 buffchan.8 \ X ckpasswd.8 cnfsheadconf.8 cnfsstat.8 controlchan.8 ctlinnd.8 \ X cvtbatch.8 domain.8 expire.8 expireover.8 expirerm.8 filechan.8 \ X ident.8 inncheck.8 innd.8 inndf.8 inndstart.8 innreport.8 innstat.8 \ X innupgrade.8 innwatch.8 innxbatch.8 innxmit.8 mailpost.8 makedbz.8 \ X makehistory.8 mod-active.8 news.daily.8 news2mail.8 ninpaths.8 \ X nnrpd.8 nntpsend.8 ovdb_init.8 ovdb_monitor.8 ovdb_server.8 \ X ovdb_stat.8 overchan.8 perl-nocem.8 prunehistory.8 \ X radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \ X tally.control.8 tdx-util.8 writelog.8 X XTO_BE_STRIPPED= bin/auth/resolv/domain bin/auth/resolv/ident bin/auth/passwd/auth_smb \ X bin/auth/passwd/ckpasswd bin/auth/passwd/radius bin/rnews.libexec/decode \ X bin/rnews.libexec/encode bin/tdx-util bin/innd bin/inndstart bin/nnrpd \ X bin/innfeed bin/startinnfeed bin/imapfeed bin/convdate bin/expire \ X bin/expireover bin/fastrm bin/grephistory bin/makedbz bin/makehistory \ X bin/prunehistory bin/ctlinnd bin/getlist bin/inews bin/innconfval \ X bin/ovdb_init bin/ovdb_monitor bin/ovdb_server bin/ovdb_stat bin/rnews \ X bin/sm bin/actsync bin/archive bin/batcher bin/buffchan bin/cvtbatch \ X bin/filechan bin/inndf bin/innxmit bin/innxbatch bin/ninpaths bin/nntpget \ X bin/overchan bin/shlock bin/shrinkfile X X.include X X.if defined(WITH_STANDARD_ETC) XETC_DIR= ${PREFIX}/etc/inn XPLIST_SUB+= ETCDIR="etc/inn" X.else XETC_DIR= ${PREFIX}/news/etc XPLIST_SUB+= ETCDIR=news/etc X.endif X Xpost-patch: X.if defined(WITH_TCL) X @${REINPLACE_CMD} -e 's!!!' ${WRKSRC}/innd/innd.h X @${REINPLACE_CMD} -e 's!-ltcl!-ltcl83!' ${WRKSRC}/configure X.endif X Xpost-install: X.if !defined(WITHOUT_STRIP) X.for FILE in ${TO_BE_STRIPPED} X ${STRIP_CMD} ${PREFIX}/news/${FILE} X.endfor X.endif X ${CHOWN} root:wheel ${PREFIX}/man ${PREFIX}/man/man1 ${PREFIX}/man/man3 \ X ${PREFIX}/man/man5 ${PREFIX}/man/man8 X ${MKDIR} ${INN_NEWSSPOOL} X.if !defined(NOPORTDOCS) X ${MKDIR} ${DOCSDIR} X.for FILE in ${EXTRA} X ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} X.endfor X.endif X ${MKDIR} ${PREFIX}/news/include X.for FILE in ${HEADERS} X ${INSTALL_DATA} ${WRKSRC}/include/${FILE} ${PREFIX}/news/include/ X.endfor X @${SED} <${FILESDIR}/innd.sh >${PREFIX}/etc/rc.d/innd.sh \ X s+!!PREFIX!!+${PREFIX}+g && ${CHMOD} +x ${PREFIX}/etc/rc.d/innd.sh X @${CHOWN} root:news ${PREFIX}/news/bin/auth/passwd/ckpasswd X @${CHMOD} 4755 ${PREFIX}/news/bin/auth/passwd/ckpasswd X @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF ${ETC_DIR} X @(if [ ! -f ${PREFIX}/news/db/history ] ; then \ X ${ECHO} 'Creating empty history database...' ; \ X cd ${PREFIX}/news/db ; \ X ${TOUCH} history ; \ X ${CHMOD} 644 history ; \ X ${CHOWN} news:news history ; \ X su -fm news -c "../bin/makedbz -i" ; \ X for s in ${DBZ_FILES} ; do \ X ${MV} history.n.$${s} history.$${s} ; \ X done ; \ X fi) X @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL X X.include END-of-inn-stable/Makefile echo x - inn-stable/distinfo sed 's/^X//' >inn-stable/distinfo << 'END-of-inn-stable/distinfo' XMD5 (inn-STABLE-20060525.tar.gz) = dedb85e7ee66c12dc40639260aca9c7d XSHA256 (inn-STABLE-20060525.tar.gz) = 2b198e19274642b0466887e7a71e8bda7b8b1331c4d3719e6e108b9568328f0a XSIZE (inn-STABLE-20060525.tar.gz) = 1865441 END-of-inn-stable/distinfo echo x - inn-stable/pkg-descr sed 's/^X//' >inn-stable/pkg-descr << 'END-of-inn-stable/pkg-descr' XInterNetNews is a complete Usenet system. The cornerstone of the package Xis innd, an NNTP server that multiplexes all I/O. Newsreading is handled Xby a separate server, nnrpd, that is spawned for each client. Both innd Xand nnrpd have some slight variances from the NNTP protocol. X XWWW: http://www.isc.org/products/INN/ END-of-inn-stable/pkg-descr echo x - inn-stable/pkg-install sed 's/^X//' >inn-stable/pkg-install << 'END-of-inn-stable/pkg-install' X#!/bin/sh X XPKGNAME=$1 X[ ! -n PKG_PREFIX ] && exit 1 XPKG_PREFIX=${PKG_PREFIX:-/usr/local} X Xcase $2 in X PRE-INSTALL) X ;; X CHECK-CONF) X ETC_DIR=${3} X echo "Checking for configuration files" X for f in $(find ${ETC_DIR} -name "*.dist" -type f) X do X REALFILE=${f%%.dist} X echo -n "Checking if ${REALFILE} exists: " X if [ -e ${REALFILE} ] X then X echo "[YES]" X else X echo "[NO]" X echo " Installing ${f} to ${REALFILE}" X cp -p ${f} ${REALFILE} X fi X done X ;; X POST-INSTALL) X NEWSBASE=${PKG_PREFIX}/news X install -d -o news -g news -m 755 \ X ${NEWSBASE}/run \ X ${NEWSBASE}/spool \ X ${NEWSBASE}/spool/archive \ X ${NEWSBASE}/spool/articles \ X ${NEWSBASE}/spool/incoming \ X ${NEWSBASE}/spool/incoming/bad \ X ${NEWSBASE}/spool/innfeed \ X ${NEWSBASE}/spool/outgoing \ X ${NEWSBASE}/spool/overview \ X ${NEWSBASE}/spool/tmp X ;; X *) X echo "Unexpected Argument $2!!!" X exit 1 X ;; Xesac Xexit 0 END-of-inn-stable/pkg-install echo x - inn-stable/pkg-plist sed 's/^X//' >inn-stable/pkg-plist << 'END-of-inn-stable/pkg-plist' Xetc/rc.d/innd.sh X%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS X%%PORTDOCS%%%%DOCSDIR%%/HACKING X%%PORTDOCS%%%%DOCSDIR%%/INSTALL X%%PORTDOCS%%%%DOCSDIR%%/LICENSE X%%PORTDOCS%%%%DOCSDIR%%/MANIFEST X%%PORTDOCS%%%%DOCSDIR%%/NEWS X%%PORTDOCS%%%%DOCSDIR%%/README X%%PORTDOCS%%%%DOCSDIR%%/TODO X%%PORTDOCS%%@dirrm %%DOCSDIR%% Xnews/bin/auth/resolv/domain Xnews/bin/auth/resolv/ident Xnews/bin/auth/passwd/auth_smb Xnews/bin/auth/passwd/ckpasswd Xnews/bin/auth/passwd/radius Xnews/bin/control/checkgroups.pl Xnews/bin/control/ihave.pl Xnews/bin/control/newgroup.pl Xnews/bin/control/rmgroup.pl Xnews/bin/control/sendme.pl Xnews/bin/control/sendsys.pl Xnews/bin/control/senduuname.pl Xnews/bin/control/version.pl Xnews/bin/filter/startup_innd.pl Xnews/bin/filter/filter_innd.pl Xnews/bin/filter/filter_nnrpd.pl Xnews/bin/filter/filter_innd.py Xnews/bin/filter/INN.py Xnews/bin/filter/startup.tcl Xnews/bin/filter/filter.tcl Xnews/bin/filter/nnrpd_auth.pl Xnews/bin/filter/nnrpd_auth.py Xnews/bin/filter/nnrpd_access.pl Xnews/bin/rnews.libexec/c7unbatch Xnews/bin/rnews.libexec/decode Xnews/bin/rnews.libexec/encode Xnews/bin/rnews.libexec/gunbatch Xnews/bin/tdx-util Xnews/bin/innd Xnews/bin/inndstart Xnews/bin/nnrpd Xnews/bin/innfeed Xnews/bin/imapfeed Xnews/bin/procbatch Xnews/bin/startinnfeed Xnews/bin/controlbatch Xnews/bin/controlchan Xnews/bin/docheckgroups Xnews/bin/gpgverify Xnews/bin/perl-nocem Xnews/bin/pgpverify Xnews/bin/signcontrol Xnews/bin/convdate Xnews/bin/fastrm Xnews/bin/grephistory Xnews/bin/expire Xnews/bin/expireover Xnews/bin/makedbz Xnews/bin/makehistory Xnews/bin/prunehistory Xnews/bin/expirerm Xnews/bin/inews Xnews/bin/rnews Xnews/bin/cnfsheadconf Xnews/bin/cnfsstat Xnews/bin/mailpost Xnews/bin/pullnews Xnews/bin/scanspool Xnews/bin/ctlinnd Xnews/bin/ovdb_init Xnews/bin/ovdb_monitor Xnews/bin/ovdb_server Xnews/bin/ovdb_stat Xnews/bin/getlist Xnews/bin/innconfval Xnews/bin/sm Xnews/bin/actmerge Xnews/bin/actsyncd Xnews/bin/news2mail Xnews/bin/nntpsend Xnews/bin/send-ihave Xnews/bin/send-nntp Xnews/bin/send-uucp Xnews/bin/sendinpaths Xnews/bin/sendxbatches Xnews/bin/mod-active Xnews/bin/overchan Xnews/bin/actsync Xnews/bin/archive Xnews/bin/batcher Xnews/bin/buffchan Xnews/bin/cvtbatch Xnews/bin/filechan Xnews/bin/inndf Xnews/bin/innxbatch Xnews/bin/innxmit Xnews/bin/ninpaths Xnews/bin/nntpget Xnews/bin/shlock Xnews/bin/shrinkfile Xnews/bin/innmail Xnews/bin/innreport Xnews/bin/simpleftp Xnews/bin/inncheck Xnews/bin/innstat Xnews/bin/innupgrade Xnews/bin/innwatch Xnews/bin/news.daily Xnews/bin/rc.news Xnews/bin/scanlogs Xnews/bin/tally.control Xnews/bin/writelog Xnews/db/active.times Xnews/db/active Xnews/db/history Xnews/db/newsgroups Xnews/db/history.dir X%%SUB_WITHOUT_TAGGED_HASH%%news/db/history.hash X%%SUB_WITHOUT_TAGGED_HASH%%news/db/history.index X%%SUB_WITH_TAGGED_HASH%%news/db/history.pag Xnews/doc/CONTRIBUTORS Xnews/doc/HACKING Xnews/doc/INSTALL Xnews/doc/LICENSE Xnews/doc/NEWS Xnews/doc/README Xnews/doc/TODO Xnews/doc/GPL Xnews/doc/compliance-nntp Xnews/doc/config-design Xnews/doc/config-semantics Xnews/doc/config-syntax Xnews/doc/external-auth Xnews/doc/history Xnews/doc/hook-perl Xnews/doc/hook-python Xnews/doc/hook-tcl Xnews/doc/sample-control Xnews/doc/README.snapshot Xnews/etc/newsfeeds Xnews/etc/newsfeeds.dist Xnews/etc/incoming.conf.dist Xnews/etc/nnrpd.track.dist Xnews/etc/passwd.nntp.dist Xnews/etc/inn.conf.dist Xnews/etc/moderators.dist Xnews/etc/control.ctl.dist Xnews/etc/expire.ctl.dist Xnews/etc/nntpsend.ctl.dist Xnews/etc/innreport.conf.dist Xnews/etc/innwatch.ctl.dist Xnews/etc/distrib.pats.dist Xnews/etc/overview.fmt.dist Xnews/etc/actsync.cfg.dist Xnews/etc/actsync.ign.dist Xnews/etc/motd.news.dist Xnews/etc/storage.conf.dist Xnews/etc/cycbuff.conf.dist Xnews/etc/buffindexed.conf.dist Xnews/etc/innfeed.conf.dist Xnews/etc/news2mail.cf.dist Xnews/etc/readers.conf.dist Xnews/etc/radius.conf.dist Xnews/etc/ovdb.conf.dist Xnews/etc/sasl.conf.dist Xnews/etc/subscriptions.dist Xnews/etc/incoming.conf Xnews/etc/nnrpd.track Xnews/etc/passwd.nntp Xnews/etc/inn.conf Xnews/etc/moderators Xnews/etc/control.ctl Xnews/etc/expire.ctl Xnews/etc/nntpsend.ctl Xnews/etc/innreport.conf Xnews/etc/innwatch.ctl Xnews/etc/distrib.pats Xnews/etc/overview.fmt Xnews/etc/actsync.cfg Xnews/etc/actsync.ign Xnews/etc/motd.news Xnews/etc/storage.conf Xnews/etc/cycbuff.conf Xnews/etc/buffindexed.conf Xnews/etc/innfeed.conf Xnews/etc/news2mail.cf Xnews/etc/readers.conf Xnews/etc/radius.conf Xnews/etc/ovdb.conf Xnews/etc/sasl.conf Xnews/etc/subscriptions Xnews/lib/libinn.a Xnews/lib/libstorage.a Xnews/lib/libinnhist.a Xnews/lib/innreport_inn.pm Xnews/lib/innshellvars Xnews/lib/innshellvars.pl Xnews/lib/innshellvars.tcl Xnews/include/inn/buffer.h Xnews/include/inn/confparse.h Xnews/include/inn/defines.h Xnews/include/inn/hashtab.h Xnews/include/inn/history.h Xnews/include/inn/innconf.h Xnews/include/inn/list.h Xnews/include/inn/md5.h Xnews/include/inn/messages.h Xnews/include/inn/mmap.h Xnews/include/inn/qio.h Xnews/include/inn/sequence.h Xnews/include/inn/system.h Xnews/include/inn/timer.h Xnews/include/inn/tst.h Xnews/include/inn/vector.h Xnews/include/inn/version.h Xnews/include/inn/wire.h Xnews/include/config.h Xnews/include/conffile.h Xnews/include/dbz.h Xnews/include/inndcomm.h Xnews/include/libinn.h Xnews/include/nntp.h Xnews/include/ov.h Xnews/include/paths.h Xnews/include/storage.h Xnews/include/clibrary.h X@dirrmtry share/doc/inn X@dirrmtry news/lib X@dirrmtry news/include/inn X@dirrmtry news/include X@dirrmtry news/etc X@dirrmtry news/doc X@dirrmtry news/db X@dirrmtry news/bin/rnews.libexec X@dirrmtry news/bin/filter X@dirrmtry news/bin/control X@dirrmtry news/bin/auth/resolv X@dirrmtry news/bin/auth/passwd X@dirrmtry news/bin/auth X@dirrmtry news/bin END-of-inn-stable/pkg-plist echo c - inn-stable/files mkdir -p inn-stable/files > /dev/null 2>&1 echo x - inn-stable/files/innd.sh sed 's/^X//' >inn-stable/files/innd.sh << 'END-of-inn-stable/files/innd.sh' X#!/bin/sh Xif [ $# -eq 0 -o x$1 = xstart ]; then X if [ -x !!PREFIX!!/news/bin/rc.news -a -f !!PREFIX!!/news/db/history.dir ]; then X su -fm news -c !!PREFIX!!/news/bin/rc.news && echo ' inn' X fi Xfi Xif [ x$1 = xstop ]; then X su -fm news -c '!!PREFIX!!/news/bin/rc.news stop' Xfi END-of-inn-stable/files/innd.sh echo x - inn-stable/files/patch-configure sed 's/^X//' >inn-stable/files/patch-configure << 'END-of-inn-stable/files/patch-configure' X--- configure.orig Fri May 26 11:42:46 2006 X+++ configure Fri May 26 11:55:02 2006 X@@ -7593,47 +7593,9 @@ X echo "$ac_t""yes" 1>&6 X echo $ac_n "checking for BerkeleyDB location""... $ac_c" 1>&6 X echo "configure:7596: checking for BerkeleyDB location" >&5 X- if test x"$BERKELEY_DB_DIR" = xyes ; then X- for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1 BerkeleyDB.3.2 \ X- BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 BerkeleyDB.4.2 BerkeleyDB.4.3 ; do X- for d in $prefix /usr/local /opt /usr ; do X- if test -d "$d/$v" ; then X- BERKELEY_DB_DIR="$d/$v" X- break X- fi X- done X- done X- fi X- if test x"$BERKELEY_DB_DIR" = xyes ; then X- for v in db43 db42 db41 db4 db3 db2 ; do X- if test -d "/usr/local/include/$v" ; then X- BERKELEY_DB_LDFLAGS="-L/usr/local/lib" X- BERKELEY_DB_CFLAGS="-I/usr/local/include/$v" X- BERKELEY_DB_LIB="-l$v" X- echo "$ac_t""FreeBSD locations" 1>&6 X- break X- fi X- done X- if test x"$BERKELEY_DB_LIB" = x ; then X- for v in db43 db42 db41 db4 db3 db2 ; do X- if test -d "/usr/include/$v" ; then X- BERKELEY_DB_CFLAGS="-I/usr/include/$v" X- BERKELEY_DB_LIB="-l$v" X- echo "$ac_t""Linux locations" 1>&6 X- break X- fi X- done X- if test x"$BERKELEY_DB_LIB" = x ; then X- BERKELEY_DB_LIB=-ldb X- echo "$ac_t""trying -ldb" 1>&6 X- fi X- fi X- else X BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib" X- BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include" X- BERKELEY_DB_LIB="-ldb" X- echo "$ac_t""$BERKELEY_DB_DIR" 1>&6 X- fi X+ BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include/${DB_VER}" X+ BERKELEY_DB_LIB="-l${DB_VER}" X cat >> confdefs.h <<\EOF X #define USE_BERKELEY_DB 1 X EOF END-of-inn-stable/files/patch-configure echo x - inn-stable/files/patch-site:Makefile sed 's/^X//' >inn-stable/files/patch-site:Makefile << 'END-of-inn-stable/files/patch-site:Makefile' X--- site/Makefile.orig Thu May 25 17:07:06 2006 X+++ site/Makefile Fri May 26 12:17:54 2006 X@@ -24,29 +24,29 @@ X PATH_NNRPYAUTH = ${PATHFILTER}/nnrpd_auth.py X PATH_NNRPACCESS = ${PATHFILTER}/nnrpd_access.pl X X-PATH_CONFIG = ${PATHETC}/inn.conf X-PATH_CONTROLCTL = ${PATHETC}/control.ctl X-PATH_EXPIRECTL = ${PATHETC}/expire.ctl X-PATH_INNDHOSTS = ${PATHETC}/incoming.conf X-PATH_MODERATORS = ${PATHETC}/moderators X-PATH_DISTPATS = ${PATHETC}/distrib.pats X-PATH_NEWSFEEDS = ${PATHETC}/newsfeeds X-PATH_READERSCONF = ${PATHETC}/readers.conf X-PATH_NNRPDTRACK = ${PATHETC}/nnrpd.track X-PATH_SCHEMA = ${PATHETC}/overview.fmt X-PATH_NNTPPASS = ${PATHETC}/passwd.nntp X-PATH_CTLWATCH = ${PATHETC}/innwatch.ctl X-PATH_ACTSYNC_IGN = ${PATHETC}/actsync.ign X-PATH_ACTSYNC_CFG = ${PATHETC}/actsync.cfg X-PATH_MOTD = ${PATHETC}/motd.news X-PATH_STORAGECONF = ${PATHETC}/storage.conf X-PATH_CYCBUFFCONFIG = ${PATHETC}/cycbuff.conf X-PATH_INNFEEDCTL = ${PATHETC}/innfeed.conf X-PATH_BUFFINDEXED = ${PATHETC}/buffindexed.conf X-PATH_RADIUS_CONF = ${PATHETC}/radius.conf X-PATH_OVDB_CONF = ${PATHETC}/ovdb.conf X-PATH_SASL_CONF = ${PATHETC}/sasl.conf X-PATH_SUBSCRIPTIONS = ${PATHETC}/subscriptions X+PATH_CONFIG = ${PATHETC}/inn.conf.dist X+PATH_CONTROLCTL = ${PATHETC}/control.ctl.dist X+PATH_EXPIRECTL = ${PATHETC}/expire.ctl.dist X+PATH_INNDHOSTS = ${PATHETC}/incoming.conf.dist X+PATH_MODERATORS = ${PATHETC}/moderators.dist X+PATH_DISTPATS = ${PATHETC}/distrib.pats.dist X+PATH_NEWSFEEDS = ${PATHETC}/newsfeeds.dist X+PATH_READERSCONF = ${PATHETC}/readers.conf.dist X+PATH_NNRPDTRACK = ${PATHETC}/nnrpd.track.dist X+PATH_SCHEMA = ${PATHETC}/overview.fmt.dist X+PATH_NNTPPASS = ${PATHETC}/passwd.nntp.dist X+PATH_CTLWATCH = ${PATHETC}/innwatch.ctl.dist X+PATH_ACTSYNC_IGN = ${PATHETC}/actsync.ign.dist X+PATH_ACTSYNC_CFG = ${PATHETC}/actsync.cfg.dist X+PATH_MOTD = ${PATHETC}/motd.news.dist X+PATH_STORAGECONF = ${PATHETC}/storage.conf.dist X+PATH_CYCBUFFCONFIG = ${PATHETC}/cycbuff.conf.dist X+PATH_INNFEEDCTL = ${PATHETC}/innfeed.conf.dist X+PATH_BUFFINDEXED = ${PATHETC}/buffindexed.conf.dist X+PATH_RADIUS_CONF = ${PATHETC}/radius.conf.dist X+PATH_OVDB_CONF = ${PATHETC}/ovdb.conf.dist X+PATH_SASL_CONF = ${PATHETC}/sasl.conf.dist X+PATH_SUBSCRIPTIONS = ${PATHETC}/subscriptions.dist X X PATH_ACTIVE = ${PATHDB}/active X PATH_ACTIVE_TIMES = ${PATHDB}/active.times X@@ -73,8 +73,8 @@ X $D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \ X $D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \ X $D$(PATH_CONFIG) $D$(PATH_MODERATORS) \ X- $D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl \ X- $D$(PATHETC)/innreport.conf \ X+ $D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl.dist \ X+ $D$(PATHETC)/innreport.conf.dist \ X $D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_SCHEMA) \ X $D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \ X $D$(PATH_MOTD) $D$(PATH_STORAGECONF) \ X@@ -83,14 +83,14 @@ X $D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \ X $D$(PATH_PYTHON_FILTER_INND) $D$(PATH_PYTHON_INN_MODULE) \ X $D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \ X- $D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf $D$(PATH_READERSCONF) \ X+ $D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf.dist $D$(PATH_READERSCONF) \ X $D$(PATH_RADIUS_CONF) $D$(PATH_NNRPYAUTH) $D$(PATH_OVDB_CONF) \ X $D$(PATH_SASL_CONF) $D$(PATH_SUBSCRIPTIONS) $D$(PATH_NNRPACCESS) X X ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED) X X SPECIAL = $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \ X- $D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY) X+ $D$(PATH_NEWSGROUPS) X X ## Get new versions of everything from samples directory. X all: $(P) $(ALL) config X@@ -179,9 +179,9 @@ X $D$(PATH_MODERATORS): moderators ; $(COPY_RPUB) $? $@ X $D$(PATH_DISTPATS): distrib.pats ; $(COPY_RPUB) $? $@ X $D$(PATH_NNTPPASS): passwd.nntp ; $(COPY_RPRI) $? $@ X-$D$(PATHETC)/nntpsend.ctl: nntpsend.ctl ; $(COPY_RPUB) $? $@ X-$D$(PATHETC)/news2mail.cf: news2mail.cf ; $(COPY_RPUB) $? $@ X-$D$(PATHETC)/innreport.conf: innreport.conf ; $(COPY_RPUB) $? $@ X+$D$(PATHETC)/nntpsend.ctl.dist: nntpsend.ctl ; $(COPY_RPUB) $? $@ X+$D$(PATHETC)/news2mail.cf.dist: news2mail.cf ; $(COPY_RPUB) $? $@ X+$D$(PATHETC)/innreport.conf.dist: innreport.conf ; $(COPY_RPUB) $? $@ X $D$(PATH_STORAGECONF): storage.conf ; $(COPY_RPUB) $? $@ X $D$(PATH_CYCBUFFCONFIG): cycbuff.conf ; $(COPY_RPUB) $? $@ X $D$(PATH_BUFFINDEXED): buffindexed.conf ; $(COPY_RPUB) $? $@ END-of-inn-stable/files/patch-site:Makefile exit --- inn-stable-20060525.shar ends here --- >Release-Note: >Audit-Trail: State-Changed-From-To: open->feedback State-Changed-By: thierry State-Changed-When: Sat Jun 10 12:32:50 UTC 2006 State-Changed-Why: Could you please rather send a `diff -urN' and not a shar file? Regards, -- Th. Thomas. http://www.freebsd.org/cgi/query-pr.cgi?pr=97955 State-Changed-From-To: feedback->open State-Changed-By: arved State-Changed-When: Sun Aug 6 21:12:47 UTC 2006 State-Changed-Why: Diff is at http://people.freebsd.org/~arved/stuff/patch-inn-stable http://www.freebsd.org/cgi/query-pr.cgi?pr=97955 Responsible-Changed-From-To: freebsd-ports-bugs->shaun Responsible-Changed-By: shaun Responsible-Changed-When: Mon Aug 7 22:41:32 UTC 2006 Responsible-Changed-Why: Take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=97955 State-Changed-From-To: open->closed State-Changed-By: shaun State-Changed-When: Tue Oct 31 16:32:12 UTC 2006 State-Changed-Why: I've upgraded inn-stable to the latest snapshot, but it has also been converted into a slave of news/inn; thus, I will act as maintainer since I already maintain the master port. Thanks for the PR. http://www.freebsd.org/cgi/query-pr.cgi?pr=97955 >Unformatted: