On Mon, Aug 11, 2014 at 12:45:21AM +0200, Matthias Kilian wrote:
> ps: polipo-1.0.4.1 is outdated, i'll test polipo-1.1.1 a little bit
> and send a diff to ports@ if everything works well.
So here's an update. Running with it now, and it works so far (on
amd64), i.e. no regressions in *my* case.
Tests and feedback welcome. (And sorry for the delay)
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/polipo/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 11 Oct 2013 23:51:45 -0000 1.18
+++ Makefile 17 Aug 2014 18:20:41 -0000
@@ -2,15 +2,14 @@
COMMENT= HTTP caching proxy
-DISTNAME= polipo-1.0.4.1
+DISTNAME= polipo-1.1.1
CATEGORIES= www
-REVISION= 6
-HOMEPAGE= http://www.pps.jussieu.fr/~jch/software/polipo/
+HOMEPAGE= http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/
MAINTAINER= Matthias Kilian <k...@openbsd.org>
-MASTER_SITES= http://freehaven.net/~chrisd/polipo/
+MASTER_SITES= http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/
# MIT
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/polipo/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 20 Mar 2010 21:32:23 -0000 1.5
+++ distinfo 17 Aug 2014 18:20:41 -0000
@@ -1,5 +1,2 @@
-MD5 (polipo-1.0.4.1.tar.gz) = v8XIUolRllgoDgk6Jw1nAw==
-RMD160 (polipo-1.0.4.1.tar.gz) = lCLOziNNsbgil54y6XZDmi1XV7Y=
-SHA1 (polipo-1.0.4.1.tar.gz) = 51W1ham7orWZprzHxvcDXTyye+w=
-SHA256 (polipo-1.0.4.1.tar.gz) = jW+/3sYA1Cgj5IOwFDcExvF5w0mAMCik0s7wVreffPo=
-SIZE (polipo-1.0.4.1.tar.gz) = 180121
+SHA256 (polipo-1.1.1.tar.gz) = oll1B5OrecSR0F/O5akX+vfZAw+10V4Fs3BOnJ5O4BU=
+SIZE (polipo-1.1.1.tar.gz) = 182891
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/polipo/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 3 Feb 2008 15:06:48 -0000 1.2
+++ patches/patch-Makefile 17 Aug 2014 18:20:41 -0000
@@ -1,5 +1,5 @@
---- Makefile.orig Sat Oct 6 15:43:15 2007
-+++ Makefile Fri Nov 16 23:48:55 2007
+--- Makefile.orig Thu May 15 00:19:43 2014
++++ Makefile Sun Aug 17 20:09:15 2014
@@ -1,9 +1,8 @@
-PREFIX = /usr/local
BINDIR = $(PREFIX)/bin
@@ -12,15 +12,15 @@
# To compile with Unix CC:
-@@ -13,7 +12,6 @@ DISK_CACHE_ROOT = /var/cache/polipo
+@@ -12,7 +11,6 @@ DISK_CACHE_ROOT = /var/cache/polipo
+ # To compile with GCC:
# CC = gcc
- # CDEBUGFLAGS = -Os -g -Wall -std=gnu99
--CDEBUGFLAGS = -Os -g -Wall
- # CDEBUGFLAGS = -Os -Wall
- # CDEBUGFLAGS = -g -Wall
+-CDEBUGFLAGS = -Os -g -Wall -fno-strict-aliasing
-@@ -63,7 +61,7 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \
+ # To compile on a pure POSIX system:
+
+@@ -60,7 +58,7 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \
DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
@@ -29,7 +29,7 @@
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 \
-@@ -89,20 +87,19 @@ all: polipo$(EXE) polipo.info html/index.html localind
+@@ -86,20 +84,19 @@ all: polipo$(EXE) polipo.info html/index.html localind
install: install.binary install.man
install.binary: all
Index: patches/patch-forbidden_c
===================================================================
RCS file: /cvs/ports/www/polipo/patches/patch-forbidden_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-forbidden_c
--- patches/patch-forbidden_c 24 Mar 2009 16:49:08 -0000 1.1
+++ patches/patch-forbidden_c 17 Aug 2014 18:20:41 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-forbidden_c,v 1.1 2009/03/24 16:49:08 naddy Exp $
---- forbidden.c.orig Tue Mar 24 09:43:44 2009
-+++ forbidden.c Tue Mar 24 09:44:02 2009
-@@ -190,6 +190,7 @@ parseDomainFile(AtomPtr file,
+--- forbidden.c.orig Thu May 15 00:19:43 2014
++++ forbidden.c Sun Aug 17 20:08:12 2014
+@@ -199,6 +199,7 @@ parseDomainFile(AtomPtr file,
DomainPtr **domains_return, regex_t **regex_return)
{
struct stat ss;
@@ -9,7 +9,7 @@ $OpenBSD: patch-forbidden_c,v 1.1 2009/0
int rc;
if(*domains_return) {
-@@ -263,8 +264,6 @@ parseDomainFile(AtomPtr file,
+@@ -272,8 +273,6 @@ parseDomainFile(AtomPtr file,
free(domains);
domains = NULL;
}
Index: patches/patch-log_c
===================================================================
RCS file: patches/patch-log_c
diff -N patches/patch-log_c
--- patches/patch-log_c 20 Mar 2010 21:32:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,49 +0,0 @@
-$OpenBSD: patch-log_c,v 1.1 2010/03/20 21:32:23 kili Exp $
-
-From upstream darcs repository.
-
---- log.c.orig Tue Jan 8 13:56:45 2008
-+++ log.c Wed Dec 2 18:33:40 2009
-@@ -279,11 +279,14 @@ static void
- accumulateSyslogV(int type, const char *f, va_list args)
- {
- int rc;
-+ va_list args_copy;
-
- again:
-+ va_copy(args_copy, args);
- rc = vsnprintf(syslogBuf + syslogBufLength,
- syslogBufSize - syslogBufLength,
-- f, args);
-+ f, args_copy);
-+ va_end(args_copy);
-
- if(rc < 0 || rc >= syslogBufSize - syslogBufLength) {
- rc = expandSyslog(rc);
-@@ -372,7 +375,12 @@ really_do_log_v(int type, const char *f, va_list args)
- {
- if(type & LOGGING_MAX & logLevel) {
- if(logF)
-- vfprintf(logF, f, args);
-+ {
-+ va_list args_copy;
-+ va_copy(args_copy, args);
-+ vfprintf(logF, f, args_copy);
-+ va_end(args_copy);
-+ }
- #ifdef HAVE_SYSLOG
- if(logSyslog)
- accumulateSyslogV(type, f, args);
-@@ -399,8 +407,11 @@ really_do_log_error_v(int type, int e, const char *f,
- es = "Unknown error";
-
- if(logF) {
-- vfprintf(logF, f, args);
-+ va_list args_copy;
-+ va_copy(args_copy, args);
-+ vfprintf(logF, f, args_copy);
- fprintf(logF, ": %s\n", es);
-+ va_end(args_copy);
- }
- #ifdef HAVE_SYSLOG
- if(logSyslog) {
Index: patches/patch-polipo_h
===================================================================
RCS file: /cvs/ports/www/polipo/patches/patch-polipo_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-polipo_h
--- patches/patch-polipo_h 20 Mar 2010 21:32:23 -0000 1.3
+++ patches/patch-polipo_h 17 Aug 2014 18:20:41 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-polipo_h,v 1.3 2010/03/20 21:32:23 kili Exp $
---- polipo.h.orig Tue Jan 8 13:56:45 2008
-+++ polipo.h Tue Sep 9 10:58:23 2008
-@@ -62,6 +62,9 @@ THE SOFTWARE.
+--- polipo.h.orig Thu May 15 00:19:43 2014
++++ polipo.h Sun Aug 17 20:08:12 2014
+@@ -68,6 +68,9 @@ THE SOFTWARE.
#define MAP_ANONYMOUS MAP_ANON
#endif
@@ -11,7 +11,7 @@ $OpenBSD: patch-polipo_h,v 1.3 2010/03/2
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* nothing */
#elif defined(__GNUC__)
-@@ -152,7 +155,9 @@ THE SOFTWARE.
+@@ -161,7 +164,9 @@ THE SOFTWARE.
#ifdef __OpenBSD__
#if OpenBSD >= 200311
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/polipo/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 11 Nov 2010 20:19:52 -0000 1.4
+++ pkg/PLIST 17 Aug 2014 18:20:41 -0000
@@ -8,7 +8,6 @@ share/doc/polipo/
share/doc/polipo/doc/
share/doc/polipo/doc/Access-control.html
share/doc/polipo/doc/Allowed-ports.html
-share/doc/polipo/doc/Apache.html
share/doc/polipo/doc/Asynchronous-writing.html
share/doc/polipo/doc/Background.html
share/doc/polipo/doc/Browser-configuration.html
@@ -27,12 +26,12 @@ share/doc/polipo/doc/Daemon.html
share/doc/polipo/doc/Disk-cache.html
share/doc/polipo/doc/Disk-format.html
share/doc/polipo/doc/External-redirectors.html
+share/doc/polipo/doc/Forbidden-Tunnels.html
share/doc/polipo/doc/Forbidden.html
share/doc/polipo/doc/HTTP-parent-proxies.html
share/doc/polipo/doc/HTTP-tuning.html
-share/doc/polipo/doc/Harvest-and-Squid.html
+share/doc/polipo/doc/Intermediate-proxies.html
share/doc/polipo/doc/Internal-forbidden-list.html
-share/doc/polipo/doc/Junkbuster.html
share/doc/polipo/doc/Latency-and-throughput.html
share/doc/polipo/doc/Limiting-chunk-usage.html
share/doc/polipo/doc/Limiting-memory-usage.html
@@ -47,8 +46,6 @@ share/doc/polipo/doc/Network-traffic.htm
share/doc/polipo/doc/Network.html
share/doc/polipo/doc/OS-usage-limits.html
share/doc/polipo/doc/Offline-browsing.html
-share/doc/polipo/doc/Oops.html
-share/doc/polipo/doc/Other-HTTP-proxies.html
share/doc/polipo/doc/PMM.html
share/doc/polipo/doc/POST-and-PUT.html
share/doc/polipo/doc/Parent-proxies.html
@@ -57,7 +54,6 @@ share/doc/polipo/doc/Persistent-connecti
share/doc/polipo/doc/Pipelining.html
share/doc/polipo/doc/Polipo-Invocation.html
share/doc/polipo/doc/Poor-Mans-Multiplexing.html
-share/doc/polipo/doc/Privoxy.html
share/doc/polipo/doc/Proxies-and-caches.html
share/doc/polipo/doc/Purging.html
share/doc/polipo/doc/Running.html
@@ -72,7 +68,6 @@ share/doc/polipo/doc/Tuning-validation.h
share/doc/polipo/doc/Tunnelling-connections.html
share/doc/polipo/doc/Tweaking-validation.html
share/doc/polipo/doc/Variable-index.html
-share/doc/polipo/doc/WWWOFFLE.html
share/doc/polipo/doc/Web-interface.html
share/doc/polipo/doc/index.html
share/doc/polipo/index.html
