Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7067427 privoxy should be upgraded
authortomas klacko - Sun Microsystems - Prague Czech Republic <tomas.klacko@oracle.com>
Wed, 03 Aug 2011 01:08:07 -0700
changeset 451 415e37aed447
parent 450 dff434c79300
child 452 ef9282f63da3
7067427 privoxy should be upgraded
components/privoxy/Makefile file | annotate | diff | comparison | revisions
components/privoxy/privoxy.p5m file | annotate | diff | comparison | revisions 
--- a/components/privoxy/Makefile	Tue Aug 02 13:01:59 2011 -0700
+++ b/components/privoxy/Makefile	Wed Aug 03 01:08:07 2011 -0700
@@ -26,11 +26,11 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		privoxy
-COMPONENT_VERSION=	3.0.8
+COMPONENT_VERSION=	3.0.17
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-stable
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.gz
 COMPONENT_PROJECT_URL=	http://www.privoxy.org/
-COMPONENT_ARCHIVE_HASH=	sha1:7fe2b7afde4066ef1f170f5f11850cf9da428a42
+COMPONENT_ARCHIVE_HASH=	sha1:cadef2eb8ec182278e092322d3d56f225cb69c93
 COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/ijbswa/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
@@ -49,20 +49,11 @@
 CONFIGURE_OPTIONS +=	--sysconfdir=/etc
 CONFIGURE_OPTIONS +=	--localstatedir=/var
 
-# DESTDIR doesn't work correctly, so we specify some of the paths directly.
-COMPONENT_INSTALL_ARGS +=	prefix=$(PROTOUSRDIR)
-COMPONENT_INSTALL_ARGS +=	CONF_BASE=$(PROTOETCDIR)
-COMPONENT_INSTALL_ARGS +=	SBIN_DEST=$(PROTOUSRSBINDIR)
-COMPONENT_INSTALL_ARGS +=	MAN_DIR=$(PROTOUSRSHAREMANDIR)
-COMPONENT_INSTALL_ARGS +=	VAR_DEST=$(PROTO_DIR)/var
-
 # common targets
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
 	$(CP) $(BUILD_DIR_32)/templates/* $(PROTOETCDIR)/templates
-	$(MKDIR) $(PROTOUSRSHAREDOCDIR)/privoxy
-	$(CP) $(BUILD_DIR_32)/doc/text/faq.txt $(PROTOUSRSHAREDOCDIR)/privoxy
 
 test:		$(NO_TESTS)
 
--- a/components/privoxy/privoxy.p5m	Tue Aug 02 13:01:59 2011 -0700
+++ b/components/privoxy/privoxy.p5m	Wed Aug 03 01:08:07 2011 -0700
@@ -61,6 +61,8 @@
 dir path=usr/share/doc/privoxy
 dir path=usr/share/doc/privoxy/developer-manual
 dir path=usr/share/doc/privoxy/faq
+dir path=usr/share/doc/privoxy/images
+dir path=usr/share/doc/privoxy/man-page
 dir path=usr/share/doc/privoxy/user-manual
 dir path=usr/share/man
 dir path=usr/share/man/man1
@@ -71,7 +73,7 @@
 file path=etc/privoxy/config
 file path=etc/privoxy/default.action
 file path=etc/privoxy/default.filter
-file path=etc/privoxy/standard.action
+file path=etc/privoxy/match-all.action
 file path=etc/privoxy/templates/blocked
 file path=etc/privoxy/templates/cgi-error-404
 file path=etc/privoxy/templates/cgi-error-bad-param
@@ -82,6 +84,7 @@
 file path=etc/privoxy/templates/cgi-error-parse
 file path=etc/privoxy/templates/cgi-style.css
 file path=etc/privoxy/templates/connect-failed
+file path=etc/privoxy/templates/connection-timeout
 file path=etc/privoxy/templates/default
 file path=etc/privoxy/templates/edit-actions-add-url-form
 file path=etc/privoxy/templates/edit-actions-for-url
@@ -98,6 +101,7 @@
 file path=etc/privoxy/templates/mod-title
 file path=etc/privoxy/templates/mod-unstable-warning
 file path=etc/privoxy/templates/no-such-domain
+file path=etc/privoxy/templates/no-server-data
 file path=etc/privoxy/templates/show-request
 file path=etc/privoxy/templates/show-status
 file path=etc/privoxy/templates/show-status-file
@@ -106,6 +110,7 @@
 file path=etc/privoxy/templates/toggle
 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/trust
 file path=etc/privoxy/user.action
 file path=etc/privoxy/user.filter
@@ -123,11 +128,9 @@
 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/quickstart.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.txt
 file path=usr/share/doc/privoxy/faq/configuration.html
 file path=usr/share/doc/privoxy/faq/contact.html
 file path=usr/share/doc/privoxy/faq/copyright.html
@@ -136,8 +139,11 @@
 file path=usr/share/doc/privoxy/faq/installation.html
 file path=usr/share/doc/privoxy/faq/misc.html
 file path=usr/share/doc/privoxy/faq/trouble.html
+file path=usr/share/doc/privoxy/index.html
+file path=usr/share/doc/privoxy/p_doc.css
 file path=usr/share/doc/privoxy/LICENSE
 file path=usr/share/doc/privoxy/README
+file path=usr/share/doc/privoxy/man-page/privoxy-man-page.html
 file path=usr/share/doc/privoxy/user-manual/actions-file.html
 file path=usr/share/doc/privoxy/user-manual/appendix.html
 file path=usr/share/doc/privoxy/user-manual/config.html
@@ -149,18 +155,18 @@
 file path=usr/share/doc/privoxy/user-manual/index.html
 file path=usr/share/doc/privoxy/user-manual/installation.html
 file path=usr/share/doc/privoxy/user-manual/introduction.html
+file path=usr/share/doc/privoxy/user-manual/p_doc.css
 file path=usr/share/doc/privoxy/user-manual/proxy_setup.jpg
 file path=usr/share/doc/privoxy/user-manual/proxy2.jpg
 file path=usr/share/doc/privoxy/user-manual/quickstart.html
 file path=usr/share/doc/privoxy/user-manual/seealso.html
 file path=usr/share/doc/privoxy/user-manual/startup.html
 file path=usr/share/doc/privoxy/user-manual/templates.html
-file path=usr/share/doc/privoxy/user-manual/upgradersnote.html
 file path=usr/share/doc/privoxy/user-manual/whatsnew.html
 file path=usr/share/man/man1/privoxy.1
 
 file usr/sbin/privoxy path=usr/lib/privoxy mode=0555
 
 legacy pkg=SUNWprivoxy \
-    desc="Privoxy Web Proxy 3.0.8" \
+    desc="Privoxy Web Proxy" \
     name="Privoxy Web Proxy"
upstream/oracle/userland-gate