diff options
author | Daniel Harris <dannyboy@FreeBSD.org> | 2002-05-17 19:37:56 +0000 |
---|---|---|
committer | Daniel Harris <dannyboy@FreeBSD.org> | 2002-05-17 19:37:56 +0000 |
commit | 6be3f6fb40da62de57450eb57d161cf5d2853e8e (patch) | |
tree | c8f0d1d09dd9628fc57c69ffee4eaa3be9c18db2 /www/tinyproxy | |
parent | - switch to more stable version. (diff) |
Update to 1.5.0.
PR: 38171
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=59347
Diffstat (limited to 'www/tinyproxy')
-rw-r--r-- | www/tinyproxy/Makefile | 8 | ||||
-rw-r--r-- | www/tinyproxy/distinfo | 2 | ||||
-rw-r--r-- | www/tinyproxy/files/patch-aa | 23 | ||||
-rw-r--r-- | www/tinyproxy/files/patch-ab | 33 | ||||
-rw-r--r-- | www/tinyproxy/files/patch-ac | 19 | ||||
-rw-r--r-- | www/tinyproxy/pkg-plist | 2 |
6 files changed, 46 insertions, 41 deletions
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile index 71e4908e186f..30730670ff7c 100644 --- a/www/tinyproxy/Makefile +++ b/www/tinyproxy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= tinyproxy -PORTVERSION= 1.4.3 +PORTVERSION= 1.5.0 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MAINTAINER= mitsuru@riken.go.jp GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --with-config=${PREFIX}/etc/tinyproxy/tinyproxy.conf +CONFIGURE_ARGS= --bindir=${PREFIX}/sbin --with-config=${PREFIX}/etc/tinyproxy/tinyproxy.conf --program-transform-name="" MAN8= tinyproxy.8 @@ -25,8 +25,4 @@ post-patch: ${SED} -e s:/etc/tinyproxy/tinyproxy.conf:${PREFIX}/etc/tinyproxy/tinyproxy.conf: \ < $$f.orig > $$f -post-install: - ${MKDIR} ${PREFIX}/etc/tinyproxy - ${INSTALL_DATA} ${WRKSRC}/doc/tinyproxy.conf ${PREFIX}/etc/tinyproxy/tinyproxy.conf.sample - .include <bsd.port.mk> diff --git a/www/tinyproxy/distinfo b/www/tinyproxy/distinfo index f516fbdac72f..08f584e95b7f 100644 --- a/www/tinyproxy/distinfo +++ b/www/tinyproxy/distinfo @@ -1 +1 @@ -MD5 (tinyproxy-1.4.3.tar.gz) = d8b35d99e739023e8442ece2e3546398 +MD5 (tinyproxy-1.5.0.tar.gz) = 2236b57f183b168dcfaaffbda43b4051 diff --git a/www/tinyproxy/files/patch-aa b/www/tinyproxy/files/patch-aa index 225c927521d1..c0fd5d69c9b6 100644 --- a/www/tinyproxy/files/patch-aa +++ b/www/tinyproxy/files/patch-aa @@ -1,11 +1,12 @@ ---- src/sock.c.dist Tue Nov 13 06:10:29 2001 -+++ src/sock.c Thu Feb 7 18:33:24 2002 -@@ -259,7 +259,7 @@ - - for (n = 1; n < maxlen; n++) { - again: -- if ((rc = recv(fd, &c, 1, MSG_NOSIGNAL)) == 1) { -+ if ((rc = recv(fd, &c, 1, 0)) == 1) { - *ptr++ = c; - if (c == '\n') - break; +--- Makefile.in.dist Thu May 16 12:23:51 2002 ++++ Makefile.in Thu May 16 12:24:07 2002 +@@ -363,9 +363,6 @@ + $(mkinstalldirs) $(DESTDIR)@TINYPROXY_CONFIG_DIR@ + $(INSTALL) -m 600 $(srcdir)/doc/tinyproxy.conf \ + $(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@-dist +- test ! -f $(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@ \ +- && $(INSTALL) -m 600 $(srcdir)/doc/tinyproxy.conf \ +- $(DESTDIR)@TINYPROXY_CONFIG_DIR@/@TINYPROXY_CONFIG_FILE@ + @echo "" + @echo "A configuration file has been copied to:" + @echo "" diff --git a/www/tinyproxy/files/patch-ab b/www/tinyproxy/files/patch-ab index 98be5cf05ee4..cec1a7178e78 100644 --- a/www/tinyproxy/files/patch-ab +++ b/www/tinyproxy/files/patch-ab @@ -1,22 +1,11 @@ ---- src/tinyproxy.h.dist Fri Oct 26 02:27:17 2001 -+++ src/tinyproxy.h Thu Feb 7 18:34:32 2002 -@@ -27,9 +27,6 @@ - * Include standard headers which are used through-out tinyproxy - */ - #include <sys/types.h> --#ifdef HAVE_SYS_RESOURCE_H --# include <sys/resource.h> --#endif - #ifdef HAVE_SYS_SELECT_H - # include <sys/select.h> - #endif -@@ -44,6 +41,9 @@ - # else - # include <time.h> - # endif -+#endif -+#ifdef HAVE_SYS_RESOURCE_H -+# include <sys/resource.h> - #endif - #include <sys/uio.h> - #include <netinet/in.h> +--- src/reqs.c.dist Fri May 17 15:37:16 2002 ++++ src/reqs.c Fri May 17 15:38:04 2002 +@@ -783,7 +783,7 @@ + &data, + (void**)&header); + +- if (!is_anonymous_enabled() || anonymous_search(data) <= 0) { ++ if (!is_anonymous_enabled() || anonymous_search(data) > 0) { + ret = write_message(connptr->server_fd, + "%s: %s\r\n", + data, header); diff --git a/www/tinyproxy/files/patch-ac b/www/tinyproxy/files/patch-ac new file mode 100644 index 000000000000..de2150c0c3de --- /dev/null +++ b/www/tinyproxy/files/patch-ac @@ -0,0 +1,19 @@ +--- doc/tinyproxy.8.dist Fri May 17 15:47:17 2002 ++++ doc/tinyproxy.8 Fri May 17 15:47:25 2002 +@@ -1,6 +1,6 @@ + .\" -*- nroff -*- + .\" +-.\" tinyproxy.1 ++.\" tinyproxy.8 + .\" + .\" Copyright (c) 1998-2000 Steven Young and Robert James Kaes. + .\" Copyright (c) 2001 Robert James Kaes +@@ -8,7 +8,7 @@ + .\" This program is distributed under the terms of the GNU General Public + .\" License. See COPYING for additional information. + .\" +-.TH tinyproxy 1 .\" "tinyproxy Manual" "August 25, 2001" ++.TH tinyproxy 8 .\" "tinyproxy Manual" "August 25, 2001" + .SH NAME + tinyproxy - A small HTTP proxy server + .SH SYNTAX diff --git a/www/tinyproxy/pkg-plist b/www/tinyproxy/pkg-plist index 4a8d4114fe72..ebea748a9e5c 100644 --- a/www/tinyproxy/pkg-plist +++ b/www/tinyproxy/pkg-plist @@ -1,3 +1,3 @@ sbin/tinyproxy -etc/tinyproxy/tinyproxy.conf.sample +etc/tinyproxy/tinyproxy.conf-dist @dirrm etc/tinyproxy |