sorry, I think somehow my email client (gmail) messed up things. here's the new version of the patch. If that happens again, the patch can be fetched at https://github.com/jwendell/openwrt-packages/commit/17e75a10287b66e158a317ce47dcca3103d8db12.patch
From: Jonh Wendell <jonh.wend...@oiwifi.com.br> Date: Thu, 21 Feb 2013 10:50:52 -0300 Subject: [PATCH] packages/tinyproxy: update to 1.8.3 This patch updates tinyproxy to 1.8.3 version, which was released more than 1 year ago. patches/010-no-docs-and-tests.patch, patches/030-allow_bind_in_transparent_mode.patch: updated patches/040-fix_url_filter_in_transparent_mode.patch: removed, applied upstream Signed-off-by: Jonh Wendell <jonh.wend...@oiwifi.com.br> --- net/tinyproxy/Makefile | 8 +- net/tinyproxy/patches/010-no-docs-and-tests.patch | 59 ++++++----- .../030-allow_bind_in_transparent_mode.patch | 4 +- .../040-fix_url_filter_in_transparent_mode.patch | 110 -------------------- 4 files changed, 37 insertions(+), 144 deletions(-) delete mode 100644 net/tinyproxy/patches/040-fix_url_filter_in_transparent_mode.patch diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile index a6b61ce..bea3dba 100644 --- a/net/tinyproxy/Makefile +++ b/net/tinyproxy/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tinyproxy -PKG_VERSION:=1.8.2 -PKG_RELEASE:=5 +PKG_VERSION:=1.8.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/ -PKG_MD5SUM:=edc8502193cfed4974d6a770da173755 +PKG_MD5SUM:=292ac51da8ad6ae883d4ebf56908400d PKG_INSTALL:=1 diff --git a/net/tinyproxy/patches/010-no-docs-and-tests.patch b/net/tinyproxy/patches/010-no-docs-and-tests.patch index 9845c35..8bffd0e 100644 --- a/net/tinyproxy/patches/010-no-docs-and-tests.patch +++ b/net/tinyproxy/patches/010-no-docs-and-tests.patch @@ -1,30 +1,7 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,9 +2,7 @@ SUBDIRS = \ - src \ - data \ - etc \ -- docs \ - m4macros \ -- tests - - # tools want this on a single line - ACLOCAL_AMFLAGS = -I m4macros ---- a/Makefile.in -+++ b/Makefile.in -@@ -222,9 +222,7 @@ SUBDIRS = \ - src \ - data \ - etc \ -- docs \ - m4macros \ -- tests - - - # tools want this on a single line ---- a/configure -+++ b/configure -@@ -6816,59 +6816,8 @@ fi +diff -uNr tinyproxy-1.8.3-orig/configure tinyproxy-1.8.3/configure +--- tinyproxy-1.8.3-orig/configure 2011-08-16 09:27:59.000000000 -0300 ++++ tinyproxy-1.8.3/configure 2012-09-23 09:16:59.216294369 -0300 +@@ -6815,59 +6815,8 @@ @@ -79,8 +56,34 @@ -fi - -if test x"$A2X" = x"no"; then -- as_fn_error "Test for asciidoc failed. See the file 'INSTALL' for help." "$LINENO" 5 +- as_fn_error $? "Test for asciidoc failed. See the file 'INSTALL' for help." "$LINENO" 5 -fi ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/templates/Makefile etc/Makefile docs/Makefile docs/man5/Makefile docs/man5/tinyproxy.conf.txt docs/man8/Makefile docs/man8/tinyproxy.txt m4macros/Makefile tests/Makefile tests/scripts/Makefile" +diff -uNr tinyproxy-1.8.3-orig/Makefile.am tinyproxy-1.8.3/Makefile.am +--- tinyproxy-1.8.3-orig/Makefile.am 2011-08-16 09:14:34.000000000 -0300 ++++ tinyproxy-1.8.3/Makefile.am 2012-09-23 09:14:34.820419951 -0300 +@@ -2,9 +2,7 @@ + src \ + data \ + etc \ +- docs \ + m4macros \ +- tests + + # tools want this on a single line + ACLOCAL_AMFLAGS = -I m4macros +diff -uNr tinyproxy-1.8.3-orig/Makefile.in tinyproxy-1.8.3/Makefile.in +--- tinyproxy-1.8.3-orig/Makefile.in 2011-08-16 09:27:58.000000000 -0300 ++++ tinyproxy-1.8.3/Makefile.in 2012-09-23 09:14:34.820419951 -0300 +@@ -222,9 +222,7 @@ + src \ + data \ + etc \ +- docs \ + m4macros \ +- tests + + + # tools want this on a single line diff --git a/net/tinyproxy/patches/030-allow_bind_in_transparent_mode.patch b/net/tinyproxy/patches/030-allow_bind_in_transparent_mode.patch index 7d6decd..6ee542f 100644 --- a/net/tinyproxy/patches/030-allow_bind_in_transparent_mode.patch +++ b/net/tinyproxy/patches/030-allow_bind_in_transparent_mode.patch @@ -1,6 +1,6 @@ --- a/src/conf.c +++ b/src/conf.c -@@ -857,7 +857,6 @@ static HANDLE_FUNC (handle_deny) +@@ -865,7 +865,6 @@ static HANDLE_FUNC (handle_bind) { @@ -8,7 +8,7 @@ int r = set_string_arg (&conf->bind_address, line, &match[2]); if (r) -@@ -865,11 +864,6 @@ static HANDLE_FUNC (handle_bind) +@@ -873,11 +872,6 @@ log_message (LOG_INFO, "Outgoing connections bound to IP %s", conf->bind_address); return 0; diff --git a/net/tinyproxy/patches/040-fix_url_filter_in_transparent_mode.patch b/net/tinyproxy/patches/040-fix_url_filter_in_transparent_mode.patch deleted file mode 100644 index ab3118b..0000000 --- a/net/tinyproxy/patches/040-fix_url_filter_in_transparent_mode.patch +++ /dev/null @@ -1,110 +0,0 @@ -From e0cf6d4b0c84da6273c127a8c87076aac3b51588 Mon Sep 17 00:00:00 2001 -From: Daniel Egger <daniel.eg...@sphairon.com> -Date: Mon, 16 Aug 2010 22:36:20 +0200 -Subject: [PATCH 3/3] Pass a pointer to a char pointer to do_transparent_proxy so the reassembled URL - will actually end up back in the caller where it is needed for filtering - decisions. This fixes the problem that a tinyproxy configured with the - transparent proxy functionality and "FilterURLs Yes" would filter on everything - but the domain. - -Signed-off-by: daniel.eg...@sphairon.com ---- - src/reqs.c | 2 +- - src/transparent-proxy.c | 20 ++++++++++---------- - src/transparent-proxy.h | 2 +- - 3 files changed, 12 insertions(+), 12 deletions(-) - ---- a/src/reqs.c -+++ b/src/reqs.c -@@ -418,7 +418,7 @@ BAD_REQUEST_ERROR: - } else { - #ifdef TRANSPARENT_PROXY - if (!do_transparent_proxy -- (connptr, hashofheaders, request, &config, url)) { -+ (connptr, hashofheaders, request, &config, &url)) { - goto fail; - } - #else ---- a/src/transparent-proxy.c -+++ b/src/transparent-proxy.c -@@ -55,11 +55,11 @@ static int build_url (char **url, const - int - do_transparent_proxy (struct conn_s *connptr, hashmap_t hashofheaders, - struct request_s *request, struct config_s *conf, -- char *url) -+ char **url) - { - socklen_t length; - char *data; -- size_t ulen = strlen (url); -+ size_t ulen = strlen (*url); - - length = hashmap_entry_by_key (hashofheaders, "host", (void **) &data); - if (length <= 0) { -@@ -73,7 +73,7 @@ do_transparent_proxy (struct conn_s *con - connptr->client_fd); - indicate_http_error (connptr, 400, "Bad Request", - "detail", "Unknown destination", -- "url", url, NULL); -+ "url", *url, NULL); - return 0; - } - -@@ -83,15 +83,15 @@ do_transparent_proxy (struct conn_s *con - request->port = ntohs (dest_addr.sin_port); - - request->path = (char *) safemalloc (ulen + 1); -- strlcpy (request->path, url, ulen + 1); -+ strlcpy (request->path, *url, ulen + 1); - - /* url overwritten by the call below is the url passed - * to this function, and is not the url variable in the - * caller. */ -- build_url (&url, request->host, request->port, request->path); -+ build_url (url, request->host, request->port, request->path); - log_message (LOG_INFO, - "process_request: trans IP %s %s for %d", -- request->method, url, connptr->client_fd); -+ request->method, *url, connptr->client_fd); - } else { - request->host = (char *) safemalloc (length + 1); - if (sscanf (data, "%[^:]:%hu", request->host, &request->port) != -@@ -101,15 +101,15 @@ do_transparent_proxy (struct conn_s *con - } - - request->path = (char *) safemalloc (ulen + 1); -- strlcpy (request->path, url, ulen + 1); -+ strlcpy (request->path, *url, ulen + 1); - - /* url overwritten by the call below is the url passed - * to this function, and is not the url variable in the - * caller. */ -- build_url (&url, request->host, request->port, request->path); -+ build_url (url, request->host, request->port, request->path); - log_message (LOG_INFO, - "process_request: trans Host %s %s for %d", -- request->method, url, connptr->client_fd); -+ request->method, *url, connptr->client_fd); - } - if (conf->ipAddr && strcmp (request->host, conf->ipAddr) == 0) { - log_message (LOG_ERR, -@@ -118,7 +118,7 @@ do_transparent_proxy (struct conn_s *con - indicate_http_error (connptr, 400, "Bad Request", - "detail", - "You tried to connect to the machine " -- "the proxy is running on", "url", url, -+ "the proxy is running on", "url", *url, - NULL); - return 0; - } ---- a/src/transparent-proxy.h -+++ b/src/transparent-proxy.h -@@ -32,7 +32,7 @@ - extern int do_transparent_proxy (struct conn_s *connptr, - hashmap_t hashofheaders, - struct request_s *request, -- struct config_s *config, char *url); -+ struct config_s *config, char **url); - - #endif - -- 1.7.10.4 2013/2/21 Jonas Gorski <j...@openwrt.org> > On 23 September 2012 15:40, Jonh Wendell <jonh.wend...@gmail.com> wrote: > > From df3bded847f74d511dd3cf9f30bc92358a4d2694 Mon Sep 17 00:00:00 2001 > > From: Jonh Wendell <jonh.wend...@gmail.com> > > Date: Sun, 23 Sep 2012 10:29:12 -0300 > > Subject: [PATCH] [packages] tinyproxy: update to 1.8.3 > > > > This patch updates tinyproxy to 1.8.3 version, which was released > > more than 1 year ago. > > > > patches/010-no-docs-and-tests.patch, > > patches/030-allow_bind_in_transparent_mode.patch: updated > > patches/040-fix_url_filter_in_transparent_mode.patch: removed, applied > > upstream > > > > Closes ticket #11786. > > > > Signed-off-by: Jonh Wendell <jonh.wend...@gmail.com> > > This patch does not apply for me because of line breaks like ... > > --- > > net/tinyproxy/Makefile | 8 +- > > net/tinyproxy/patches/010-no-docs-and-tests.patch | 59 +++++------ > > .../030-allow_bind_in_transparent_mode.patch | 4 +- > > .../040-fix_url_filter_in_transparent_mode.patch | 110 > > --------------------- > > 4 files changed, 37 insertions(+), 144 deletions(-) > > delete mode 100644 > > net/tinyproxy/patches/040-fix_url_filter_in_transparent_mode.patch > > > > diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile > > index a6b61ce..da219ea 100644 > > --- a/net/tinyproxy/Makefile > > +++ b/net/tinyproxy/Makefile > > @@ -1,5 +1,5 @@ > > # > > -# Copyright (C) 2006-2011 OpenWrt.org > > +# Copyright (C) 2006-2012 OpenWrt.org > > # > > # This is free software, licensed under the GNU General Public License > v2. > > # See /LICENSE for more information. > > @@ -8,12 +8,12 @@ > > include $(TOPDIR)/rules.mk > > > > PKG_NAME:=tinyproxy > > -PKG_VERSION:=1.8.2 > > -PKG_RELEASE:=5 > > +PKG_VERSION:=1.8.3 > > +PKG_RELEASE:=1 > > > > PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 > > PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/ > > -PKG_MD5SUM:=edc8502193cfed4974d6a770da173755 > > +PKG_MD5SUM:=292ac51da8ad6ae883d4ebf56908400d > > > > PKG_INSTALL:=1 > > > > diff --git a/net/tinyproxy/patches/010-no-docs-and-tests.patch > > b/net/tinyproxy/patches/010-no-docs-and-tests.patch > > ... here (and later). > > Please fix and resend. > > Jonas > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel > -- Jonh Wendell http://www.bani.com.br
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
