From dc630f978a2524c0cd13f39c76f1e2d8f84d4baa Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 15 Nov 2009 21:05:58 +0100
Subject: update squid, openssl and tinyproxy to latest upstream version

---
 package/tinyproxy/Makefile                   |  6 +++---
 package/tinyproxy/patches/patch-configure    | 24 ++++++++++++++++++++++++
 package/tinyproxy/patches/patch-configure_ac | 22 ----------------------
 3 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 package/tinyproxy/patches/patch-configure
 delete mode 100644 package/tinyproxy/patches/patch-configure_ac

(limited to 'package/tinyproxy')

diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile
index 1819505e1..b359bbb75 100644
--- a/package/tinyproxy/Makefile
+++ b/package/tinyproxy/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tinyproxy
-PKG_VERSION:=		1.6.4
+PKG_VERSION:=		1.6.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3157b9159a8d005f4248cf4d4d6c65e2
+PKG_MD5SUM:=		2b2862ba33d2939e4572688d442ba415
 PKG_DESCR:=		Tinyproxy is a lightweight HTTP and HTTPS proxy.
 PKG_SECTION:=		net
 PKG_URL:=		https://www.banu.com/tinyproxy
@@ -16,7 +16,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TINYPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autoconf gnu
+CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 CONFIGURE_ENV+=		ac_cv_header_libintl_h=no \
diff --git a/package/tinyproxy/patches/patch-configure b/package/tinyproxy/patches/patch-configure
new file mode 100644
index 000000000..d332d18ae
--- /dev/null
+++ b/package/tinyproxy/patches/patch-configure
@@ -0,0 +1,24 @@
+--- tinyproxy-1.6.5.orig/configure	2009-09-29 05:28:04.000000000 +0200
++++ tinyproxy-1.6.5/configure	2009-11-15 21:05:10.000000000 +0100
+@@ -5162,9 +5162,9 @@ _ACEOF
+ fi
+ 
+ # Check whether --enable-static was given.
+-if test "${enable_static+set}" = set; then
+-  enableval=$enable_static; LDFLAGS="-static $LDFLAGS"
+-fi
++#if test "${enable_static+set}" = set; then
++#  enableval=$enable_static; LDFLAGS="-static $LDFLAGS"
++#fi
+ 
+ 
+ 
+@@ -10015,7 +10015,7 @@ if test x"$debug_enabled" = x"yes" ; the
+         LEX_FLAGS="--warn --debug"
+     fi
+ else
+-        CFLAGS="-O2 -DNDEBUG $CFLAGS"
++        CFLAGS="$CFLAGS"
+     YFLAGS="-d"
+ fi
+ 
diff --git a/package/tinyproxy/patches/patch-configure_ac b/package/tinyproxy/patches/patch-configure_ac
deleted file mode 100644
index 89f060026..000000000
--- a/package/tinyproxy/patches/patch-configure_ac
+++ /dev/null
@@ -1,22 +0,0 @@
---- tinyproxy-1.6.4.orig/configure.ac	2008-08-24 08:58:43.000000000 +0200
-+++ tinyproxy-1.6.4/configure.ac	2009-06-04 23:49:30.000000000 +0200
-@@ -124,8 +124,8 @@ if test x"$transparent_enabled" = x"yes"
- fi
- 
- dnl Include support for a statically compiled tinyproxy
--AC_ARG_ENABLE(static,
--              [AC_HELP_STRING([--enable-static],
-+AC_ARG_ENABLE(static-bin,
-+              [AC_HELP_STRING([--enable-static-bin],
-                               [Statically link tinyproxy (default is NO)])],
- 	      [LDFLAGS="-static $LDFLAGS"])
- 
-@@ -254,7 +254,7 @@ if test x"$debug_enabled" = x"yes" ; the
-     fi
- else
-     dnl No debugging information, include the optimizations
--    CFLAGS="-O2 -DNDEBUG $CFLAGS"
-+    CFLAGS="$CFLAGS"
-     YFLAGS="-d"
- fi
- 
-- 
cgit v1.2.3