privoxy: update to 3.0.33 and switch to 64-bit

Andreas Wacknitz

2022-03-31 73d94d5dc550af4e704f9cc94f2ae174cfd3bc39

privoxy: update to 3.0.33 and switch to 64-bit

 components/web/privoxy/Makefile

@@ -23,11 +23,11 @@
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#

BUILD_BITS= 32
BUILD_BITS= 64
include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        privoxy
COMPONENT_VERSION=    3.0.32
COMPONENT_VERSION=    3.0.33
COMPONENT_SUMMARY=    Privacy-enhancing, ad-removing web proxy
COMPONENT_DESCRIPTION=    Privoxy is a non-caching web proxy with advanced\
 filtering capabilities for enhancing privacy, modifying web page data\
@@ -36,7 +36,7 @@
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)-stable
COMPONENT_ARCHIVE=    $(COMPONENT_SRC)-src.tar.gz
COMPONENT_PROJECT_URL=    https://www.privoxy.org/
COMPONENT_ARCHIVE_HASH= sha256:c61de4008c62445ec18f1f270407cbf2372eaba93beaccdc9e3238bb2defeed7
COMPONENT_ARCHIVE_HASH= sha256:04b104e70dac61561b9dd110684b250fafc8c13dbe437a60fae18ddd9a881fae
COMPONENT_ARCHIVE_URL=    https://downloads.sourceforge.net/ijbswa/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=    web/proxy/privoxy
COMPONENT_CLASSIFICATION=    Web Services/Application and Web Servers
@@ -59,8 +59,8 @@
CONFIGURE_OPTIONS +=    --localstatedir=/var

# common targets
install:    $(INSTALL_32)
    $(CP) $(BUILD_DIR_32)/templates/* $(PROTOETCDIR)/templates
install:    $(INSTALL_64)
    $(CP) $(BUILD_DIR_64)/templates/* $(PROTOETCDIR)/templates

# Regression tests exist for privoxy in tools/privoxy-regression-test.pl,
# however these are not applicable to us since they violate the company policy
@@ -79,4 +79,5 @@
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += library/pcre
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library

 components/web/privoxy/manifests/sample-manifest.p5m

@@ -10,7 +10,7 @@
#

#
# Copyright 2020 <contributor>
# Copyright 2022 <contributor>
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -43,7 +43,7 @@
file path=etc/templates/edit-actions-add-url-form
file path=etc/templates/edit-actions-for-url
file path=etc/templates/edit-actions-for-url-filter
file path=etc/templates/edit-actions-for-url-string-filter
file path=etc/templates/edit-actions-for-url-string-action
file path=etc/templates/edit-actions-list
file path=etc/templates/edit-actions-list-button
file path=etc/templates/edit-actions-list-section
@@ -65,6 +65,7 @@
file path=etc/templates/toggle-mini
file path=etc/templates/untrusted
file path=etc/templates/url-info-osd.xml
file path=etc/templates/wpad.dat
file path=etc/trust
file path=etc/user.action
file path=etc/user.filter

 components/web/privoxy/patches/01-solaris.patch

@@ -1,17 +1,18 @@

In some circumstances config file is installed as config.new...

--- privoxy-3.0.23-stable/GNUmakefile.in.~1~    2015-01-24 19:40:07.000000000 +0300
+++ privoxy-3.0.23-stable/GNUmakefile.in    2015-08-06 20:52:25.595669015 +0300
@@ -241,7 +241,7 @@
--- privoxy-3.0.33-stable/GNUmakefile.in.orig    2021-12-08 12:05:05.000000000 +0000
+++ privoxy-3.0.33-stable/GNUmakefile.in    2022-03-31 21:35:18.211582929 +0000
@@ -282,7 +282,7 @@
 # Add your flags here
 OTHER_CFLAGS =
 
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
+CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) \
          @STATIC_PCRE_ONLY@ -Ipcre
-CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall
+CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS)
 
 LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
@@ -918,7 +918,7 @@
 
@@ -943,7 +943,7 @@
     fi ;\
     $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
     for i in $(CONFIGS); do \
@@ -20,7 +21,6 @@
             $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
             $(ECHO) Installing fresh $$i;\
             $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\

diff -ru privoxy-3.0.8-stable-orig/config privoxy-3.0.8-stable/config
--- privoxy-3.0.23-stable/config.~1~    2015-01-24 19:44:20.000000000 +0300
+++ privoxy-3.0.23-stable/config    2015-08-06 20:53:29.180676722 +0300

 components/web/privoxy/pkg5

@@ -3,6 +3,7 @@
        "SUNWcs",
        "library/pcre",
        "library/zlib",
        "shell/ksh93",
        "system/library"
    ],
    "fmris": [

 components/web/privoxy/privoxy.p5m

@@ -71,7 +71,7 @@
file path=etc/privoxy/templates/edit-actions-add-url-form
file path=etc/privoxy/templates/edit-actions-for-url
file path=etc/privoxy/templates/edit-actions-for-url-filter
file path=etc/privoxy/templates/edit-actions-for-url-string-filter
file path=etc/privoxy/templates/edit-actions-for-url-string-action
file path=etc/privoxy/templates/edit-actions-list
file path=etc/privoxy/templates/edit-actions-list-button
file path=etc/privoxy/templates/edit-actions-list-section
@@ -93,6 +93,7 @@
file path=etc/privoxy/templates/toggle-mini
file path=etc/privoxy/templates/untrusted
file path=etc/privoxy/templates/url-info-osd.xml
file path=etc/privoxy/templates/wpad.dat
file path=etc/privoxy/trust
file path=etc/privoxy/user.action
file path=etc/privoxy/user.filter