diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-16 17:32:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-16 17:32:45 +0100 |
| commit | 92e6956680178ab6b2ac30d85efe126af81e39b2 (patch) | |
| tree | 3986c36e650a5fa585e665a5d20c8bd5b1dc4d38 /package/squid | |
| parent | 775439d995f9b41ab0de32cede596e8aba405311 (diff) | |
| parent | 9ac3310d527fc15d215d61fa78e886fd0ed8054f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/squid')
| -rw-r--r-- | package/squid/Makefile | 5 | ||||
| -rw-r--r-- | package/squid/patches/patch-lib_util_c | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/package/squid/Makefile b/package/squid/Makefile index ccf7473cd..2fce59548 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -10,17 +10,18 @@ PKG_MD5SUM:= c70ef1198e6a6c1ae80bc57cd3592e36 PKG_DESCR:= squid web and cache proxy PKG_SECTION:= proxy PKG_DEPENDS:= libopenssl libpthread -PKG_BUILDDEP:= openssl +PKG_BUILDDEP:= openssl libtool PKG_URL:= http://www.squid-cache.org/ PKG_SITES:= http://www.squid-cache.org/Versions/v3/3.1/ PKG_MULTI:= 1 +PKG_NEED_CXX:= 1 PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_PASSWORD PKG_SUBPKGS+= SQUID_MOD_EXTERNAL_ACL_IP_USER SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP PKG_SUBPKGS+= SQUID_MOD_NTLM_AUTH_FAKEAUTH -PKG_HOST_DEPENDS:= !netbsd !cygwin !darwin +PKG_HOST_DEPENDS:= !netbsd !cygwin AUTH_MODULES:= basic digest ntlm ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},) diff --git a/package/squid/patches/patch-lib_util_c b/package/squid/patches/patch-lib_util_c new file mode 100644 index 000000000..b50c4afb2 --- /dev/null +++ b/package/squid/patches/patch-lib_util_c @@ -0,0 +1,11 @@ +--- squid-3.1.4.orig/lib/util.c 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/lib/util.c 2011-02-14 20:44:04.000000000 +0100 +@@ -56,7 +56,7 @@ + #if HAVE_GNUMALLLOC_H + #include <gnumalloc.h> + #elif HAVE_MALLOC_H +-#include <malloc.h> ++#include <stdlib.h> + #endif + #if HAVE_ERRNO_H + #include <errno.h> |