Saturday, 20200222 13:01+0000, Stuart Henderson wrote:
> On 2020/02/21 21:40, 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
>
> Updated with some @owner/@group changes that were missed previously and
> highlighted by this regeneration. I regen'd patches as well.
Thanks! Sorry, I'm still getting the hang of this.
> I'm not sure what is going on with the existing jade/man2html patch as
> it doesn't depend on any of them and the port doesn't build the docbook
> documentation ..
I'm not sure what's going on with the jade/man2html/docbook patch,
either. Out of curiosity I wiped my build env and rebuilt the package
without that patch, and, at least on amd64, I wasn't able to spot a
difference. According to cvs, that snippet has been in
patches/patch-configure_in since import in 2002, and the commit
doesn't say why it's there. I motion to drop it (in the interest of
code clarity), and we can re-add it if we later find some
still-current reason to keep it.
Updated patch, dropping the jade/sgml/man2html/docbook bits and
switching the url to https per Rafael:
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 23 Feb 2020 14:43:21 -0000
@@ -2,13 +2,12 @@
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/
+HOMEPAGE= https://www.privoxy.org/
# GPLv2+
PERMIT_PACKAGE= Yes
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 23 Feb 2020 14:43:21 -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-GNUmakefile_in
===================================================================
RCS file: /cvs/ports/www/privoxy/patches/patch-GNUmakefile_in,v
retrieving revision 1.9
diff -u -p -u -r1.9 patch-GNUmakefile_in
--- patches/patch-GNUmakefile_in 21 Jan 2017 22:55:01 -0000 1.9
+++ patches/patch-GNUmakefile_in 23 Feb 2020 14:43:21 -0000
@@ -1,9 +1,11 @@
-$OpenBSD: patch-GNUmakefile_in,v 1.9 2017/01/21 22:55:01 danj Exp $
---- GNUmakefile.in.orig Thu Jul 28 10:16:04 2016
-+++ GNUmakefile.in Fri Jan 20 17:52:05 2017
-@@ -231,7 +231,7 @@ PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@
- SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(W32_SRC) $(PCRS_SRC)
$(PCRE_SRC) $(REGEX_SRC)
- OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(W32_OBJS) $(PCRS_OBJS)
$(PCRE_OBJS) $(REGEX_OBJS)
+$OpenBSD$
+
+Index: GNUmakefile.in
+--- GNUmakefile.in.orig
++++ GNUmakefile.in
+@@ -258,7 +258,7 @@ PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@
+ SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(FUZZ_SRC) $(W32_SRC) $(PCRS_SRC)
$(PCRE_SRC) $(REGEX_SRC)
+ OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS)
$(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS)
HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS)
-LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB)
+LIBS = @LDFLAGS@ @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB)
Index: patches/patch-config
===================================================================
RCS file: /cvs/ports/www/privoxy/patches/patch-config,v
retrieving revision 1.9
diff -u -p -u -r1.9 patch-config
--- patches/patch-config 7 Jan 2015 02:10:50 -0000 1.9
+++ patches/patch-config 23 Feb 2020 14:43:21 -0000
@@ -1,7 +1,9 @@
-$OpenBSD: patch-config,v 1.9 2015/01/07 02:10:50 bcallah Exp $
---- config.orig Fri Nov 14 06:31:53 2014
-+++ config Sat Jan 3 00:27:23 2015
-@@ -260,7 +260,7 @@
+$OpenBSD$
+
+Index: config
+--- config.orig
++++ config
+@@ -258,7 +258,7 @@
#
# No trailing "/", please.
#
@@ -10,7 +12,7 @@ $OpenBSD: patch-config,v 1.9 2015/01/07
#
# 2.2. templdir
# ==============
-@@ -345,7 +345,7 @@ confdir .
+@@ -343,7 +343,7 @@ confdir .
#
# No trailing "/", please.
#
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 23 Feb 2020 14:43:21 -0000
@@ -1,32 +1,9 @@
-$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
- AC_SUBST(W3M)
- AC_SUBST(DB2HTML)
-
--dnl If we use rpm, we need to check where %_topdir is
--AC_CHECK_PROGS(RPMBIN,rpm,false)
--if test $RPMBIN != false; then
-- RPM_BASE=`rpm --eval "%{_topdir}"`
-- if test "$RPM_BASE" = ""; then
-- RPM_BASE=/usr/src/redhat
-- fi
--fi
--AC_SUBST(RPM_BASE)
--
--dnl Check for jade, so we can build the documentation
--AC_CHECK_PROGS(JADEBIN,jade openjade,false)
--AC_SUBST(JADEBIN)
--
--dnl Check for man2html for docs.
--AC_CHECK_PROGS(MAN2HTML,man2html,false)
--AC_SUBST(MAN2HTML)
--
- 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
+$OpenBSD$
+
+Index: configure.in
+--- configure.in.orig
++++ configure.in
+@@ -1092,7 +1068,7 @@ if test $have_pcre = "yes"; then
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 23 Feb 2020 14:43:21 -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
@@ -120,6 +121,8 @@ share/examples/privoxy/templates/connect
@owner _privoxy
@group _privoxy
@sample ${SYSCONFDIR}/privoxy/templates/connection-timeout
+@owner
+@group
share/examples/privoxy/templates/default
@owner _privoxy
@group _privoxy
@@ -214,6 +217,8 @@ share/examples/privoxy/templates/no-serv
@owner _privoxy
@group _privoxy
@sample ${SYSCONFDIR}/privoxy/templates/no-server-data
+@owner
+@group
share/examples/privoxy/templates/no-such-domain
@owner _privoxy
@group _privoxy
@@ -244,12 +249,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
@@ -272,6 +271,8 @@ share/examples/privoxy/templates/url-inf
@owner _privoxy
@group _privoxy
@sample ${SYSCONFDIR}/privoxy/templates/url-info-osd.xml
+@owner
+@group
share/examples/privoxy/user.action
@owner _privoxy
@group _privoxy
@@ -287,6 +288,3 @@ share/examples/privoxy/user.filter
@owner
@sample /var/privoxy/log/
@extraunexec rm -rf /var/privoxy/log/*
-@group
-@mode
-@rcscript ${RCDIR}/privoxy
