From 639b109b4d57cb7332ee298e6133cc505ed5a35d Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 19 Apr 2010 05:44:20 +0000
Subject: [PATCH] tinyproxy: update to 1.8.1

SVN-Revision: 21018
---
 net/tinyproxy/Makefile                        | 21 ++++++++-----------
 .../patches/010-no-docs-and-tests.patch       |  8 +------
 net/tinyproxy/patches/120-fix_INET6.patch     |  4 ++--
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile
index 7d69c5a6b..50a23ab27 100644
--- a/net/tinyproxy/Makefile
+++ b/net/tinyproxy/Makefile
@@ -8,22 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tinyproxy
-PKG_VERSION:=1.8.0
+PKG_VERSION:=1.8.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/
-PKG_MD5SUM:=09843d47828261394d0a30af0b058997
+PKG_MD5SUM:=e1f0977592f020ef509262c24c3284fb
 
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tinyproxy
+  SUBMENU:=Proxy Servers
   SECTION:=net
   CATEGORY:=Network
-  SUBMENU:=Proxy Servers
-  TITLE:=Tinyproxy is a lightweight HTTP and HTTPS proxy.
+  TITLE:=Tinyproxy is a lightweight HTTP and HTTPS proxy
   URL:=http://tinyproxy.sourceforge.net/
 endef
 
@@ -31,17 +31,14 @@ define Package/tinyproxy/conffiles
 /etc/config/tinyproxy
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-filter \
-		--enable-transparent \
-		--enable-regexcheck=no \
-	)
-endef
+CONFIGURE_ARGS+= \
+	--enable-filter \
+	--enable-transparent \
+	--disable-regexcheck \
 
 define Package/tinyproxy/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(1)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/share/tinyproxy
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/tinyproxy/*.html $(1)/usr/share/tinyproxy/
 	$(INSTALL_DIR) $(1)/etc/config
diff --git a/net/tinyproxy/patches/010-no-docs-and-tests.patch b/net/tinyproxy/patches/010-no-docs-and-tests.patch
index c1a003442..b008971a4 100644
--- a/net/tinyproxy/patches/010-no-docs-and-tests.patch
+++ b/net/tinyproxy/patches/010-no-docs-and-tests.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.am b/Makefile.am
-index 7de41f2..9d1f99b 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -2,9 +2,7 @@ SUBDIRS = \
@@ -12,8 +10,6 @@ index 7de41f2..9d1f99b 100644
  
  # tools want this on a single line
  ACLOCAL_AMFLAGS = -I m4macros
-diff --git a/Makefile.in b/Makefile.in
-index d0ec918..5be49d4 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -221,9 +221,7 @@ SUBDIRS = \
@@ -26,11 +22,9 @@ index d0ec918..5be49d4 100644
  
  
  # tools want this on a single line
-diff --git a/configure b/configure
-index 01d6883..facfadd 100755
 --- a/configure
 +++ b/configure
-@@ -9012,67 +9012,8 @@ $as_echo "$as_me: error: Your system's regexec() function is broken." >&2;}
+@@ -9012,67 +9012,8 @@ $as_echo "$as_me: error: Your system's r
  fi
  
  
diff --git a/net/tinyproxy/patches/120-fix_INET6.patch b/net/tinyproxy/patches/120-fix_INET6.patch
index 0853cfeae..1c2683551 100644
--- a/net/tinyproxy/patches/120-fix_INET6.patch
+++ b/net/tinyproxy/patches/120-fix_INET6.patch
@@ -10,7 +10,7 @@
  {
          struct addrinfo hints, *res, *ressave;
  
-@@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *addr, int family)
+@@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *add
          assert (addr != NULL && strlen (addr) != 0);
  
          memset (&hints, 0, sizeof (struct addrinfo));
@@ -19,7 +19,7 @@
          hints.ai_socktype = SOCK_STREAM;
  
          /* The local port it not important */
-@@ -106,14 +105,12 @@ int opensock (const char *host, int port, const char *bind_to)
+@@ -106,14 +105,12 @@ int opensock (const char *host, int port
  
                  /* Bind to the specified address */
                  if (bind_to) {
-- 
2.30.2