pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/news/inn Update of the INN package to the latest stabl...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8456ef2c0cdb
branches:  trunk
changeset: 565404:8456ef2c0cdb
user:      spz <spz%pkgsrc.org@localhost>
date:      Tue Sep 22 13:17:00 2009 +0000

description:
Update of the INN package to the latest stable version (2.5.0).

diffstat:

 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(-)

diffs (truncated from 676 to 300 lines):

diff -r a9f93aa79b59 -r 8456ef2c0cdb news/inn/MESSAGE
--- a/news/inn/MESSAGE  Tue Sep 22 13:16:00 2009 +0000
+++ b/news/inn/MESSAGE  Tue Sep 22 13:17:00 2009 +0000
@@ -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
-
-The directory structure of the package has changed.
+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.
 
-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 -r a9f93aa79b59 -r 8456ef2c0cdb news/inn/Makefile
--- a/news/inn/Makefile Tue Sep 22 13:16:00 2009 +0000
+++ b/news/inn/Makefile Tue Sep 22 13:17:00 2009 +0000
@@ -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 @@
 MAINTAINER=            spz%NetBSD.org@localhost
 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 @@
 
 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 @@
                        --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+=                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_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 @@
 .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 @@
 
 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 @@
 .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 -r a9f93aa79b59 -r 8456ef2c0cdb news/inn/PLIST
--- a/news/inn/PLIST    Tue Sep 22 13:16:00 2009 +0000
+++ b/news/inn/PLIST    Tue Sep 22 13:17:00 2009 +0000
@@ -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}/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}/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_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}/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}/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/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/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/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



Home | Main Index | Thread Index | Old Index