summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-11-15 21:05:58 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-11-15 21:05:58 +0100
commitdc630f978a2524c0cd13f39c76f1e2d8f84d4baa (patch)
tree2bb754c78b87fbe65a8eec5ceb4e485ac9836903
parent75f2ac2312c3b98e94bb98941074fa85aba03841 (diff)
update squid, openssl and tinyproxy to latest upstream version
-rw-r--r--package/libstdcxx/Makefile4
-rw-r--r--package/openssl/Makefile6
-rw-r--r--package/squid/Config.in18
-rw-r--r--package/squid/Makefile4
-rw-r--r--package/tinyproxy/Makefile6
-rw-r--r--package/tinyproxy/patches/patch-configure24
-rw-r--r--package/tinyproxy/patches/patch-configure_ac22
-rw-r--r--scripts/scan-pkgs.sh13
8 files changed, 67 insertions, 30 deletions
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 1d6359c59..c2aa1ba09 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -15,6 +15,10 @@ $(eval $(call PKG_template,LIBSTDCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},$
do-install:
${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib
+ifeq ($(ADK_NATIVE),y)
+ $(CP) /usr/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib
+else
$(CP) ${STAGING_DIR}/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib
+endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 5afcec4ed..70816f944 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= openssl
-PKG_VERSION:= 0.9.8k
-PKG_RELEASE:= 3
-PKG_MD5SUM:= e555c6d58d276aec7fdc53363e338ab3
+PKG_VERSION:= 0.9.8j
+PKG_RELEASE:= 1
+PKG_MD5SUM:= a5cb5f6c3d11affb387ecf7a997cac0c
PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries
PKG_SECTION:= libs
PKG_DEPENDS:= zlib
diff --git a/package/squid/Config.in b/package/squid/Config.in
index 483b27468..54618295d 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -13,6 +13,24 @@ config ADK_PACKAGE_SQUID
http://www.squid-cache.org
+choice
+prompt "C++ library to use"
+depends on ADK_PACKAGE_SQUID
+default ADK_COMPILE_SQUID_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_SQUID_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_SQUID_WITH_STDCXX
+ bool "Standard C++ library"
+ select ADK_PACKAGE_LIBSTDCXX
+ help
+
+config ADK_COMPILE_SQUID_WITH_UCLIBCXX
+ bool "Embedded uClibc++ library"
+ select ADK_PACKAGE_UCLIBCXX
+ help
+
+endchoice
+
menu "squid............................. proxy and web cache modules"
config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 291094919..f4119aaf1 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= squid
-PKG_VERSION:= 3.0.STABLE18
+PKG_VERSION:= 3.0.STABLE20
PKG_RELEASE:= 1
-PKG_MD5SUM:= 8cb529bb8e973c068366e453b9444614
+PKG_MD5SUM:= b69577cfc5cfb6808ec426e3a933220d
PKG_DESCR:= squid web and cache proxy
PKG_SECTION:= net
PKG_DEPENDS:= libopenssl libpthread
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
-
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index a940f2bb1..c1343ec29 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -33,6 +33,12 @@ if [[ -n $ADK_NATIVE ]];then
fi
fi
+if [[ -n $ADK_NATIVE ]];then
+ if [[ -n $ADK_PACKAGE_SQUID ]]; then
+ NEED_GXX="$NEED_GXX squid"
+ fi
+fi
+
if [[ -n $ADK_PACKAGE_ALSA_UTILS ]]; then
NEED_XMLTO="$NEED_XMLTO alsa-utils"
fi
@@ -82,6 +88,13 @@ if [[ -n $NEED_SSLDEV ]]; then
fi
fi
+if [[ -n $NEED_GXX ]]; then
+ if ! which g++ >/dev/null 2>&1; then
+ echo >&2 You need GNU c++ compiler to build $NEED_GXX
+ out=1
+ fi
+fi
+
if [[ -n $NEED_RUBY ]]; then
if ! which ruby >/dev/null 2>&1; then
echo >&2 You need ruby to build $NEED_RUBY