diff options
| -rw-r--r-- | news/inn/Makefile | 64 | ||||
| -rw-r--r-- | news/inn/distinfo | 4 | ||||
| -rw-r--r-- | news/inn/files/patch-configure | 24 | ||||
| -rw-r--r-- | news/inn/files/patch-lib_innconf.c | 6 | ||||
| -rw-r--r-- | news/inn/files/patch-storage_buffindexed_shmem.c | 10 | ||||
| -rw-r--r-- | news/inn/pkg-plist | 24 |
6 files changed, 66 insertions, 66 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index a50448a1a4dc..8c1c49747343 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= inn -PORTVERSION= 2.5.5 +PORTVERSION= 2.6.0 CATEGORIES= news ipv6 MASTER_SITES= ISC/${PORTNAME} @@ -17,7 +17,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_RC_SUBR= innd SUB_FILES= pkg-install -USES= cpe gmake perl5 uidfix +USES= cpe gmake libtool perl5 uidfix CPE_VENDOR= isc CONFLICTS?= inn-stable-[0-9]* inn-current-[0-9]* @@ -52,28 +52,31 @@ CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --with-run-dir=${INN_RUNDIR} \ --with-db-dir=${INN_DBDIR} \ --datarootdir=${INN_SHAREDIR} \ - --enable-ipv6 --with-perl + --with-perl + +LIBVER_LONG= 3.0.0 +PLIST_SUB+= LIBVER=${LIBVER_LONG:R:R} LIBVER_LONG=${LIBVER_LONG} .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBERKELEYDB} USE_BDB= 44+ -CONFIGURE_ENV+= DB_VER=db${BDB_VER} -CONFIGURE_ENV+= DB_LIB=${BDB_LIB_NAME} -CONFIGURE_ARGS+= --with-berkeleydb=${LOCALBASE} +CONFIGURE_ARGS+= --with-bdb=${LOCALBASE} \ + --with-bdb-lib=${LOCALBASE}/lib \ + --with-bdb-include=${BDB_INCLUDE_DIR} .endif .if ${PORT_OPTIONS:MKERBEROS} . if exists(${LOCALBASE}/bin/krb5-config) LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5 -CONFIGURE_ARGS+= --with-kerberos=${LOCALBASE} +CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} . else -CONFIGURE_ARGS+= --with-kerberos=/usr +CONFIGURE_ARGS+= --with-krb5=/usr . endif CONFIGURE_ENV+= ac_cv_search_krb5_parse_name="-lcrypt -lcrypto -lkrb5 -lasn1 -lroken -lhx509" CONFIGURE_ENV+= ac_cv_func_krb5_init_ets=yes .else -CONFIGURE_ARGS+= --without-kerberos +CONFIGURE_ARGS+= --without-krb5 .endif .if ${PORT_OPTIONS:MLARGE_FILES} @@ -118,28 +121,27 @@ RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg PORTDOCS= CONTRIBUTORS HACKING INSTALL LICENSE MANIFEST NEWS README TODO -TO_BE_STRIPPED= bin/auth/resolv/domain bin/actsync bin/archive \ - bin/auth/passwd/ckpasswd bin/auth/passwd/radius bin/auth/resolv/ident \ - bin/batcher bin/buffchan bin/buffindexed_d bin/convdate bin/ctlinnd \ - bin/cvtbatch bin/expire bin/expireover bin/fastrm bin/filechan \ - bin/getlist bin/grephistory bin/imapfeed bin/inews bin/innbind \ - bin/innconfval bin/innd bin/inndf bin/innfeed bin/innxbatch \ - bin/innxmit bin/makedbz bin/makehistory bin/ninpaths bin/nnrpd \ - bin/nntpget bin/ovdb_init bin/ovdb_monitor bin/ovdb_server \ +TO_BE_STRIPPED= bin/actsync bin/archive bin/auth/passwd/auth_krb5 \ + bin/auth/passwd/ckpasswd bin/auth/passwd/radius bin/auth/resolv/domain \ + bin/auth/resolv/ident bin/batcher bin/buffchan bin/buffindexed_d \ + bin/convdate bin/ctlinnd bin/cvtbatch bin/expire bin/expireover \ + bin/fastrm bin/filechan bin/getlist bin/grephistory bin/imapfeed \ + bin/inews bin/innbind bin/innconfval bin/innd bin/inndf bin/innfeed \ + bin/innxbatch bin/innxmit bin/makedbz bin/makehistory bin/ninpaths \ + bin/nnrpd bin/nntpget bin/ovdb_init bin/ovdb_monitor bin/ovdb_server \ bin/ovdb_stat bin/overchan bin/prunehistory bin/rnews \ bin/rnews.libexec/decode bin/rnews.libexec/encode bin/shlock \ - bin/shrinkfile bin/sm bin/tdx-util bin/tinyleaf + bin/shrinkfile bin/sm bin/tdx-util bin/tinyleaf \ + lib/libinn.so.${LIBVER_LONG} lib/libinnhist.so.${LIBVER_LONG} \ + lib/libstorage.so.${LIBVER_LONG} CONFIG_FILES= actsync.cfg actsync.ign buffindexed.conf control.ctl \ - control.ctl.local cycbuff.conf \ - distrib.pats distributions \ - expire.ctl localgroups incoming.conf inn.conf innfeed.conf \ - innreport.conf innshellvars.local innshellvars.pl.local \ - innshellvars.tcl.local innwatch.ctl moderators news2mail.cf \ - newsfeeds nocem.ctl \ - nnrpd.track nntpsend.ctl ovdb.conf \ - passwd.nntp readers.conf send-uucp.cf \ - storage.conf subscriptions + control.ctl.local cycbuff.conf distrib.pats distributions expire.ctl \ + localgroups incoming.conf inn.conf innfeed.conf innreport.conf \ + innshellvars.local innshellvars.pl.local innshellvars.tcl.local \ + innwatch.ctl moderators news2mail.cf newsfeeds nocem.ctl nnrpd.track \ + nntpsend.ctl ovdb.conf passwd.nntp readers.conf send-uucp.cf \ + storage.conf subscriptions SUB_LIST+= EGDIR="${EXAMPLESDIR:C,^${PREFIX},\\$\\${PREFIX},}" PLIST_SUB+= ETCFILES="${CONFIG_FILES}" @@ -155,7 +157,10 @@ post-patch: ${WRKSRC}/site/Makefile @${REINPLACE_CMD} -e 's!et/com_err\.h!com_err.h!g' \ -e 's!-lk5crypto!!g' \ - ${WRKSRC}/configure + ${WRKSRC}/configure ${WRKSRC}/authprogs/auth_krb5.c +.if ${PORT_OPTIONS:MBERKELEYDB} + @${REINPLACE_CMD} -e 's!-ldb!-ldb-${BDB_VER}!' ${WRKSRC}/configure +.endif @${ECHO_CMD} '/^$$D$$(PATH_HISTORY)' > ${WRKDIR}/ex.script @${ECHO_CMD} '+' >> ${WRKDIR}/ex.script @${ECHO_CMD} 'mark t' >> ${WRKDIR}/ex.script @@ -180,7 +185,8 @@ post-build: post-install: .for FILE in ${TO_BE_STRIPPED} - ${STRIP_CMD} ${STAGEDIR}${INN_NEWSBASE}/${FILE} + -${TEST} -f ${STAGEDIR}${INN_NEWSBASE}/${FILE} && \ + ${STRIP_CMD} ${STAGEDIR}${INN_NEWSBASE}/${FILE} .endfor ${MKDIR} ${STAGEDIR}${INN_NEWSSPOOL} ${MKDIR} ${STAGEDIR}${INN_CONFDIR} diff --git a/news/inn/distinfo b/news/inn/distinfo index 465ba70b6731..8a6eb3e9bce1 100644 --- a/news/inn/distinfo +++ b/news/inn/distinfo @@ -1,2 +1,2 @@ -SHA256 (inn-2.5.5.tar.gz) = 4245602c2c30fd3fe38513e9403c8d0ea4eb76256961591f97da630c341053bf -SIZE (inn-2.5.5.tar.gz) = 2419841 +SHA256 (inn-2.6.0.tar.gz) = ba96be8e87c2b56bf896c9f96492ed7706beb68e082794f8fabc7058a1804da7 +SIZE (inn-2.6.0.tar.gz) = 2597729 diff --git a/news/inn/files/patch-configure b/news/inn/files/patch-configure deleted file mode 100644 index 8da9654a7a45..000000000000 --- a/news/inn/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.orig 2014-05-17 10:24:49.000000000 +0200 -+++ configure 2014-08-21 15:24:09.000000000 +0200 -@@ -14631,7 +14631,7 @@ $as_echo "yes" >&6; } - $as_echo_n "checking for Berkeley DB location... " >&6; } - if test x"$DB_DIR" = xyes ; then - for dir in $prefix /usr/local /usr ; do -- if test -f "$dir/include/db.h" ; then -+ if test -f "$dir/include/${DB_VER}/db.h" ; then - DB_DIR=$dir - break - fi -@@ -14641,10 +14641,10 @@ $as_echo_n "checking for Berkeley DB loc - as_fn_error $? "cannot find Berkeley DB" "$LINENO" 5 - else - if test x"$DB_DIR" != x/usr ; then -- DB_CPPFLAGS="-I$DB_DIR/include" -+ DB_CPPFLAGS="-I$DB_DIR/include/${DB_VER}" - DB_LDFLAGS="-L$DB_DIR/lib" - fi -- DB_LIBS="-ldb" -+ DB_LIBS="-l${DB_LIB}" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DB_DIR" >&5 - $as_echo "$DB_DIR" >&6; } - fi diff --git a/news/inn/files/patch-lib_innconf.c b/news/inn/files/patch-lib_innconf.c index 05d8eadfb946..18a40d901864 100644 --- a/news/inn/files/patch-lib_innconf.c +++ b/news/inn/files/patch-lib_innconf.c @@ -1,6 +1,6 @@ ---- lib/innconf.c.orig Mon Mar 20 04:14:57 2006 -+++ lib/innconf.c Sat Aug 26 00:22:04 2006 -@@ -395,7 +395,7 @@ +--- lib/innconf.c.orig 2015-09-12 15:25:22.000000000 +0200 ++++ lib/innconf.c 2015-09-21 21:15:18.446435000 +0200 +@@ -473,7 +473,7 @@ innconf_validate(struct config_group *gr if (GetFQDN(innconf->domain) == NULL) { warn("hostname does not resolve or domain not set in inn.conf"); diff --git a/news/inn/files/patch-storage_buffindexed_shmem.c b/news/inn/files/patch-storage_buffindexed_shmem.c index 9472e1467c65..90dbe3312ff4 100644 --- a/news/inn/files/patch-storage_buffindexed_shmem.c +++ b/news/inn/files/patch-storage_buffindexed_shmem.c @@ -26,8 +26,8 @@ Note that the documentation for linux semget differs, and seems to allow but ign Patch attached with submission follows: ---- storage/buffindexed/shmem.c.orig 2012-08-27 23:39:42.000000000 -0700 -+++ storage/buffindexed/shmem.c 2012-08-27 23:37:50.000000000 -0700 +--- storage/buffindexed/shmem.c.orig 2015-09-12 15:25:22.000000000 +0200 ++++ storage/buffindexed/shmem.c 2015-09-21 21:15:18.448425000 +0200 @@ -26,7 +26,9 @@ static int smcGetSemaphore(const char *name) { @@ -39,7 +39,7 @@ Patch attached with submission follows: if (id < 0) { syswarn("semget failed to get semaphore for %s", name); -@@ -37,15 +39,17 @@ +@@ -37,15 +39,17 @@ static int smcGetSemaphore(const char *n static int smcCreateSemaphore(const char *name) { key_t kt = ftok( (char *)name, 0 ); @@ -60,7 +60,7 @@ Patch attached with submission follows: return id; } /* try to remove it */ -@@ -65,7 +69,7 @@ +@@ -65,7 +69,7 @@ static int smcCreateSemaphore(const char } #endif /* and retry creating it */ @@ -69,5 +69,3 @@ Patch attached with submission follows: } } if (id < 0) - - diff --git a/news/inn/pkg-plist b/news/inn/pkg-plist index b0c3f7826548..9f403949aedd 100644 --- a/news/inn/pkg-plist +++ b/news/inn/pkg-plist @@ -137,15 +137,18 @@ include/inn/confparse.h include/inn/dbz.h include/inn/defines.h include/inn/dispatch.h +include/inn/fdflag.h include/inn/hashtab.h include/inn/history.h include/inn/innconf.h include/inn/inndcomm.h include/inn/libinn.h include/inn/list.h +include/inn/macros.h include/inn/md5.h include/inn/messages.h include/inn/mmap.h +include/inn/network-innbind.h include/inn/network.h include/inn/newsuser.h include/inn/nntp.h @@ -153,6 +156,11 @@ include/inn/options.h include/inn/ov.h include/inn/overview.h include/inn/paths.h +include/inn/portable-getaddrinfo.h +include/inn/portable-getnameinfo.h +include/inn/portable-macros.h +include/inn/portable-socket.h +include/inn/portable-stdbool.h include/inn/qio.h include/inn/sequence.h include/inn/storage.h @@ -163,15 +171,26 @@ include/inn/utility.h include/inn/vector.h include/inn/version.h include/inn/wire.h +include/inn/xmalloc.h +include/inn/xwrite.h +lib/perl/INN/Config.pm +lib/perl/INN/Utils/Shlock.pm lib/innreport_inn.pm lib/innshellvars lib/innshellvars.pl lib/innshellvars.tcl lib/libinn.a +lib/libinn.so +lib/libinn.so.%%LIBVER%% +lib/libinn.so.%%LIBVER_LONG%% lib/libinnhist.a +lib/libinnhist.so +lib/libinnhist.so.%%LIBVER%% +lib/libinnhist.so.%%LIBVER_LONG%% lib/libstorage.a -lib/perl/INN/Config.pm -lib/perl/INN/Utils/Shlock.pm +lib/libstorage.so +lib/libstorage.so.%%LIBVER%% +lib/libstorage.so.%%LIBVER_LONG%% @comment -------------------------------------------------------------- @cwd man/man1/convdate.1.gz @@ -235,6 +254,7 @@ man/man5/subscriptions.5.gz man/man8/actsync.8.gz man/man8/actsyncd.8.gz man/man8/archive.8.gz +%%KERBEROS%%man/man8/auth_krb5.8.gz man/man8/batcher.8.gz man/man8/buffchan.8.gz man/man8/ckpasswd.8.gz |