From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 24 09:20:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0053BE6 for ; Sat, 24 May 2014 09:20:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7EEA02A4C for ; Sat, 24 May 2014 09:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4O9K0Ar071295 for ; Sat, 24 May 2014 09:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4O9K00G071294; Sat, 24 May 2014 09:20:00 GMT (envelope-from gnats) Date: Sat, 24 May 2014 09:20:00 GMT Message-Id: <201405240920.s4O9K00G071294@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: Stefan Esser Subject: Re: ports/185275: [maintainer update] port www/polipo Reply-To: Stefan Esser X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 09:20:01 -0000 The following reply was made to PR ports/185275; it has been noted by GNATS. From: Stefan Esser To: bug-followup@FreeBSD.org, frank@pinky.sax.de Cc: Subject: Re: ports/185275: [maintainer update] port www/polipo Date: Sat, 24 May 2014 11:10:12 +0200 This is a multi-part message in MIME format. --------------030406020406010905000006 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit The attached patch fixes the last problem reported by "poudriere testport": Instead of directly editing /etc/newsyslog.conf, the user is reminded to edit that file (or add one to newsyslog.d). Regards, STefan --------------030406020406010905000006 Content-Type: text/plain; charset=windows-1252; name="polipo.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="polipo.diff" Index: Makefile =================================================================== --- Makefile (Revision 354986) +++ Makefile (Arbeitskopie) @@ -10,20 +10,14 @@ MAINTAINER= frank@pinky.sax.de COMMENT= A small and fast caching web proxy -MAN1= polipo.1 +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING USE_RC_SUBR= polipo -NO_STAGE= yes .include -.if defined(NO_PTEXINFO) -ALL_TARGET= polipo -NOPORTDOCS= yes -.else INFO= polipo -.endif - DOCSDIR= ${DATADIR}/www/doc PORTDOCS= * @@ -42,30 +36,17 @@ PLOGFILE?= /var/log/polipo MAKE_ENV+= DISK_CACHE_ROOT=${PCACHEDIR} -pre-install: apply-slist - @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/polipo ${PREFIX}/bin/ - ${MKDIR} ${PREFIX}/etc/periodic/daily/ - ${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${PREFIX}/etc/periodic/daily/ - ${INSTALL_MAN} ${WRKSRC}/polipo.man ${PREFIX}/man/man1/polipo.1 - ${MKDIR} ${PCONFIGDIR} - ${INSTALL_DATA} ${WRKSRC}/config.sample ${PCONFIGDIR} - ${INSTALL_DATA} ${WRKSRC}/forbidden.sample ${PCONFIGDIR} - ${CHGRP} -R ${PGRP} ${PCONFIGDIR} -.if !defined(NO_PTEXINFO) - ${INSTALL_DATA} ${WRKSRC}/polipo.info ${PREFIX}/info/ -.endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/html/* ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/localindex.html ${DATADIR}/www/index.html - ${CHGRP} -R ${PGRP} ${DATADIR} -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/polipo ${STAGEDIR}${PREFIX}/bin/ + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily/ + ${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${STAGEDIR}${PREFIX}/etc/periodic/daily/ + ${INSTALL_MAN} ${WRKSRC}/polipo.man ${STAGEDIR}${PREFIX}/man/man1/polipo.1 + ${MKDIR} ${STAGEDIR}${PCONFIGDIR} + ${INSTALL_DATA} ${WRKSRC}/config.sample ${STAGEDIR}${PCONFIGDIR} + ${INSTALL_DATA} ${WRKSRC}/forbidden.sample ${STAGEDIR}${PCONFIGDIR} + ${INSTALL_DATA} ${WRKSRC}/polipo.info ${STAGEDIR}${PREFIX}/info/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/html/* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/localindex.html ${STAGEDIR}${DATADIR}/www/index.html -post-install: - @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} - .include Index: files/pkg-install.in =================================================================== --- files/pkg-install.in (Revision 354986) +++ files/pkg-install.in (Arbeitskopie) @@ -44,9 +44,11 @@ elif [ "$2" = "POST-INSTALL" ]; then if [ ! -d "%%DESTDIR%%$POLIPOCACHE" ]; then + CACHEPARENT=`dirname ${POLIPOCACHE}` mkdir -p "%%DESTDIR%%$POLIPOCACHE" || exit 1 chown "$POLIPOUSER:$POLIPOGROUP" "%%DESTDIR%%$POLIPOCACHE" || exit 1 - chmod 0770 "%%DESTDIR%%$POLIPOCACHE" || exit 1 + chmod o+x "%%DESTDIR%%$CACHEPARENT" || exit 1 + chmod ug=rwx,o= "%%DESTDIR%%$POLIPOCACHE" || exit 1 fi if [ ! -d "%%DESTDIR%%$PPIDDIR" ]; then @@ -58,12 +60,16 @@ if [ ! -f "%%DESTDIR%%$POLIPOLOG" ]; then touch "%%DESTDIR%%$POLIPOLOG" || exit 1 chown "$POLIPOUSER" "%%DESTDIR%%$POLIPOLOG" || exit 1 - chmod 0640 "%%DESTDIR%%$POLIPOLOG" || exit 1 + chmod u=rw,g=r,o= "%%DESTDIR%%$POLIPOLOG" || exit 1 fi - + --------------------------------------------------------------------------- if ! fgrep "${POLIPOLOG}" "%%DESTDIR%%/etc/newsyslog.conf" 2>/dev/null 1>&2; then - echo "${POLIPOLOG} ${POLIPOUSER}: 640 3 100 * J $POLIPOPID 30" >> "%%DESTDIR%%/etc/newsyslog.conf" || exit 1 + echo "Add a line to /etc/newsyslog.conf (or /usr/local/etc/newsyslog.d/polipo if" + echo "supported on your system) to enable automatic log file rotation:" + echo + echo "${POLIPOLOG} ${POLIPOUSER}: 640 3 100 * J ${POLIPOPID} 30" + echo fi fi Index: pkg-plist =================================================================== --- pkg-plist (Revision 354986) +++ pkg-plist (Arbeitskopie) @@ -2,6 +2,10 @@ etc/polipo/config.sample etc/polipo/forbidden.sample etc/periodic/daily/400.polipo -%%PORTDOCS%%%%DATADIR%%/www/index.html +man/man1/polipo.1.gz +%%DATADIR%%/www/index.html +@dirrmtry %%DATADIR%%/www +@dirrmtry %%DATADIR%% +@dirrmtry etc/polipo @dirrmtry etc/periodic/daily @dirrmtry etc/periodic --------------030406020406010905000006--