Date: Sun, 22 Feb 2009 17:04:56 GMT From: Fabian Keil <fk@fabiankeil.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/131978: [MAINTAINER] www/privoxy update from 3.0.10 to 3.0.11 Message-ID: <200902221704.n1MH4uGI039694@www.freebsd.org> Resent-Message-ID: <200902221710.n1MHA1rG093652@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 131978 >Category: ports >Synopsis: [MAINTAINER] www/privoxy update from 3.0.10 to 3.0.11 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Feb 22 17:10:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Fabian Keil >Release: HEAD >Organization: >Environment: >Description: Attached is the update from www/privoxy 3.0.10 to 3.0.11. The changes are described at: http://www.privoxy.org/3.0.11/user-manual/whatsnew.html The patch also fixes a dependency problem in the rc script (the dependency on ldconfig wasn't registered). This has been reported by Stefan Thurner, who also provided the solution. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -u -ruN .zfs/snapshot/2009-02-19/www/privoxy/Makefile www/privoxy/Makefile --- .zfs/snapshot/2009-02-19/www/privoxy/Makefile 2008-08-21 09:38:34.634777744 +0200 +++ www/privoxy/Makefile 2009-02-22 16:54:09.729325672 +0100 @@ -6,7 +6,7 @@ # PORTNAME= privoxy -PORTVERSION= 3.0.10 +PORTVERSION= 3.0.11 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ijbswa @@ -83,13 +83,13 @@ @${MKDIR} ${PREFIX}/etc/privoxy/templates @${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin @${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${PREFIX}/etc/privoxy/templates -.for defaultfile in default.action standard.action default.filter +.for defaultfile in default.action default.filter @${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${PREFIX}/etc/privoxy @${CHOWN} privoxy:privoxy ${PREFIX}/etc/privoxy/${defaultfile} - @${CHMOD} 0640 ${PREFIX}/etc/privoxy/${defaultfile} + @${CHMOD} 0444 ${PREFIX}/etc/privoxy/${defaultfile} .endfor @${MKDIR} ${EXAMPLESDIR} -.for examplefile in config trust user.action +.for examplefile in config match-all.action trust user.action @${INSTALL_DATA} ${WRKSRC}/${examplefile} ${EXAMPLESDIR}/ @${CHOWN} privoxy:privoxy ${EXAMPLESDIR}/${examplefile} @${CHMOD} 0640 ${EXAMPLESDIR}/${examplefile} diff -u -ruN .zfs/snapshot/2009-02-19/www/privoxy/distinfo www/privoxy/distinfo --- .zfs/snapshot/2009-02-19/www/privoxy/distinfo 2008-08-16 20:01:04.644006990 +0200 +++ www/privoxy/distinfo 2009-02-21 22:25:42.971547009 +0100 @@ -1,3 +1,3 @@ -MD5 (privoxy-3.0.10-stable-src.tar.gz) = 01281017f28be2c7133124d1768da364 -SHA256 (privoxy-3.0.10-stable-src.tar.gz) = 3d9f9f56482012ddab396caf73f4c401746a4eeebd6c763b04f6108e48a9094f -SIZE (privoxy-3.0.10-stable-src.tar.gz) = 1957465 +MD5 (privoxy-3.0.11-stable-src.tar.gz) = 438d048de32d80ca7b17e72bdf5c7c3f +SHA256 (privoxy-3.0.11-stable-src.tar.gz) = cd1a3d2be048cba26ba70b4896709d8a0d2d2bbc0adca4b5a260319674098926 +SIZE (privoxy-3.0.11-stable-src.tar.gz) = 2050049 diff -u -ruN .zfs/snapshot/2009-02-19/www/privoxy/files/pkg-message.in www/privoxy/files/pkg-message.in --- .zfs/snapshot/2009-02-19/www/privoxy/files/pkg-message.in 2008-01-26 11:25:31.961712639 +0100 +++ www/privoxy/files/pkg-message.in 2009-02-21 22:57:50.373004492 +0100 @@ -14,11 +14,10 @@ For documentation see: %%DOCSDIR%%/user-manual or 'man privoxy' - Note that default.filter, standard.action and - default.action get overwritten with each Privoxy - update. Instead of changing them you should use - your own action and filter files as described in - Privoxy's manual. + Note that default.filter and default.action get + overwritten with each Privoxy update. Instead of + changing them you should use your own action and + filter files as described in Privoxy's manual. If you installed Privoxy as package and are using the default configuration, you have to make sure the diff -u -ruN .zfs/snapshot/2009-02-19/www/privoxy/files/privoxy.in www/privoxy/files/privoxy.in --- .zfs/snapshot/2009-02-19/www/privoxy/files/privoxy.in 2007-05-10 22:18:31.000000000 +0200 +++ www/privoxy/files/privoxy.in 2009-02-22 17:40:25.792936934 +0100 @@ -4,7 +4,7 @@ # # # PROVIDE: privoxy -# REQUIRE: NETWORKING +# REQUIRE: DAEMON # BEFORE: LOGIN # # This rc script understands the following variables @@ -34,14 +34,23 @@ : ${privoxy_user="privoxy"} : ${privoxy_pidfile="/var/run/privoxy/privoxy.pid"} -start_precmd="if [ ! -e ${privoxy_config} ]; then\ - echo ${privoxy_config} not found. Copying default configuration.;\ - cp %%PREFIX%%/share/examples/privoxy/config ${privoxy_config};\ - chown ${privoxy_user}:${privoxy_user} ${privoxy_config};\ -fi" +config_file_check () { + if [ ! -e ${privoxy_config} ]; then + echo config file not found. Copying the example file to ${privoxy_config}. + cp %%PREFIX%%/share/examples/privoxy/config ${privoxy_config} + chown ${privoxy_user}:${privoxy_user} ${privoxy_config}; + fi + actionfile="%%PREFIX%%/etc/privoxy/match-all.action" + if [ ! -e ${actionfile} ]; then + echo ${actionfile} not found. Copying the example file. + cp %%PREFIX%%/share/examples/privoxy/match-all.action ${actionfile} + chown ${privoxy_user}:${privoxy_user} ${actionfile} + fi +} + +start_precmd="config_file_check" command="%%PREFIX%%/sbin/privoxy" command_args="${privoxy_flags} --pidfile ${privoxy_pidfile} ${privoxy_config}" run_rc_command "$1" - diff -u -ruN .zfs/snapshot/2009-02-19/www/privoxy/pkg-plist www/privoxy/pkg-plist --- .zfs/snapshot/2009-02-19/www/privoxy/pkg-plist 2008-08-16 20:02:37.152355638 +0200 +++ www/privoxy/pkg-plist 2009-02-22 16:51:21.553957737 +0100 @@ -1,7 +1,6 @@ sbin/privoxy etc/privoxy/default.action etc/privoxy/default.filter -etc/privoxy/standard.action etc/privoxy/templates/blocked etc/privoxy/templates/cgi-error-404 etc/privoxy/templates/cgi-error-bad-param @@ -58,6 +57,7 @@ %%PORTDOCS%%%%DOCSDIR%%/user-manual/upgradersnote.html %%PORTDOCS%%%%DOCSDIR%%/user-manual/whatsnew.html %%EXAMPLESDIR%%/config +%%EXAMPLESDIR%%/match-all.action %%EXAMPLESDIR%%/trust %%EXAMPLESDIR%%/user.action @dirrm %%EXAMPLESDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902221704.n1MH4uGI039694>