Browse Source

update to latest upstream

Waldemar Brodkorb 11 years ago
parent
commit
456e12e8fb
2 changed files with 6 additions and 44 deletions
  1. 6 20
      package/tinyproxy/Makefile
  2. 0 24
      package/tinyproxy/patches/patch-configure

+ 6 - 20
package/tinyproxy/Makefile

@@ -4,31 +4,19 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		tinyproxy
-PKG_VERSION:=		1.6.5
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		2b2862ba33d2939e4572688d442ba415
-PKG_DESCR:=		Tinyproxy is a lightweight HTTP and HTTPS proxy.
+PKG_VERSION:=		1.8.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		eca927f7f6a9ce8394b2b256361978a7
+PKG_DESCR:=		lightweight HTTP and HTTPS proxy
 PKG_SECTION:=		proxy
 PKG_URL:=		https://www.banu.com/tinyproxy/
-PKG_SITES:=		https://www.banu.com/pub/tinyproxy/1.6/
+PKG_SITES:=		https://www.banu.com/pub/tinyproxy/1.8/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TINYPROXY,tinyproxy,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		ac_cv_header_libintl_h=no \
-			ac_cv_lib_nsl_gethostbyaddr=no \
-			ac_cv_lib_nsl_gethostname=no
-
-ifeq (${ADK_COMPILE_TINYPROXY_WITH_TRANSPARENT_PROXY},y)
-CONFIGURE_ARGS+=	--enable-transparent-proxy
-endif
-ifneq (${ADK_COMPILE_TINYPROXY_WITH_UPSTREAM},y)
-CONFIGURE_ARGS+=	--disable-upstream
-endif
-ifneq (${ADK_COMPILE_TINYPROXY_WITH_FILTER},y)
-CONFIGURE_ARGS+=	--disable-filter
-endif
+CONFIGURE_ARGS+=	--disable-regexcheck
 
 tinyproxy-install:
 	${INSTALL_DIR} ${IDIR_TINYPROXY}/usr/sbin \
@@ -44,7 +32,5 @@ tinyproxy-install:
 		${IDIR_TINYPROXY}/usr/share/tinyproxy/
 	${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/stats.html \
 		${IDIR_TINYPROXY}/usr/share/tinyproxy/
-	${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/HTML_VARIABLES \
-		${IDIR_TINYPROXY}/usr/share/tinyproxy/
 
 include ${TOPDIR}/mk/pkg-bottom.mk

+ 0 - 24
package/tinyproxy/patches/patch-configure

@@ -1,24 +0,0 @@
---- 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
-