Date: 5 Mar 2007 03:46:37 -0300 From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: frank@pinky.sax.de Subject: ports/109898: Port update www/polipo to version 0.9.99.2 Message-ID: <20070305064637.34945.qmail@exxodus.fedaykin.here> Resent-Message-ID: <200703050730.l257U13F020661@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109898 >Category: ports >Synopsis: Port update www/polipo to version 0.9.99.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Mar 05 07:30:00 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Mario Sergio Fujikawa Ferreira >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD exxodus.fedaykin.here 6.2-STABLE FreeBSD 6.2-STABLE #0: Tue Feb 20 13:14:06 BRT 2007 lioux@exxodus:/usr/obj-6.x/usr/src-6.x/sys/LIOUX i386 >Description: Port update to version 0.9.99.2 + Added files: files/patch-Makefile files/patch-config.sample files/patch-forbidden.c files/patch-polipo.man + Removed files: files/patch-aa >How-To-Repeat: >Fix: --- patch begins here --- diff -ruN /usr/ports/www/polipo/Makefile polipo/Makefile --- /usr/ports/www/polipo/Makefile Wed Feb 7 13:37:34 2007 +++ polipo/Makefile Mon Mar 5 01:38:44 2007 @@ -6,7 +6,7 @@ # PORTNAME= polipo -PORTVERSION= 0.9.12 +PORTVERSION= 0.9.99.2 CATEGORIES= www MASTER_SITES= http://www.pps.jussieu.fr/~jch/software/files/polipo/ \ http://www.sax.de/~frank/polipo4bsd/files/ @@ -48,6 +48,12 @@ PPIDFILE= ${PPIDDIR}polipo.pid PLOGFILE?= /var/log/polipo MAKE_ENV+= DISK_CACHE_ROOT=${PCACHEDIR} + +post-patch: +.for file in forbidden.c polipo.man + @${REINPLACE_CMD} -E -e 's|%%PREFIX%%|${PREFIX}|' \ + ${WRKSRC}/${file} +.endfor pre-install: apply-slist @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff -ruN /usr/ports/www/polipo/distinfo polipo/distinfo --- /usr/ports/www/polipo/distinfo Wed Feb 7 13:37:34 2007 +++ polipo/distinfo Mon Mar 5 00:06:00 2007 @@ -1,3 +1,3 @@ -MD5 (polipo-0.9.12.tar.gz) = ce82913e3698de5d15465fb45dbafa11 -SHA256 (polipo-0.9.12.tar.gz) = 6b42de207937d3b13184aab3de2c3a6b9ab0ede92c340b19305f668e191cf205 -SIZE (polipo-0.9.12.tar.gz) = 149370 +MD5 (polipo-0.9.99.2.tar.gz) = 9011a34b5279ae8bf79fd493688e2843 +SHA256 (polipo-0.9.99.2.tar.gz) = b04e131c940ee84a3577f682bff8a03c253c016c66d6fa39a5d9fe804d2e37a3 +SIZE (polipo-0.9.99.2.tar.gz) = 176634 diff -ruN /usr/ports/www/polipo/files/patch-Makefile polipo/files/patch-Makefile --- /usr/ports/www/polipo/files/patch-Makefile Wed Dec 31 21:00:00 1969 +++ polipo/files/patch-Makefile Mon Mar 5 01:31:03 2007 @@ -0,0 +1,23 @@ +--- Makefile.orig Mon Mar 5 01:29:41 2007 ++++ Makefile Mon Mar 5 01:30:48 2007 +@@ -2,8 +2,8 @@ + BINDIR = $(PREFIX)/bin + MANDIR = $(PREFIX)/man + INFODIR = $(PREFIX)/info +-LOCAL_ROOT = /usr/share/polipo/www +-DISK_CACHE_ROOT = /var/cache/polipo ++LOCAL_ROOT = $(PREFIX)/share/polipo/www ++DISK_CACHE_ROOT ?= /var/cache/polipo + + # To compile with Unix CC: + +@@ -62,7 +62,8 @@ + + DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) + +-CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) ++CFLAGS ?= $(CDEBUGFLAGS) ++CFLAGS += $(MD5INCLUDES) $(DEFINES) $(EXTRA_DEFINES) + + SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ + config.c local.c http.c client.c server.c auth.c tunnel.c \ diff -ruN /usr/ports/www/polipo/files/patch-aa polipo/files/patch-aa --- /usr/ports/www/polipo/files/patch-aa Wed Jul 27 12:21:44 2005 +++ polipo/files/patch-aa Wed Dec 31 21:00:00 1969 @@ -1,103 +0,0 @@ ---- Makefile Tue Jun 29 02:07:35 2004 -+++ Makefile Mon Dec 27 15:35:40 2004 -@@ -2,8 +2,8 @@ - BINDIR = $(PREFIX)/bin - MANDIR = $(PREFIX)/man - INFODIR = $(PREFIX)/info --LOCAL_ROOT = /usr/share/polipo/www --DISK_CACHE_ROOT = /var/cache/polipo -+LOCAL_ROOT = $(PREFIX)/share/polipo/www -+DISK_CACHE_ROOT ?= /var/cache/polipo - - # CDEBUGFLAGS = -O - -@@ -47,7 +47,8 @@ - - DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES) - --CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) -+CFLAGS ?= $(CDEBUGFLAGS) -+CFLAGS += $(MD5INCLUDES) $(DEFINES) $(EXTRA_DEFINES) - - SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \ - config.c local.c http.c client.c server.c auth.c tunnel.c \ ---- config.sample Mon Sep 6 23:31:57 2004 -+++ config.sample Mon Dec 27 15:35:40 2004 -@@ -65,6 +65,11 @@ - - # localDocumentRoot = "" - -+# Access rights for new cache files. -+diskCacheFilePermissions=0640 -+# Access rights for new directories. -+diskCacheDirectoryPermissions=0750 -+ - - ### Domain Name System - ### ****************** ---- forbidden.c Sat Sep 11 00:31:24 2004 -+++ forbidden.c Mon Dec 27 15:35:40 2004 -@@ -158,8 +158,8 @@ - } - - if(forbiddenFile == NULL) { -- if(access("/etc/polipo/forbidden", F_OK) >= 0) -- forbiddenFile = internAtom("/etc/polipo/forbidden"); -+ if(access("/usr/local/etc/polipo/forbidden", F_OK) >= 0) -+ forbiddenFile = internAtom("/usr/local/etc/polipo/forbidden"); - } - - if(have_forbiddenDomains) { ---- main.c Tue Oct 5 23:41:49 2004 -+++ main.c Mon Dec 27 15:35:40 2004 -@@ -106,8 +106,8 @@ - } - - if(configFile == NULL) { -- if(access("/etc/polipo/config", F_OK) >= 0) -- configFile = internAtom("/etc/polipo/config"); -+ if(access("/usr/local/etc/polipo/config", F_OK) >= 0) -+ configFile = internAtom("/usr/local/etc/polipo/config"); - if(configFile && access(configFile->string, F_OK) < 0) { - releaseAtom(configFile); - configFile = NULL; ---- polipo.man Tue Jun 29 02:07:35 2004 -+++ polipo.man Mon Dec 27 15:35:40 2004 -@@ -43,16 +43,16 @@ - Change the value of a configuration variable. - .SH FILES - .TP --.B /etc/polipo/config -+.B /usr/local/etc/polipo/config - The default location of Polipo's configuration file. - .TP --.B /etc/polipo/forbidden -+.B /usr/local/etc/polipo/forbidden - The default location of the list of forbidden URLs. - .TP - .B /var/cache/polipo/ - The default location of the on-disk cache. - .TP --.B /usr/share/polipo/www/ -+.B /usr/local/share/polipo/www/ - The default root of the local web space. - .SH SIGNALS - .TP ---- server.c Thu Jan 20 00:21:19 2005 -+++ server.c Wed Jul 27 13:24:28 2005 -@@ -1783,10 +1783,11 @@ - } else if(code < 400 && - (content_range.from >= 0 || content_range.to >= 0 || - content_range.full_length >= 0)) { -- do_log(L_ERROR, "Range without partial content.\n"); -- httpServerAbort(connection, 1, 502, -- internAtom("Range without partial content")); -- goto fail; -+ do_log(L_WARN, "Range without partial content.\n"); -+ /* Damn anakata. */ -+ content_range.from = -1; -+ content_range.to = -1; -+ content_range.full_length = -1; - } else if(code != 304 && code != 412) { - full_len = len; - } diff -ruN /usr/ports/www/polipo/files/patch-config.sample polipo/files/patch-config.sample --- /usr/ports/www/polipo/files/patch-config.sample Wed Dec 31 21:00:00 1969 +++ polipo/files/patch-config.sample Mon Mar 5 01:31:53 2007 @@ -0,0 +1,14 @@ +--- config.sample.orig Mon Mar 5 01:31:11 2007 ++++ config.sample Mon Mar 5 01:31:40 2007 +@@ -73,6 +73,11 @@ + + # localDocumentRoot = "" + ++# Access rights for new cache files. ++diskCacheFilePermissions=0640 ++# Access rights for new directories. ++diskCacheDirectoryPermissions=0750 ++ + # Uncomment this if you want to enable the pages under /polipo/index? + # and /polipo/servers?. This is a serious privacy leak if your proxy + # is shared. diff -ruN /usr/ports/www/polipo/files/patch-forbidden.c polipo/files/patch-forbidden.c --- /usr/ports/www/polipo/files/patch-forbidden.c Wed Dec 31 21:00:00 1969 +++ polipo/files/patch-forbidden.c Mon Mar 5 02:14:11 2007 @@ -0,0 +1,25 @@ +--- forbidden.c.orig Wed Feb 7 17:11:55 2007 ++++ forbidden.c Mon Mar 5 02:13:50 2007 +@@ -304,8 +304,8 @@ + } + + if(forbiddenFile == NULL) { +- if(access("/etc/polipo/forbidden", F_OK) >= 0) +- forbiddenFile = internAtom("/etc/polipo/forbidden"); ++ if(access("%%PREFIX%%/etc/polipo/forbidden", F_OK) >= 0) ++ forbiddenFile = internAtom("%%PREFIX%%/etc/polipo/forbidden"); + } + + parseDomainFile(forbiddenFile, &forbiddenDomains, &forbiddenRegex); +@@ -325,8 +325,9 @@ + } + + if(uncachableFile == NULL) { +- if(access("/etc/polipo/uncachable", F_OK) >= 0) +- uncachableFile = internAtom("/etc/polipo/uncachable"); ++ if(access("%%PREFIX%%/etc/polipo/uncachable", F_OK) >= 0) ++ uncachableFile = internAtom("%%PREFIX%%/etc/polipo/uncachable"); ++ + } + + parseDomainFile(uncachableFile, &uncachableDomains, &uncachableRegex); diff -ruN /usr/ports/www/polipo/files/patch-polipo.man polipo/files/patch-polipo.man --- /usr/ports/www/polipo/files/patch-polipo.man Wed Dec 31 21:00:00 1969 +++ polipo/files/patch-polipo.man Mon Mar 5 01:38:15 2007 @@ -0,0 +1,22 @@ +--- polipo.man.orig Mon Mar 5 01:36:15 2007 ++++ polipo.man Mon Mar 5 01:37:58 2007 +@@ -43,16 +43,16 @@ + Change the value of a configuration variable. + .SH FILES + .TP +-.B /etc/polipo/config ++.B %%PREFIX%%/etc/polipo/config + The default location of Polipo's configuration file. + .TP +-.B /etc/polipo/forbidden ++.B %%PREFIX%%/etc/polipo/forbidden + The default location of the list of forbidden URLs. + .TP + .B /var/cache/polipo/ + The default location of the on-disk cache. + .TP +-.B /usr/share/polipo/www/ ++.B %%PREFIX%%/share/polipo/www/ + The default root of the local web space. + .SH SIGNALS + .TP diff -ruN /usr/ports/www/polipo/files/polipo.sh.in polipo/files/polipo.sh.in --- /usr/ports/www/polipo/files/polipo.sh.in Mon Feb 20 17:47:49 2006 +++ polipo/files/polipo.sh.in Mon Mar 5 02:53:08 2007 @@ -23,6 +23,33 @@ extra_commands=expire +polipo_check_vars() +{ + if [ "x${polipo_user}" = "xroot" ]; then + warn "You have to set polipo_user to a non-root user for security reasons" + return 1 + fi + + return 0 +} + +start_precmd="polipo_check_vars" +start_cmd="start_cmd" +start_cmd() +{ + if [ "x${polipo_user}" = "x$(whoami)" ]; then + eval "${command} \ + ${command_args} \ + >/dev/null &" + else + su -m ${polipo_user} -c "${command} \ + ${command_args} \ + >/dev/null &" + fi +} + +stop_precmd="polipo_check_vars" + expire_cmd=expire_cmd expire_cmd () { if [ $rc_pid ]; then diff -ruN /usr/ports/www/polipo/pkg-plist polipo/pkg-plist --- /usr/ports/www/polipo/pkg-plist Sun Jan 22 00:58:21 2006 +++ polipo/pkg-plist Mon Mar 5 01:52:25 2007 @@ -1,7 +1,80 @@ bin/polipo +etc/periodic/daily/400.polipo etc/polipo/config.sample etc/polipo/forbidden.sample -etc/periodic/daily/400.polipo +%%PORTDOCS%%%%DATADIR%%/www/doc/Access-control.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Allowed-ports.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Apache.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Asynchronous-writing.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Background.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Browser-configuration.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Cache-transparency.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Caching.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Censor-Accept_002dLanguage.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Censoring-headers.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Chunk-memory.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Client-connections.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Concept-index.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Configuring-Polipo.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Contacting-servers.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Copying.html +%%PORTDOCS%%%%DATADIR%%/www/doc/DNS.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Daemon.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Disk-cache.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Disk-format.html +%%PORTDOCS%%%%DATADIR%%/www/doc/External-redirectors.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Forbidden.html +%%PORTDOCS%%%%DATADIR%%/www/doc/HTTP-parent-proxies.html +%%PORTDOCS%%%%DATADIR%%/www/doc/HTTP-tuning.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Harvest-and-Squid.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Internal-forbidden-list.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Junkbuster.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Latency-and-throughput.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Limiting-chunk-usage.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Limiting-memory-usage.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Limiting-object-usage.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Local-server.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Logging.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Malloc-memory.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Memory-cache.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Memory-usage.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Modifying-the-on_002ddisk-cache.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Network-traffic.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Network.html +%%PORTDOCS%%%%DATADIR%%/www/doc/OS-usage-limits.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Offline-browsing.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Oops.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Other-HTTP-proxies.html +%%PORTDOCS%%%%DATADIR%%/www/doc/PMM.html +%%PORTDOCS%%%%DATADIR%%/www/doc/POST-and-PUT.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Parent-proxies.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Partial-instances.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Persistent-connections.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Pipelining.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Polipo-Invocation.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Poor-Mans-Multiplexing.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Privoxy.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Proxies-and-caches.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Purging.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Running.html +%%PORTDOCS%%%%DATADIR%%/www/doc/SOCKS-parent-proxies.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Server-statistics.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Server_002dside-behaviour.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Stopping.html +%%PORTDOCS%%%%DATADIR%%/www/doc/The-web.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Tuning-POST-and-PUT.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Tuning-the-HTTP-parser.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Tuning-validation.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Tunnelling-connections.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Tweaking-validation.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Variable-index.html +%%PORTDOCS%%%%DATADIR%%/www/doc/WWWOFFLE.html +%%PORTDOCS%%%%DATADIR%%/www/doc/Web-interface.html +%%PORTDOCS%%%%DATADIR%%/www/doc/index.html %%PORTDOCS%%%%DATADIR%%/www/index.html +%%PORTDOCS%%@dirrm %%DATADIR%%/www/doc +%%PORTDOCS%%@dirrm %%DATADIR%%/www +%%PORTDOCS%%@dirrm %%DATADIR%% +@dirrmtry etc/polipo @dirrmtry etc/periodic/daily @dirrmtry etc/periodic --- patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070305064637.34945.qmail>