PATCH: www/polipo master site

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

PATCH: www/polipo master site

Jim Razmus
I lied, I'm going to sleep after this one.

Easy fix to master site.

Jim

polipo.patch (506 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: PATCH: www/polipo master site

Matthias Kilian
On Sun, May 27, 2007 at 01:25:11AM -0400, Jim Razmus wrote:
> Easy fix to master site.

Or just update it to 1.0.0?


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/polipo/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 17 Jul 2006 19:57:26 -0000 1.3
+++ Makefile 27 May 2007 06:22:18 -0000
@@ -2,7 +2,7 @@
 
 COMMENT= "HTTP caching proxy"
 
-DISTNAME= polipo-0.9.9
+DISTNAME= polipo-1.0.0
 PKGNAME= ${DISTNAME}p0
 CATEGORIES= www
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/polipo/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 5 Apr 2007 17:26:25 -0000 1.3
+++ distinfo 27 May 2007 06:22:18 -0000
@@ -1,5 +1,5 @@
-MD5 (polipo-0.9.9.tar.gz) = 1Y08Ejo0cqa1u1sLtGnP0g==
-RMD160 (polipo-0.9.9.tar.gz) = 7bKCAy8odRVCBWaEBaYypHXioas=
-SHA1 (polipo-0.9.9.tar.gz) = DMcseDqGXlsbtu9bUU5683JNdAo=
-SHA256 (polipo-0.9.9.tar.gz) = UGAxWZvzAGll2daO8VxLi1dqq773AyObwMNOcMisXfY=
-SIZE (polipo-0.9.9.tar.gz) = 148476
+MD5 (polipo-1.0.0.tar.gz) = 6dsfrbzke4ZkNR0UUQvVyQ==
+RMD160 (polipo-1.0.0.tar.gz) = wFT0evyAeFeUWCQxWXbb5UMEpuo=
+SHA1 (polipo-1.0.0.tar.gz) = xpEO8gfv8cF2WvC3byjS+zoBF0I=
+SHA256 (polipo-1.0.0.tar.gz) = CgDXAJ/UxQHaqRbDVANvPL1VM8Jcew785rcXb7SugLo=
+SIZE (polipo-1.0.0.tar.gz) = 176618
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/www/polipo/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 6 Aug 2005 21:21:53 -0000 1.1.1.1
+++ patches/patch-Makefile 27 May 2007 06:22:18 -0000
@@ -1,26 +1,26 @@
---- Makefile.orig Mon Jun 28 23:30:07 2004
-+++ Makefile Fri Aug  5 22:45:35 2005
-@@ -1,15 +1,15 @@
+--- Makefile.orig Tue Mar  6 20:29:05 2007
++++ Makefile Sun May 27 08:16:17 2007
+@@ -1,9 +1,8 @@
 -PREFIX = /usr/local
  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
 +LOCAL_ROOT = ${PREFIX}/share/doc/polipo
 +DISK_CACHE_ROOT = /var/polipo/cache
 
- # CDEBUGFLAGS = -O
+ # To compile with Unix CC:
+
+@@ -13,7 +12,6 @@ DISK_CACHE_ROOT = /var/cache/polipo
 
  # CC = gcc
- # CDEBUGFLAGS = -O -g -Wall -std=gnu99
--CDEBUGFLAGS = -O -g -Wall
-+# CDEBUGFLAGS = -O -g -Wall
+ # CDEBUGFLAGS = -Os -g -Wall -std=gnu99
+-CDEBUGFLAGS = -Os -g -Wall
  # CDEBUGFLAGS = -Os -Wall
  # CDEBUGFLAGS = -g -Wall
 
-@@ -47,7 +47,7 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_RO
+@@ -62,7 +60,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 \
-@@ -71,21 +71,17 @@ all: polipo polipo.info html/index.html
+@@ -88,21 +86,17 @@ all: polipo$(EXE) polipo.info html/index.html localind
  install: install.binary install.man
 
  install.binary: all
Index: patches/patch-main_c
===================================================================
RCS file: /cvs/ports/www/polipo/patches/patch-main_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-main_c
--- patches/patch-main_c 6 Aug 2005 21:21:53 -0000 1.1.1.1
+++ patches/patch-main_c 27 May 2007 06:22:18 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-main_c,v 1.1.1.1 2005/08/06 21:21:53 aanriot Exp $
---- main.c.orig Tue Oct  5 20:46:02 2004
-+++ main.c Sun Jan  2 12:14:22 2005
-@@ -125,6 +125,24 @@ main(int argc, char **argv)
+--- main.c.orig Tue Mar  6 20:29:05 2007
++++ main.c Sun May 27 07:45:45 2007
+@@ -126,6 +126,24 @@ main(int argc, char **argv)
          i++;
      }
 
Index: patches/patch-polipo_h
===================================================================
RCS file: /cvs/ports/www/polipo/patches/patch-polipo_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-polipo_h
--- patches/patch-polipo_h 6 Aug 2005 21:21:53 -0000 1.1.1.1
+++ patches/patch-polipo_h 27 May 2007 06:22:18 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-polipo_h,v 1.1.1.1 2005/08/06 21:21:53 aanriot Exp $
---- polipo.h.orig Mon Jun 28 23:30:07 2004
-+++ polipo.h Sun Jan  2 12:00:55 2005
-@@ -58,6 +58,9 @@ THE SOFTWARE.
+--- polipo.h.orig Tue Mar  6 20:29:05 2007
++++ polipo.h Sun May 27 07:45:45 2007
+@@ -62,6 +62,9 @@ THE SOFTWARE.
  #define MAP_ANONYMOUS MAP_ANON
  #endif
 
Index: patches/patch-polipo_texi
===================================================================
RCS file: patches/patch-polipo_texi
diff -N patches/patch-polipo_texi
--- patches/patch-polipo_texi 24 Sep 2005 17:58:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-polipo_texi,v 1.1 2005/09/24 17:58:23 bernd Exp $
---- polipo.texi.orig Fri Sep 23 20:19:08 2005
-+++ polipo.texi Sat Sep 24 19:00:33 2005
-@@ -1245,7 +1245,7 @@ from the server.  If the latter arrives,
- the rest of the POST request@footnote{This, of course, is only part of
- the story.  Additionally, the server is not required to reply with
- @samp{100 Continue}, hence the client must implement a timeout.
--Furthermore, according to the obsolete RFC@tie{}2068, the server is
-+Furthermore, according to the obsolete RFC@w{}2068, the server is
- allowed to spontaneously send @samp{100 Continue}, so the client must
- be prepared to ignore such a reply at any time.}.
-
-@@ -1353,7 +1353,7 @@ or because it was revalidated.
- If @code{cacheIsShared} is false (the default), Polipo will ignore the
- server-side @samp{Cache-Control} directives @samp{s-maxage} and
- @samp{proxy-must-revalidate}.  This is highly desirable behaviour, but
--happens to violate RFC@tie{}2616 if the cache is shared among multiple
-+happens to violate RFC@w{}2616 if the cache is shared among multiple
- users.
-
- If @code{mindlesslyCacheVary} is true, the presence of a Vary header
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/polipo/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 17 Jul 2006 19:57:26 -0000 1.2
+++ pkg/PLIST 27 May 2007 06:22:18 -0000
@@ -26,8 +26,12 @@ share/doc/polipo/doc/DNS.html
 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.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/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
@@ -38,6 +42,7 @@ share/doc/polipo/doc/Logging.html
 share/doc/polipo/doc/Malloc-memory.html
 share/doc/polipo/doc/Memory-cache.html
 share/doc/polipo/doc/Memory-usage.html
+share/doc/polipo/doc/Modifying-the-on_002ddisk-cache.html
 share/doc/polipo/doc/Network-traffic.html
 share/doc/polipo/doc/Network.html
 share/doc/polipo/doc/OS-usage-limits.html
@@ -56,12 +61,16 @@ 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
+share/doc/polipo/doc/SOCKS-parent-proxies.html
 share/doc/polipo/doc/Server-statistics.html
+share/doc/polipo/doc/Server_002dside-behaviour.html
 share/doc/polipo/doc/Stopping.html
 share/doc/polipo/doc/The-web.html
 share/doc/polipo/doc/Tuning-POST-and-PUT.html
 share/doc/polipo/doc/Tuning-the-HTTP-parser.html
+share/doc/polipo/doc/Tuning-validation.html
 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