Date: Sat, 14 Jun 2008 00:44:45 +0200 (CEST) From: Thierry Thomas <thierry@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Shaun Amott <shaun@FreeBSD.org> Subject: ports/124566: news/inn-current: unbreak. Message-ID: <20080613224445.9C8B211475@graf.pompo.net> Resent-Message-ID: <200806132310.m5DNA3eM049218@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 124566 >Category: ports >Synopsis: news/inn-current: unbreak. >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jun 13 23:10:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 7.0-STABLE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 7.0-STABLE FreeBSD 7.0-STABLE #0: Thu May 8 21:13:55 CEST 2008 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF071102 i386 >Description: Notified on Usenet-fr in <news:g2t98k$caf$1@news.trigofacile.com>. - unbreak; - remove silenting @, to track this kind of errors. >How-To-Repeat: See pointyhat logs. E.g.: <http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.5.2008050315/inn-current-20061024_1.log>; >Fix: Please apply the following patch: --- inn-current.diff begins here --- diff -urN news.orig/inn/Makefile news/inn/Makefile --- news.orig/inn/Makefile 2007-10-12 19:32:48.000000000 +0200 +++ news/inn/Makefile 2008-06-14 00:29:21.000000000 +0200 @@ -148,7 +148,7 @@ newsfeeds.5 newslog.5 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \ overview.fmt.5 passwd.nntp.5 radius.conf.5 readers.conf.5 \ storage.conf.5 subscriptions.5 -MAN8= actsync.8 archive.8 auth_smb.8 batcher.8 buffchan.8 \ +MAN8= actsync.8 actsyncd.8 archive.8 auth_smb.8 batcher.8 buffchan.8 \ ckpasswd.8 cnfsheadconf.8 cnfsstat.8 controlchan.8 ctlinnd.8 \ cvtbatch.8 domain.8 expire.8 expireover.8 expirerm.8 filechan.8 \ ident.8 inncheck.8 innd.8 inndf.8 innreport.8 innstat.8 \ @@ -163,7 +163,7 @@ MAN1+= startinnfeed.1 MAN3+= parsedate.3 MAN5+= sasl.conf.5 -MAN8+= actsyncd.8 inndstart.8 +MAN8+= inndstart.8 PLIST_SUB+= NOTCURRENT="" .else PLIST_SUB+= NOTCURRENT="@comment " @@ -176,14 +176,17 @@ TO_BE_STRIPPED= bin/auth/resolv/domain bin/auth/resolv/ident bin/auth/passwd/auth_smb \ bin/auth/passwd/ckpasswd bin/auth/passwd/radius bin/rnews.libexec/decode \ - bin/rnews.libexec/encode bin/tdx-util bin/innd bin/inndstart bin/nnrpd \ - bin/innfeed bin/startinnfeed bin/imapfeed bin/convdate bin/expire \ + bin/rnews.libexec/encode bin/tdx-util bin/innd bin/nnrpd \ + bin/innfeed bin/imapfeed bin/convdate bin/expire \ bin/expireover bin/fastrm bin/grephistory bin/makedbz bin/makehistory \ bin/prunehistory bin/ctlinnd bin/getlist bin/inews bin/innconfval \ bin/ovdb_init bin/ovdb_monitor bin/ovdb_server bin/ovdb_stat bin/rnews \ bin/sm bin/actsync bin/archive bin/batcher bin/buffchan bin/cvtbatch \ bin/filechan bin/inndf bin/innxmit bin/innxbatch bin/ninpaths bin/nntpget \ bin/overchan bin/shlock bin/shrinkfile +.if ${BRANCH} != "current" +TO_BE_STRIPPED+= bin/inndstart bin/startinnfeed +.endif CONFIG_FILES= actsync.cfg actsync.ign buffindexed.conf control.ctl cycbuff.conf \ distrib.pats expire.ctl incoming.conf inn.conf innfeed.conf \ @@ -222,9 +225,14 @@ | ${XARGS} ${REINPLACE_CMD} -e 's/^pathhost:.*/pathhost: host.example.com/' post-install: +.if ${BRANCH} == "current" +. if !defined(NOMANCOMPRESS) + ${GZIP_CMD} ${MAN8PREFIX}/man/man8/actsyncd.8 +. endif +.endif .if !defined(WITHOUT_STRIP) . for FILE in ${TO_BE_STRIPPED} - @[ -e ${INN_NEWSBASE}/${FILE} ] && ${STRIP_CMD} ${INN_NEWSBASE}/${FILE} + [ -e ${INN_NEWSBASE}/${FILE} ] && ${STRIP_CMD} ${INN_NEWSBASE}/${FILE} . endfor .endif ${CHOWN} ${MANOWN}:${MANGRP} ${PREFIX}/man ${PREFIX}/man/man1 ${PREFIX}/man/man3 \ @@ -240,10 +248,10 @@ .for FILE in ${HEADERS} ${INSTALL_DATA} ${WRKSRC}/include/${FILE} ${INN_NEWSBASE}/include/ .endfor - @${CHOWN} ${BINOWN}:news ${INN_NEWSBASE}/bin/auth/passwd/ckpasswd - @${CHMOD} 4755 ${INN_NEWSBASE}/bin/auth/passwd/ckpasswd - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF ${INN_ETCDIR} - @(if [ ! -f ${INN_DBDIR}/history ] ; then \ + ${CHOWN} ${BINOWN}:news ${INN_NEWSBASE}/bin/auth/passwd/ckpasswd + ${CHMOD} 4755 ${INN_NEWSBASE}/bin/auth/passwd/ckpasswd + ${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} CHECK-CONF ${INN_ETCDIR} + (if [ ! -f ${INN_DBDIR}/history ] ; then \ ${ECHO} 'Creating empty history database...' ; \ cd ${INN_DBDIR} ; \ ${TOUCH} history ; \ @@ -254,6 +262,6 @@ ${MV} history.n.$${s} history.$${s} ; \ done ; \ fi) - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL PORTMODE + ${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL PORTMODE .include <bsd.port.post.mk> diff -urN news.orig/inn-current/Makefile news/inn-current/Makefile --- news.orig/inn-current/Makefile 2007-02-14 21:34:45.000000000 +0100 +++ news/inn-current/Makefile 2008-06-13 22:44:08.000000000 +0200 @@ -13,8 +13,6 @@ PKGNAMESUFFIX= -${BRANCH} DISTNAME= ${PORTNAME}-${BRANCH:U}-${SNAPSHOT} -BROKEN= Does not install - BRANCH= current SNAPSHOT= 20061024 --- inn-current.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080613224445.9C8B211475>