--- a/components/privoxy/Makefile Fri Jun 26 13:51:45 2015 -0700
+++ b/components/privoxy/Makefile Mon Jul 06 09:08:03 2015 -0700
@@ -20,18 +20,18 @@
#
#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= privoxy
-COMPONENT_VERSION= 3.0.17
+COMPONENT_VERSION= 3.0.23
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)-stable
COMPONENT_ARCHIVE= $(COMPONENT_SRC)-src.tar.gz
COMPONENT_PROJECT_URL= http://www.privoxy.org/
COMPONENT_ARCHIVE_HASH= \
- sha256:d1de36dc141180a5ab5e910507551564e958cc23a7d8daaa411e1564c208cd77
+ sha256:b75f6b8b8409ed7ac6c3a00dcd608a45180f07bfa46658c836d5c6ffc4dc25c4
COMPONENT_ARCHIVE_URL= http://downloads.sourceforge.net/ijbswa/$(COMPONENT_ARCHIVE)
COMPONENT_BUGDB= utility/privoxy
@@ -57,7 +57,20 @@
install: $(INSTALL_32)
$(CP) $(BUILD_DIR_32)/templates/* $(PROTOETCDIR)/templates
-test: $(NO_TESTS)
+# Regression tests exist for privoxy in tools/privoxy-regression-test.pl,
+# however these are not applicable to us since they violate the company policy
+# of not allowing third-party programs to communicate outside the company.
+#
+# To test privoxy, follow the instructions in the privoxy quick start guide:
+# http://www.privoxy.org/user-manual/quickstart.html
+#
+# Privoxy is disabled by default, so make sure to enable it if necessary:
+# # svcs privoxy
+# # svcadm enable privoxy
+# You may need to set the forward address in /etc/privoxy/config to the
+# Oracle proxy to access pages in your web browser with privoxy running.
+
+test: $(NO_TESTS)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/privoxy/patches/manpage.patch Mon Jul 06 09:08:03 2015 -0700
@@ -0,0 +1,43 @@
+Solaris specific patch for man-page information. Not suitable for upstream.
+
+diff -rupN privoxy-3.0.23-stable-orig/privoxy.1 privoxy-3.0.23-stable/privoxy.1
+--- privoxy-3.0.23-stable-orig/privoxy.1 2015-06-15 15:36:06.491090350 -0700
++++ privoxy-3.0.23-stable/privoxy.1 2015-06-15 15:45:25.081367798 -0700
[email protected]@ -147,7 +147,7 @@ features and notes on upgrading.
+ .SH "FILES"
+
+ .nf
+- \fI/usr/sbin/privoxy\fR
++ \fI/usr/lib/privoxy\fR
+ \fI/etc/privoxy/config\fR
+ \fI/etc/privoxy/match-all.action\fR
+ \fI/etc/privoxy/default.action\fR
[email protected]@ -211,6 +211,28 @@ configuration related suggestions to the
+ Roland Rosenfeld
+ Ian Silvester
+ .fi
++.RE
++.SH "AUTOMATIC SERVICE MANAGEMENT (SMF)"
++.PP
++The Privoxy service is disabled by default. You can
++check the status of the service by issuing the following
++command:
++.PP
++\fB example% svcs privoxy\fR
++\fB STATE STIME FMRI
++\fB disabled 10:47:39 svc:/network/http:privoxy
++.PP
++Enable the Privoxy service by issuing the following
++command :
++.PP
++\fBexample%svcadm enable privoxy\fR
++.PP
++The state of the service instance should change to "online".
++.PP
++\fB example% svcs privoxy\fR
++\fB STATE STIME FMRI\fR
++\fB online 10:50:27 svc:/network/http:privoxy\fR
++.fi
+ .SH "COPYRIGHT AND LICENSE"
+ .SS "COPYRIGHT"
+ .PP
--- a/components/privoxy/patches/solaris.patch Fri Jun 26 13:51:45 2015 -0700
+++ b/components/privoxy/patches/solaris.patch Mon Jul 06 09:08:03 2015 -0700
@@ -1,42 +1,46 @@
-diff -ru privoxy-3.0.8-stable-orig/GNUmakefile.in privoxy-3.0.8-stable/GNUmakefile.in
---- privoxy-3.0.8-stable-orig/GNUmakefile.in Fri Aug 1 14:32:02 2008
-+++ privoxy-3.0.8-stable/GNUmakefile.in Fri Aug 1 14:33:36 2008
[email protected]@ -243,7 +243,7 @@
- # Add your flags here
- OTHER_CFLAGS =
-
+Changes directories where various files (i.e. logfiles, templates, config files)
+are stored from the privoxy defaults.
+Solaris-specific patch; not suitable for upstream
+
+diff -rupN privoxy-3.0.23-stable-orig/GNUmakefile.in privoxy-3.0.23-stable/GNUmakefile.in
+--- privoxy-3.0.23-stable-orig/GNUmakefile.in 2015-06-02 13:26:57.665811110 -0700
++++ privoxy-3.0.23-stable/GNUmakefile.in 2015-06-02 13:27:47.124881014 -0700
[email protected]@ -241,7 +241,7 @@ SPECIAL_CFLAGS = @[email protected]
+ # Add your flags here
+ OTHER_CFLAGS =
+
-CFLAGS = @[email protected] @[email protected] $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
+CFLAGS = @[email protected] @[email protected] $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) \
- @[email protected] -Ipcre
-
+ @[email protected] -Ipcre
+
LDFLAGS = @[email protected] $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS)
-diff -ru privoxy-3.0.8-stable-orig/config privoxy-3.0.8-stable/config
---- privoxy-3.0.8-stable-orig/config Fri Aug 1 14:32:01 2008
-+++ privoxy-3.0.8-stable/config Fri Aug 1 14:37:51 2008
+diff -rupN privoxy-3.0.23-stable-orig/config privoxy-3.0.23-stable/config
+--- privoxy-3.0.23-stable-orig/config 2015-06-02 13:27:15.297393314 -0700
++++ privoxy-3.0.23-stable/config 2015-06-02 13:29:14.468549370 -0700
@@ -260,7 +260,7 @@
#
# No trailing "/", please.
#
-confdir .
-+confdir /etc/privoxy
- #
++confdir /etc/privoxy
#
# 2.2. templdir
[email protected]@ -315,7 +315,7 @@
+ # ==============
[email protected]@ -345,7 +345,7 @@ confdir .
#
# No trailing "/", please.
#
-logdir .
-+logdir /var/log/privoxy
- #
++logdir /var/log/privoxy
#
- # 2.4. actionsfile
[email protected]@ -452,7 +452,7 @@
- # Any log files must be writable by whatever user Privoxy is
- # being run as (on Unix, default user id is "privoxy").
+ # 2.5. actionsfile
+ # =================
[email protected]@ -478,7 +478,7 @@ filterfile user.filter # User custo
+ # require additional software to do it. For details, please
+ # refer to the documentation for your operating system.
#
-logfile logfile
-+logfile privoxy.log
++logfile privoxy.log
#
- #
- # 2.7. jarfile
+ # 2.8. trustfile
+ # ===============
--- a/components/privoxy/privoxy.p5m Fri Jun 26 13:51:45 2015 -0700
+++ b/components/privoxy/privoxy.p5m Mon Jul 06 09:08:03 2015 -0700
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -38,7 +38,7 @@
set name=pkg.description value="Privoxy is a non-caching web proxy with advanced filtering capabilities for enhancing privacy, modifying web page data and HTTP headers, controlling access, and removing ads and other obnoxious Internet junk"
set name=pkg.summary value="Privacy-enhancing, ad-removing web proxy"
set name=com.oracle.info.description value="the privoxy web proxy"
-set name=com.oracle.info.tpno value=9002
+set name=com.oracle.info.tpno value=22977
set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -123,14 +123,11 @@
file path=usr/share/doc/privoxy/AUTHORS
file path=usr/share/doc/privoxy/ChangeLog
file path=usr/share/doc/privoxy/developer-manual/coding.html
-file path=usr/share/doc/privoxy/developer-manual/contact.html
-file path=usr/share/doc/privoxy/developer-manual/copyright.html
file path=usr/share/doc/privoxy/developer-manual/cvs.html
file path=usr/share/doc/privoxy/developer-manual/documentation.html
file path=usr/share/doc/privoxy/developer-manual/index.html
file path=usr/share/doc/privoxy/developer-manual/introduction.html
file path=usr/share/doc/privoxy/developer-manual/newrelease.html
-file path=usr/share/doc/privoxy/developer-manual/seealso.html
file path=usr/share/doc/privoxy/developer-manual/testing.html
file path=usr/share/doc/privoxy/developer-manual/webserver-update.html
file path=usr/share/doc/privoxy/faq/configuration.html