From gslin@netnews.NCTU.edu.tw  Fri Dec 23 18:13:00 2005
Return-Path: <gslin@netnews.NCTU.edu.tw>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D6A0316A41F;
	Fri, 23 Dec 2005 18:13:00 +0000 (GMT)
	(envelope-from gslin@netnews.NCTU.edu.tw)
Received: from netnews.NCTU.edu.tw (ccreader.nctu.edu.tw [140.113.54.119])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A841143D7D;
	Fri, 23 Dec 2005 18:12:58 +0000 (GMT)
	(envelope-from gslin@netnews.NCTU.edu.tw)
Received: by netnews.NCTU.edu.tw (Postfix, from userid 1000)
	id 17B7B9B; Sat, 24 Dec 2005 02:12:51 +0800 (CST)
Message-Id: <20051223181251.17B7B9B@netnews.NCTU.edu.tw>
Date: Sat, 24 Dec 2005 02:12:51 +0800 (CST)
From: Gea-Suan Lin <gslin@gslin.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ports@FreeBSD.org
Subject: [PATCH] news/nntpcache: [SUMMARIZE CHANGES], take maintainership
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         90859
>Category:       ports
>Synopsis:       [PATCH] news/nntpcache: [SUMMARIZE CHANGES], take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ehaupt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 23 18:20:03 GMT 2005
>Closed-Date:    Mon Jan 02 15:40:03 CET 2006
>Last-Modified:  Mon Jan 02 15:40:03 CET 2006
>Originator:     Gea-Suan Lin
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD netnews.NCTU.edu.tw 6.0-RELEASE FreeBSD 6.0-RELEASE #3: Sat Dec 10 02:26:21 CST 2005
>Description:
[DESCRIBE CHANGES]
- Use OPTIONS.
- portlint ask double-quotes in NO_CDROM.
- Default to Disable RADIUS support.
- Take maintainership.

Port maintainer (ports@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- nntpcache-3.0.1_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/news/nntpcache/Makefile /home/staff/gslin/work/nntpcache/Makefile
--- /usr/ports/news/nntpcache/Makefile	Tue Nov 15 14:50:45 2005
+++ /home/staff/gslin/work/nntpcache/Makefile	Sat Dec 24 02:11:13 2005
@@ -7,15 +7,18 @@
 
 PORTNAME=	nntpcache
 PORTVERSION=	3.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.cs.tu-berlin.de/pub/net/news/nntpcache/ \
 		ftp://ftp.ntua.gr/pub/net/news/nntpcache/ \
 		http://public.www.planetmirror.com/pub/nntpcache/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gslin@gslin.org
 COMMENT=	News caching/anti-spam/server-merging system
 
+OPTIONS=	LDAP "Enable LDAP support" off \
+		RADIUS "Enable RADIUS support" off
+
 USE_AUTOTOOLS=	automake:15:env
 
 .if defined(WITH_LDAP) || defined(WITH_LDAP2)
@@ -26,13 +29,13 @@
 # cache news articles and related data in ${SPOOLDIR}/nntpcache.
 SPOOLDIR?=	/var/spool
 
-NO_CDROM=	Free for individuals and non-military, non-profit organisations only
+NO_CDROM=	"Free for individuals and non-military, non-profit organisations only"
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${SPOOLDIR}
 
 AUTHINFO_EXT=	authinfo_pam.ext
-.if !defined(WITHOUT_RADIUS)
+.if defined(WITH_RADIUS)
 CONFIGURE_ARGS+=	--with-authinfo-radius
 AUTHINFO_EXT+=		authinfo_radius.ext
 .endif
@@ -51,14 +54,6 @@
 MAN8=		nntpcached.8 newshound.8
 DOCS=		AUTHORS ChangeLog FAQ FAQ.html HACKING HTML \
 		INSTALL LICENSING NEWS README README.INN VERSION
-
-pre-everything::
-.if !defined(BATCH)
-	@${ECHO_MSG} "To enable LDAP support use either:"
-	@${ECHO_MSG} "	WITH_LDAP - OpenLDAP support"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "To disable radius support use WITHOUT_RADIUS"
-.endif
 
 post-configure:
 	@cd ${WRKSRC}/src && ${GMAKE} ${AUTHINFO_EXT}
--- nntpcache-3.0.1_3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt 
Responsible-Changed-By: ehaupt 
Responsible-Changed-When: Sat Dec 24 16:08:35 CET 2005 
Responsible-Changed-Why:  
Take. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90859 

From: Emanuel Haupt <ehaupt@FreeBSD.org>
To: bug-followup@FreeBSD.org, gslin@gslin.org
Cc:  
Subject: Re: ports/90859: [PATCH] news/nntpcache: [SUMMARIZE CHANGES], take
 maintainership
Date: Sun, 25 Dec 2005 12:00:32 +0100

 Hi Gea-Suan
 
 Why do you want to disable radius support per default?
 
 Emanuel
 -- 
 GnuPG key id: 0x55E67774         Download: http://pgp.mit.edu:11371
 Key fingerprint: 17B3 FD8F BA68 4AB4 10FD  A9D1 AD52 6588 55E6 7774
State-Changed-From-To: open->feedback 
State-Changed-By: ehaupt 
State-Changed-When: Sun Dec 25 12:28:13 CET 2005 
State-Changed-Why:  
Awaiting maintainer feedback. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90859 

From: Emanuel Haupt <ehaupt@FreeBSD.org>
To: bug-followup@FreeBSD.org, gslin@gslin.org
Cc:  
Subject: Re: ports/90859: [PATCH] news/nntpcache: [SUMMARIZE CHANGES], take
 maintainership
Date: Sun, 25 Dec 2005 12:22:29 +0100

 This also breaks optional LDAP, LDAP2 and RADIUS support, since
 (WITH|WITHOUT)_foo is not definied before bsd.port.pre.mk.
 
 I suggest we fix the quotation of NO_CDROM and leave the rest.
 
 Maintainer takeovers in general require an update or FIXING a problem.
 
 Emanuel
 -- 
 GnuPG key id: 0x55E67774         Download: http://pgp.mit.edu:11371
 Key fingerprint: 17B3 FD8F BA68 4AB4 10FD  A9D1 AD52 6588 55E6 7774

From: Gea-Suan Lin <gslin@gslin.org>
To: Emanuel Haupt <ehaupt@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, gslin@gslin.org
Subject: Re: ports/90859: [PATCH] news/nntpcache: [SUMMARIZE CHANGES], take maintainership
Date: Sun, 25 Dec 2005 23:36:09 +0800

 --KFztAG8eRSV9hGtP
 Content-Type: multipart/mixed; boundary="UlVJffcvxoiEqYs2"
 Content-Disposition: inline
 
 
 --UlVJffcvxoiEqYs2
 Content-Type: text/plain; charset=utf-8
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Sun, Dec 25, 2005 at 12:22:29PM +0100, Emanuel Haupt wrote:
 > This also breaks optional LDAP, LDAP2 and RADIUS support, since
 > (WITH|WITHOUT)_foo is not definied before bsd.port.pre.mk.
 >=20
 > I suggest we fix the quotation of NO_CDROM and leave the rest.
 >=20
 > Maintainer takeovers in general require an update or FIXING a problem.
 >=20
 > Emanuel
 
 Could you try this ? I check both LDAP & RADIUS support, it seems fine.
 
 --=20
 * Gea-Suan Lin  (public key: Using https://keyserver.pgp.com/ to search)
 * If you cannot convince them, confuse them.           -- Harry S Truman
 
 --UlVJffcvxoiEqYs2
 Content-Type: text/plain; charset=utf-8
 Content-Disposition: attachment; filename="nntpcache.diff"
 Content-Transfer-Encoding: quoted-printable
 
 diff -ruN --exclude=3DCVS /usr/ports/news/nntpcache/Makefile /home/staff/gs=
 lin/work/nntpcache/Makefile
 --- /usr/ports/news/nntpcache/Makefile	Tue Nov 15 14:50:45 2005
 +++ /home/staff/gslin/work/nntpcache/Makefile	Sun Dec 25 23:19:48 2005
 @@ -7,18 +7,24 @@
 =20
  PORTNAME=3D	nntpcache
  PORTVERSION=3D	3.0.1
 -PORTREVISION=3D	2
 +PORTREVISION=3D	3
  CATEGORIES=3D	news
  MASTER_SITES=3D	ftp://ftp.cs.tu-berlin.de/pub/net/news/nntpcache/ \
  		ftp://ftp.ntua.gr/pub/net/news/nntpcache/ \
  		http://public.www.planetmirror.com/pub/nntpcache/
 =20
 -MAINTAINER=3D	ports@FreeBSD.org
 +MAINTAINER=3D	gslin@gslin.org
  COMMENT=3D	News caching/anti-spam/server-merging system
 =20
 +.include <bsd.port.pre.mk>
 +
 +OPTIONS=3D	LDAP "Enable LDAP support" off \
 +		RADIUS "Enable RADIUS support" off
 +
  USE_AUTOTOOLS=3D	automake:15:env
 +USE_RC_SUBR=3D	${PORTNAME}.sh
 =20
 -.if defined(WITH_LDAP) || defined(WITH_LDAP2)
 +.if defined(WITH_LDAP)
  USE_OPENLDAP=3D	yes
  .endif
 =20
 @@ -26,17 +32,17 @@
  # cache news articles and related data in ${SPOOLDIR}/nntpcache.
  SPOOLDIR?=3D	/var/spool
 =20
 -NO_CDROM=3D	Free for individuals and non-military, non-profit organisation=
 s only
 +NO_CDROM=3D	"Free for individuals and non-military, non-profit organisatio=
 ns only"
  USE_GMAKE=3D	yes
  GNU_CONFIGURE=3D	yes
  CONFIGURE_ARGS=3D	--localstatedir=3D${SPOOLDIR}
 =20
  AUTHINFO_EXT=3D	authinfo_pam.ext
 -.if !defined(WITHOUT_RADIUS)
 +.if defined(WITH_RADIUS)
  CONFIGURE_ARGS+=3D	--with-authinfo-radius
  AUTHINFO_EXT+=3D		authinfo_radius.ext
  .endif
 -.if defined(WITH_LDAP) || defined(WITH_LDAP2)
 +.if defined(WITH_LDAP)
  CONFIGURE_ARGS+=3D	--with-authinfo-ldap
  CPPFLAGS+=3D	-I${PREFIX}/include -I${LOCALBASE}/include
  LDFLAGS+=3D	-L${PREFIX}/lib -L${LOCALBASE}/lib
 @@ -47,39 +53,24 @@
 =20
  NNTPSPOOLDIR?=3D	${SPOOLDIR}/${PORTNAME}
  PLIST_SUB+=3D	SPOOLDIR=3D${NNTPSPOOLDIR}
 +SUB_LIST+=3D	SPOOLDIR=3D${NNTPSPOOLDIR}
  CPIO=3D		cpio --quiet -pdum -R
  MAN8=3D		nntpcached.8 newshound.8
  DOCS=3D		AUTHORS ChangeLog FAQ FAQ.html HACKING HTML \
  		INSTALL LICENSING NEWS README README.INN VERSION
 =20
 -pre-everything::
 -.if !defined(BATCH)
 -	@${ECHO_MSG} "To enable LDAP support use either:"
 -	@${ECHO_MSG} "	WITH_LDAP - OpenLDAP support"
 -	@${ECHO_MSG}
 -	@${ECHO_MSG} "To disable radius support use WITHOUT_RADIUS"
 -.endif
 -
  post-configure:
  	@cd ${WRKSRC}/src && ${GMAKE} ${AUTHINFO_EXT}
 =20
  post-install:
 -	@ ${MKDIR} ${PREFIX}/etc/rc.d
 -	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${FILESDIR}/nntpcached.rc \
 -	  > ${WRKDIR}/nntpcached.sh
 -.if !defined(BATCH)
 -	@ ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/nntpcached.sh startup file"
 -.endif
 -	@ ${INSTALL_SCRIPT} -m 751 ${WRKDIR}/nntpcached.sh \
 -	  ${PREFIX}/etc/rc.d
 -	@ ${MKDIR} ${NNTPSPOOLDIR} && ${CHMOD} 750 ${NNTPSPOOLDIR}
 -	@ ${CP} ${PREFIX}/etc/${PORTNAME}/VERSION ${NNTPSPOOLDIR} && \
 -	  ${CHMOD} 640 ${NNTPSPOOLDIR}/VERSION
 -	@ ${CHOWN} -R news:news ${NNTPSPOOLDIR}
 +	@${MKDIR} ${NNTPSPOOLDIR} && ${CHMOD} 750 ${NNTPSPOOLDIR}
 +	@${CP} ${PREFIX}/etc/${PORTNAME}/VERSION ${NNTPSPOOLDIR} && \
 +	 ${CHMOD} 640 ${NNTPSPOOLDIR}/VERSION
 +	@${CHOWN} -R news:news ${NNTPSPOOLDIR}
  .if !defined(NOPORTDOCS)
 -	@ ${MKDIR} ${DOCSDIR}
 -	@ cd ${WRKSRC} && ${FIND} ${DOCS} \
 -	  | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 +	@${MKDIR} ${DOCSDIR}
 +	@cd ${WRKSRC} && ${FIND} ${DOCS} \
 +	 | ${CPIO} ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
  .endif
 =20
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff -ruN --exclude=3DCVS /usr/ports/news/nntpcache/files/nntpcache.sh.in /=
 home/staff/gslin/work/nntpcache/files/nntpcache.sh.in
 --- /usr/ports/news/nntpcache/files/nntpcache.sh.in	Thu Jan  1 08:00:00 1970
 +++ /home/staff/gslin/work/nntpcache/files/nntpcache.sh.in	Sun Dec 25 23:33=
 :07 2005
 @@ -0,0 +1,33 @@
 +#!/bin/sh
 +#
 +# $FreeBSD$
 +#
 +# PROVIDE: nntpcache
 +# REQUIRE: NETWORKING SERVERS
 +# KEYWORD: FreeBSD
 +#
 +# Add the following line to /etc/rc.conf to enable nntpcache:
 +#
 +# nntpcache_enable=3D"YES"
 +# nntpcache_host=3D"0.0.0.0"
 +# nntpcache_port=3D"119"
 +# nntpcache_flags=3D"-b 0.0.0.0:119"
 +#
 +
 +. %%RC_SUBR%%
 +
 +name=3D"nntpcache"
 +rcvar=3D`set_rcvar`
 +
 +nntpcache_conf=3D${nntpcache_conf:-"%%PREFIX%%/etc/nntpcache/config"}
 +nntpcache_enable=3D${nntpcache_enable:-"NO"}
 +nntpcache_host=3D${nntpcache_host:-"0.0.0.0"}
 +nntpcache_port=3D${nntpcache_port:-"119"}
 +nntpcache_flags=3D${nntpcache_flags:-"-b ${nntpcache_host}:${nntpcache_por=
 t} -c ${nntpcache_conf}"}
 +
 +command=3D"%%PREFIX%%/sbin/nntpcached"
 +pidfile=3D"%%SPOOLDIR%%/nntpcache/nntpcache.${nntpcache_port}.pid"
 +
 +load_rc_config $name
 +
 +run_rc_command "$1"
 diff -ruN --exclude=3DCVS /usr/ports/news/nntpcache/files/nntpcached.rc /ho=
 me/staff/gslin/work/nntpcache/files/nntpcached.rc
 --- /usr/ports/news/nntpcache/files/nntpcached.rc	Fri Sep 14 17:47:23 2001
 +++ /home/staff/gslin/work/nntpcache/files/nntpcached.rc	Thu Jan  1 08:00:0=
 0 1970
 @@ -1,16 +0,0 @@
 -#!/bin/sh
 -
 -case "$1" in
 -  start)
 -    if [ -x %%PREFIX%%/sbin/nntpcached ]; then
 -      %%PREFIX%%/sbin/nntpcached && echo -n ' nntpcached'
 -    fi
 -    ;;
 -  stop)
 -    /usr/bin/killall nntpcached >/dev/null 2>&1 && echo -n ' nntpcached'
 -    ;;
 -  *)
 -    echo ""
 -    echo "Usage: `basename $0` {start|stop}" >&2
 -    ;;
 -esac
 diff -ruN --exclude=3DCVS /usr/ports/news/nntpcache/pkg-plist /home/staff/g=
 slin/work/nntpcache/pkg-plist
 --- /usr/ports/news/nntpcache/pkg-plist	Tue Apr  6 16:16:55 2004
 +++ /home/staff/gslin/work/nntpcache/pkg-plist	Sun Dec 25 23:02:42 2005
 @@ -24,7 +24,6 @@
  @unexec if cmp -s %D/etc/nntpcache/pubring.pgp %D/etc/nntpcache/pubring.pg=
 p-dist; then rm -f %D/etc/nntpcache/pubring.pgp; fi
  etc/nntpcache/pubring.pgp-dist
  etc/nntpcache/spam.filter
 -etc/rc.d/nntpcached.sh
  include/mmap_results.h
  libexec/nntpcache-gdb.sh
  libexec/nntpcache.gdb
 
 --UlVJffcvxoiEqYs2--
 
 --KFztAG8eRSV9hGtP
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (FreeBSD)
 
 iD8DBQFDrrxpOhNHkoiLlmsRAtdwAKDpHzY0k6Riy4o6kttmhw0H2mhTtACePDM5
 uDE2pqdE67jN2YzvcgdZR28=
 =7gcw
 -----END PGP SIGNATURE-----
 
 --KFztAG8eRSV9hGtP--

From: Emanuel Haupt <ehaupt@FreeBSD.org>
To: Gea-Suan Lin <gslin@gslin.org>
Cc: bug-followup@FreeBSD.org, gslin@gslin.org
Subject: Re: ports/90859: [PATCH] news/nntpcache: [SUMMARIZE CHANGES], take
 maintainership
Date: Mon, 26 Dec 2005 16:56:41 +0100

 > > This also breaks optional LDAP, LDAP2 and RADIUS support, since
 > > (WITH|WITHOUT)_foo is not definied before bsd.port.pre.mk.
 > > 
 > > I suggest we fix the quotation of NO_CDROM and leave the rest.
 > > 
 > > Maintainer takeovers in general require an update or FIXING a
 > > problem.
 > > 
 > > Emanuel
 > 
 > Could you try this ? I check both LDAP & RADIUS support, it seems
 > fine.
 
 OPTIONS has to be defined before bsd.port.pre.mk then after
 bsd.port.pre.mk (WITH|WITHOUT)_foo will be defined BUT after
 bsd.port.pre.mk you can't define USE_foo flags.
 
 Sorry, we can't use OPTIONS here.
 
 Emanuel
 -- 
 GnuPG key id: 0x55E67774         Download: http://pgp.mit.edu:11371
 Key fingerprint: 17B3 FD8F BA68 4AB4 10FD  A9D1 AD52 6588 55E6 7774
State-Changed-From-To: feedback->closed 
State-Changed-By: ehaupt 
State-Changed-When: Mon Jan 2 15:39:04 CET 2006 
State-Changed-Why:  
See audit trail. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90859 
>Unformatted:
