On Fri Feb 21, 2020 at 09:40:51PM -0500, David Goerger wrote: > I noticed 3.0.28 was released about a year ago, and figured it was > time for an update. Tested on amd64. > > The full changelog from 3.0.26 is available here: > > https://www.privoxy.org/announce.txt > > Most of the noise in the patch is from (1) patching out sgml from > configure.in to match what we do for jade and man2html, and (2) > regenerating pkg/PLIST with 'make update-plist'. > > Thanks! > David > > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/www/privoxy/Makefile,v > retrieving revision 1.36 > diff -u -p -u -r1.36 Makefile > --- Makefile 12 Jul 2019 20:51:00 -0000 1.36 > +++ Makefile 22 Feb 2020 02:18:05 -0000 > @@ -2,11 +2,10 @@ > > COMMENT= web proxy with advanced filtering capabilities > > -V= 3.0.26 > +V= 3.0.28 > DISTNAME= privoxy-${V}-stable > PKGNAME= privoxy-${V} > CATEGORIES= www > -REVISION= 0 > > HOMEPAGE= http://www.privoxy.org/
s/http/https/ > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/www/privoxy/distinfo,v > retrieving revision 1.16 > diff -u -p -u -r1.16 distinfo > --- distinfo 21 Jan 2017 22:55:01 -0000 1.16 > +++ distinfo 22 Feb 2020 02:18:05 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (privoxy-3.0.26-stable-src.tar.gz) = > V+QVtD7l39ynRoXMA0BT6q6WKVL9q9CGFxVRqGq/nNg= > -SIZE (privoxy-3.0.26-stable-src.tar.gz) = 1741772 > +SHA256 (privoxy-3.0.28-stable-src.tar.gz) = > tdeMwDaqrbO3z4YOnVmNczKvRokmom4tVhZ/HLbygko= > +SIZE (privoxy-3.0.28-stable-src.tar.gz) = 1753809 > Index: patches/patch-configure_in > =================================================================== > RCS file: /cvs/ports/www/privoxy/patches/patch-configure_in,v > retrieving revision 1.8 > diff -u -p -u -r1.8 patch-configure_in > --- patches/patch-configure_in 21 Jan 2017 22:55:01 -0000 1.8 > +++ patches/patch-configure_in 22 Feb 2020 02:18:05 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-configure_in,v 1.8 2017/01/21 22:55:01 danj Exp $ > ---- configure.in.orig Fri Aug 26 14:26:43 2016 > -+++ configure.in Fri Jan 20 17:52:07 2017 > -@@ -333,24 +333,6 @@ fi > +--- configure.in.orig Sun Dec 30 13:40:13 2018 > ++++ configure.in Fri Feb 21 21:00:59 2020 > +@@ -339,30 +339,6 @@ > AC_SUBST(W3M) > AC_SUBST(DB2HTML) > > @@ -15,10 +15,16 @@ $OpenBSD: patch-configure_in,v 1.8 2017/ > -fi > -AC_SUBST(RPM_BASE) > - > +-dnl prefer openjade to jade > -dnl Check for jade, so we can build the documentation > --AC_CHECK_PROGS(JADEBIN,jade openjade,false) > +-AC_CHECK_PROGS(JADEBIN,openjade jade,false) > -AC_SUBST(JADEBIN) > - > +-dnl Prefer OpenSP to SP > +-dnl ref: > https://lists.privoxy.org/pipermail/privoxy-devel/2018-November/000293.html > +-AC_CHECK_PROGS(NSGMLS,onsgmls nsgmls,false) > +-AC_SUBST(NSGMLS) > +- > -dnl Check for man2html for docs. > -AC_CHECK_PROGS(MAN2HTML,man2html,false) > -AC_SUBST(MAN2HTML) > @@ -26,7 +32,7 @@ $OpenBSD: patch-configure_in,v 1.8 2017/ > dnl Set doc status flag for conditional content inclusions > DOC_STATUS=p-not-stable > if test $CODE_STATUS = stable; then > -@@ -1077,7 +1059,7 @@ if test $have_pcre = "yes"; then > +@@ -1092,7 +1068,7 @@ > pcre_dyn=yes > AC_DEFINE(FEATURE_DYNAMIC_PCRE,1,[Define to dynamically link to pcre.]) > STATIC_PCRE_ONLY=# > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/www/privoxy/pkg/PLIST,v > retrieving revision 1.12 > diff -u -p -u -r1.12 PLIST > --- pkg/PLIST 21 Jan 2017 22:55:01 -0000 1.12 > +++ pkg/PLIST 22 Feb 2020 02:18:05 -0000 > @@ -1,6 +1,7 @@ > @comment $OpenBSD: PLIST,v 1.12 2017/01/21 22:55:01 danj Exp $ > @newgroup _privoxy:516 > @newuser _privoxy:516:_privoxy:daemon:Privoxy > Account:/var/privoxy:/sbin/nologin > +@rcscript ${RCDIR}/privoxy > bin/privoxy-log-parser.pl > bin/privoxy-regression-test.pl > bin/uagen.pl > @@ -121,8 +122,6 @@ share/examples/privoxy/templates/connect > @group _privoxy > @sample ${SYSCONFDIR}/privoxy/templates/connection-timeout > share/examples/privoxy/templates/default > -@owner _privoxy > -@group _privoxy > @sample ${SYSCONFDIR}/privoxy/templates/default > @owner > @group > @@ -215,8 +214,6 @@ share/examples/privoxy/templates/no-serv > @group _privoxy > @sample ${SYSCONFDIR}/privoxy/templates/no-server-data > share/examples/privoxy/templates/no-such-domain > -@owner _privoxy > -@group _privoxy > @sample ${SYSCONFDIR}/privoxy/templates/no-such-domain > @owner > @group > @@ -244,12 +241,6 @@ share/examples/privoxy/templates/show-ur > @sample ${SYSCONFDIR}/privoxy/templates/show-url-info > @owner > @group > -share/examples/privoxy/templates/show-version > -@owner _privoxy > -@group _privoxy > -@sample ${SYSCONFDIR}/privoxy/templates/show-version > -@owner > -@group > share/examples/privoxy/templates/toggle > @owner _privoxy > @group _privoxy > @@ -273,8 +264,6 @@ share/examples/privoxy/templates/url-inf > @group _privoxy > @sample ${SYSCONFDIR}/privoxy/templates/url-info-osd.xml > share/examples/privoxy/user.action > -@owner _privoxy > -@group _privoxy > @sample ${SYSCONFDIR}/privoxy/user.action > @owner > @group > @@ -287,6 +276,3 @@ share/examples/privoxy/user.filter > @owner > @sample /var/privoxy/log/ > @extraunexec rm -rf /var/privoxy/log/* > -@group > -@mode > -@rcscript ${RCDIR}/privoxy >
