summaryrefslogtreecommitdiff
path: root/package/squid
diff options
context:
space:
mode:
Diffstat (limited to 'package/squid')
-rw-r--r--package/squid/Config.in93
-rw-r--r--package/squid/Makefile173
-rw-r--r--package/squid/ipkg/squid-mod-basic-auth-getpwnam.control5
-rw-r--r--package/squid/ipkg/squid-mod-basic-auth-ncsa.control5
-rw-r--r--package/squid/ipkg/squid-mod-basic-auth-smb.control5
-rw-r--r--package/squid/ipkg/squid-mod-basic-auth-winbind.control5
-rw-r--r--package/squid/ipkg/squid-mod-digest-auth-password.control5
-rw-r--r--package/squid/ipkg/squid-mod-external-acl-ip-user.control5
-rw-r--r--package/squid/ipkg/squid-mod-external-acl-unix-group.control5
-rw-r--r--package/squid/ipkg/squid-mod-external-acl-winbind-group.control5
-rw-r--r--package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control5
-rw-r--r--package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control5
-rw-r--r--package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control5
-rw-r--r--package/squid/ipkg/squid.conffiles2
-rw-r--r--package/squid/ipkg/squid.control5
-rw-r--r--package/squid/patches/patch-configure20
-rw-r--r--package/squid/patches/patch-include_config_h48
-rw-r--r--package/squid/patches/patch-lib_util_c22
-rw-r--r--package/squid/patches/patch-src_Makefile_in19
19 files changed, 437 insertions, 0 deletions
diff --git a/package/squid/Config.in b/package/squid/Config.in
new file mode 100644
index 000000000..47c1250b4
--- /dev/null
+++ b/package/squid/Config.in
@@ -0,0 +1,93 @@
+#menu "squid............................. proxy and web cache"
+
+config ADK_PACKAGE_SQUID
+ prompt "squid............................. full-featured Web proxy cache"
+ tristate
+ default n
+ select ADK_PACKAGE_LIBOPENSSL
+ help
+ Squid is a high-performance proxy caching server for web clients,
+ supporting FTP, gopher, and HTTP data objects. Unlike traditional
+ caching software, Squid handles all requests in a single,
+ non-blocking, I/O-driven process.
+
+ http://www.squid-cache.org
+
+config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM
+ prompt " squid-mod-basic-auth-getpwnam....... getpwnam basic authentication helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ Password basic authentication helper
+
+config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_NCSA
+ prompt " squid-mod-basic-auth-ncsa........... NCSA basic authentication helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ NCSA basic authentication helper
+
+config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB
+ prompt " squid-mod-basic-auth-smb............ Samba basic authentication helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ Samba basic authentication helper
+
+config ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_WINBIND
+ prompt " squid-mod-basic-auth-winbind........ Winbind basic authentication helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ Winbind basic authentication helper
+
+config ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD
+ prompt " squid-mod-digest-auth-password...... Password digest authentication ehlper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ Password digest authentication helper
+
+config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER
+ prompt " squid-mod-external-acl-ip_user...... IP user external ACL helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ IP user external ACL helper
+
+config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP
+ prompt " squid-mod-external-acl-unix-group... Unix group external ACL helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ Unix group external ACL helper
+
+config ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP
+ prompt " squid-mod-external-acl-winbind-group Winbind group external ACL helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ Winbind group external ACL helper
+
+config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH
+ prompt " squid-mod-ntlm-auth-fakeauth........ Fakeauth NTLM authentication helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ Fakeauth NTLM authentication helper
+
+config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH
+ prompt " squid-mod-ntlm-auth-smb-auth........ Samba NTLM authentication helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ Samba NTLM authentication helper
+
+config ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_WINBIND_AUTH
+ prompt " squid-mod-ntlm-auth-winbind-auth.... Winbind NTLM authentication helper"
+ tristate
+ depends ADK_PACKAGE_SQUID
+ help
+ Winbind NTLM authentication helper
+
+#endmenu
diff --git a/package/squid/Makefile b/package/squid/Makefile
new file mode 100644
index 000000000..fb1ac63af
--- /dev/null
+++ b/package/squid/Makefile
@@ -0,0 +1,173 @@
+# $Id$
+#-
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:= squid
+PKG_VERSION:= 2.5.STABLE13
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 3e64468e123be1246d17486dab6bee87
+MASTER_SITES:= http://www.squid-cache.org/Versions/v2/2.5/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+AUTH_MODULES:=basic digest ntlm
+ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},)
+BASIC_AUTH_HELPERS+= getpwnam
+endif
+ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_NCSA},)
+BASIC_AUTH_HELPERS+= NCSA
+endif
+ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_SMB},)
+BASIC_AUTH_HELPERS+= SMB
+endif
+ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_WINBIND},)
+BASIC_AUTH_HELPERS+= winbind
+endif
+
+ifneq (${ADK_PACKAGE_SQUID_MOD_DIGEST_AUTH_PASSWORD},)
+DIGEST_AUTH_HELPERS:= password
+endif
+
+ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_IP_USER},)
+EXTERNAL_ACL_HELPERS+= ip_user
+endif
+ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP},)
+EXTERNAL_ACL_HELPERS+= unix_group
+endif
+ifneq (${ADK_PACKAGE_SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP},)
+EXTERNAL_ACL_HELPERS+= winbind_group
+endif
+
+ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_FAKEAUTH},)
+NTLM_AUTH_HELPERS+= fakeauth
+endif
+ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_SMB_AUTH},)
+NTLM_AUTH_HELPERS+= SMB
+endif
+ifneq (${ADK_PACKAGE_SQUID_MOD_NTLM_AUTH_WINBIND_AUTH},)
+NTLM_AUTH_HELPERS+= winbind
+endif
+
+include ${TOPDIR}/mk/package.mk
+
+define PKG_mod_template
+if [ -e ${WRKINST}/usr/lib/squid/${2} ]; then \
+ ${INSTALL_DIR} ${IDIR_${1}}/usr/lib/squid/ ; \
+ ${INSTALL_BIN} ${WRKINST}/usr/lib/squid/${2} ${IDIR_${1}}/usr/lib/squid/ ; \
+fi
+endef
+
+#$${IPKG_${1}}:
+# install -d -m0755 $${IDIR_${1}}/usr/lib/squid
+# if [ -e ${WRKINST}/usr/lib/squid/${2} ]; then \
+# ${CP} ${WRKINST}/usr/lib/squid/${2} $${IDIR_${1}}/usr/lib/squid/ ; \
+# fi
+# ${RSTRIP} $${IDIR_${1}}
+# ${IPKG_BUILD} $${IDIR_${1}} ${PACKAGE_DIR}
+#
+#endef
+
+
+$(eval $(call PKG_template,SQUID,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,${PKG_NAME}-mod-basic-auth-getpwnam,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_NCSA,${PKG_NAME}-mod-basic-auth-ncsa,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_SMB,${PKG_NAME}-mod-basic-auth-smb,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_BASIC_AUTH_WINBIND,${PKG_NAME}-mod-basic-auth-winbind,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,${PKG_NAME}-mod-digest-auth-password,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,${PKG_NAME}-mod-external-acl-ip-user,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,${PKG_NAME}-mod-external-acl-unix-group,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,${PKG_NAME}-mod-external-acl-winbind-group,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,${PKG_NAME}-mod-ntlm-auth-fakeauth,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,${PKG_NAME}-mod-ntlm-auth-smb-auth,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,${PKG_NAME}-mod-ntlm-auth-winbind-auth,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+
+#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth}}
+#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap}}
+#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth}}
+#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth}}
+#${eval ${call PKG_mod_template,SQUID_MOD_BASIC_AUTH_WINBIND,wb_auth}}
+#${eval ${call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth}}
+#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check}}
+#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth}}
+#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group}}
+#${eval ${call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,wb_group}}
+#${eval ${call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth}}
+#${eval ${call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth}}
+#${eval ${call PKG_mod_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,wb_ntlmauth}}
+
+CONFIGURE_STYLE:= gnu
+CONFIGURE_ENV+= ac_cv_sizeof_void_p=4 \
+ ac_cv_sizeof_short=2 \
+ ac_cv_sizeof_int=4 \
+ ac_cv_sizeof_long=4 \
+ ac_cv_sizeof_long_long=8 \
+ ac_cv_sizeof___int64=0 \
+ ac_cv_sizeof_int16_t=2 \
+ ac_cv_sizeof_uint16_t=2 \
+ ac_cv_sizeof_u_int16_t=2 \
+ ac_cv_sizeof_int32_t=4 \
+ ac_cv_sizeof_uint32_t=4 \
+ ac_cv_sizeof_u_int32_t=4 \
+ ac_cv_sizeof_int64_t=8 \
+ ac_cv_sizeof_uint64_t=8 \
+ ac_cv_sizeof_u_int64_t=8 \
+ ac_cv_func_setresuid=no \
+ ac_cv_func_va_copy=no \
+ ac_cv_func___va_copy=no
+CONFIGURE_ARGS+= --datadir=/usr/share/squid \
+ --libexecdir=/usr/lib/squid \
+ --sysconfdir=/etc/squid \
+ --enable-static \
+ --with-gnu-ld \
+ --enable-x-accelerator-vary \
+ --with-pthreads \
+ --with-dl \
+ --enable-icmp \
+ --enable-kill-parent-hack \
+ --enable-arp-acl \
+ --enable-ssl \
+ --enable-htcp \
+ --enable-err-languages=English \
+ --enable-default-err-language=English \
+ --enable-linux-netfilter \
+ --enable-icmp \
+ --enable-external-acl-helpers="" \
+ --enable-underscores \
+ --enable-cache-digests \
+ --enable-referer-log \
+ --enable-delay-pools \
+ --enable-useragent-log \
+ --with-openssl=${STAGING_DIR}/usr \
+ --enable-auth="${AUTH_MODULES}" \
+ --enable-basic-auth-helpers="${BASIC_AUTH_HELPERS}" \
+ --enable-ntlm-auth-helpers="${NTLM_AUTH_HELPERS}" \
+ --enable-digest-auth-helpers="${DIGEST_AUTH_HELPERS}" \
+ --enable-external-acl-helpers="${EXTERNAL_ACL_HELPERS}"
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ ${INSTALL_DIR} ${IDIR_SQUID}/etc/squid
+ ${INSTALL_DATA} ${WRKINST}/etc/squid/mime.conf \
+ ${WRKINST}/etc/squid/squid.conf ${IDIR_SQUID}/etc/squid/
+ ${INSTALL_DIR} ${IDIR_SQUID}/usr/share/squid
+ ${CP} ${WRKINST}/usr/share/squid/* ${IDIR_SQUID}/usr/share/squid/
+ ${INSTALL_DIR} ${IDIR_SQUID}/usr/sbin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/squid ${IDIR_SQUID}/usr/sbin/
+ $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_GETPWNAM,getpwname_auth)
+ $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_LDAP,ldap)
+ $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_NCSA,ncsa_auth)
+ $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_SMB,smb_auth)
+ $(call PKG_mod_template,SQUID_MOD_BASIC_AUTH_WINBIND,wb_auth)
+ $(call PKG_mod_template,SQUID_MOD_DIGEST_AUTH_PASSWORD,digest_pw_auth)
+ $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_IP_USER,ip_user_check)
+ $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_LDAP_GROUP,ldap_auth)
+ $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,squid_unix_group)
+ $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_WINBIND_GROUP,wb_group)
+ $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKEAUTH,fakeauth_auth)
+ $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth)
+ $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_WINBIND_AUTH,wb_ntlmauth)
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control b/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control
new file mode 100644
index 000000000..cc9dfe661
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-basic-auth-getpwnam.control
@@ -0,0 +1,5 @@
+Package: squid-mod-basic-auth-getpwnam
+Section: net
+Depends: squid
+Priority: optional
+Description: getpwnam basic authentication helper
diff --git a/package/squid/ipkg/squid-mod-basic-auth-ncsa.control b/package/squid/ipkg/squid-mod-basic-auth-ncsa.control
new file mode 100644
index 000000000..94b8e9ece
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-basic-auth-ncsa.control
@@ -0,0 +1,5 @@
+Package: squid-mod-basic-auth-ncsa
+Section: net
+Depends: squid
+Priority: optional
+Description: ncsa basic authentication helper
diff --git a/package/squid/ipkg/squid-mod-basic-auth-smb.control b/package/squid/ipkg/squid-mod-basic-auth-smb.control
new file mode 100644
index 000000000..9adbeaa01
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-basic-auth-smb.control
@@ -0,0 +1,5 @@
+Package: squid-mod-basic-auth-smb
+Section: net
+Depends: squid
+Priority: optional
+Description: Samba basic authentication helper
diff --git a/package/squid/ipkg/squid-mod-basic-auth-winbind.control b/package/squid/ipkg/squid-mod-basic-auth-winbind.control
new file mode 100644
index 000000000..49047fab5
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-basic-auth-winbind.control
@@ -0,0 +1,5 @@
+Package: squid-mod-basic-auth-winbind
+Section: net
+Depends: squid
+Priority: optional
+Description: winbind basic authentication helper
diff --git a/package/squid/ipkg/squid-mod-digest-auth-password.control b/package/squid/ipkg/squid-mod-digest-auth-password.control
new file mode 100644
index 000000000..a78b61636
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-digest-auth-password.control
@@ -0,0 +1,5 @@
+Package: squid-mod-digest-auth-password
+Section: net
+Depends: squid
+Priority: optional
+Description: password digest authentication helper
diff --git a/package/squid/ipkg/squid-mod-external-acl-ip-user.control b/package/squid/ipkg/squid-mod-external-acl-ip-user.control
new file mode 100644
index 000000000..eb613a370
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-external-acl-ip-user.control
@@ -0,0 +1,5 @@
+Package: squid-mod-external-acl-ip-user
+Section: net
+Depends: squid
+Priority: optional
+Description: IP user external acl helper
diff --git a/package/squid/ipkg/squid-mod-external-acl-unix-group.control b/package/squid/ipkg/squid-mod-external-acl-unix-group.control
new file mode 100644
index 000000000..01614125f
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-external-acl-unix-group.control
@@ -0,0 +1,5 @@
+Package: squid-mod-external-acl-unix-group
+Section: net
+Depends: squid
+Priority: optional
+Description: Unix group external acl helper
diff --git a/package/squid/ipkg/squid-mod-external-acl-winbind-group.control b/package/squid/ipkg/squid-mod-external-acl-winbind-group.control
new file mode 100644
index 000000000..308a32d46
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-external-acl-winbind-group.control
@@ -0,0 +1,5 @@
+Package: squid-mod-external-acl-winbind-group
+Section: net
+Depends: squid
+Priority: optional
+Description: winbind group external acl helper
diff --git a/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control b/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control
new file mode 100644
index 000000000..51779ec01
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-ntlm-auth-fakeauth.control
@@ -0,0 +1,5 @@
+Package: squid-mod-ntlm-auth-fakeauth
+Section: net
+Depends: squid
+Priority: optional
+Description: fakeauht NTLM authentication helper
diff --git a/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control b/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control
new file mode 100644
index 000000000..1561bfa68
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-ntlm-auth-smb-auth.control
@@ -0,0 +1,5 @@
+Package: squid-mod-ntlm-auth-smb-auth
+Section: net
+Depends: squid
+Priority: optional
+Description: samba NTLM authentication helper
diff --git a/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control b/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control
new file mode 100644
index 000000000..1480c2965
--- /dev/null
+++ b/package/squid/ipkg/squid-mod-ntlm-auth-winbind-auth.control
@@ -0,0 +1,5 @@
+Package: squid-mod-ntlm-auth-winbind-auth
+Section: net
+Depends: squid
+Priority: optional
+Description: winbind NTLM authentication helper
diff --git a/package/squid/ipkg/squid.conffiles b/package/squid/ipkg/squid.conffiles
new file mode 100644
index 000000000..cd06f9da5
--- /dev/null
+++ b/package/squid/ipkg/squid.conffiles
@@ -0,0 +1,2 @@
+/etc/squid/mime.conf
+/etc/squid/squid.conf
diff --git a/package/squid/ipkg/squid.control b/package/squid/ipkg/squid.control
new file mode 100644
index 000000000..0657eb1ef
--- /dev/null
+++ b/package/squid/ipkg/squid.control
@@ -0,0 +1,5 @@
+Package: squid
+Section: net
+Depends: libopenssl, libpthread
+Priority: optional
+Description: squid web and cache proxy
diff --git a/package/squid/patches/patch-configure b/package/squid/patches/patch-configure
new file mode 100644
index 000000000..5ea663655
--- /dev/null
+++ b/package/squid/patches/patch-configure
@@ -0,0 +1,20 @@
+$Id$
+--- squid-2.5.STABLE13.orig/configure 2006-03-12 12:29:22.000000000 +0100
++++ squid-2.5.STABLE13/configure 2006-10-02 20:00:32.000000000 +0200
+@@ -1538,6 +1538,7 @@ CRYPTLIB=''
+ REGEXLIB='' # -lregex
+ LIBREGEX='' # libregex.a
+
++if false; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+@@ -1573,7 +1574,7 @@ if test -n "$PKGCONFIG"; then
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+-
++fi
+
+ echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
+ echo "configure:1580: checking for Cygwin environment" >&5
diff --git a/package/squid/patches/patch-include_config_h b/package/squid/patches/patch-include_config_h
new file mode 100644
index 000000000..1c8b1dc23
--- /dev/null
+++ b/package/squid/patches/patch-include_config_h
@@ -0,0 +1,48 @@
+$Id$
+
+ evil kludge because configure only checks the host system,
+ not the build system, yet builds a tool to run on it (cf_gen)
+
+ the real way to do this is probably to enhance configure.in
+ the way gcc uses it if doing a build with build!=(host==target),
+ but this should be enough for now; contact tg@ (PR#71) if it isn't
+
+--- squid-2.5.STABLE13.orig/include/config.h 2005-04-23 03:32:27.000000000 +0200
++++ squid-2.5.STABLE13/include/config.h 2006-09-18 19:21:26.000000000 +0200
+@@ -34,7 +34,36 @@
+ #ifndef SQUID_CONFIG_H
+ #define SQUID_CONFIG_H
+
++#ifndef BUILD_HOST_TOOL
+ #include "autoconf.h" /* For GNU autoconf variables */
++#else
++/* we just hope our host systems can cope */
++#define STDC_HEADERS 1
++#define HAVE_MEMCPY 1
++#define HAVE_MEMMOVE 1
++#define HAVE_MEMSET 1
++#define HAVE_MKSTEMP 1
++#define HAVE_MKTIME 1
++#define HAVE_ASSERT_H 1
++#define HAVE_CTYPE_H 1
++#define HAVE_DIRENT_H 1
++#define HAVE_ERRNO_H 1
++#define HAVE_FCNTL_H 1
++#define HAVE_GETOPT_H 1
++#define HAVE_INTTYPES_H 1
++#define HAVE_LIMITS_H 1
++#define HAVE_SIGNAL_H 1
++#define HAVE_STDARG_H 1
++#define HAVE_STDDEF_H 1
++#define HAVE_STDIO_H 1
++#define HAVE_STDLIB_H 1
++#define HAVE_STRING_H 1
++#define HAVE_SYS_PARAM_H 1
++#define HAVE_SYS_STAT_H 1
++#define HAVE_SYS_TIME_H 1
++#define HAVE_TIME_H 1
++#define HAVE_UNISTD_H 1
++#endif
+ #include "version.h"
+
+ /****************************************************************************
diff --git a/package/squid/patches/patch-lib_util_c b/package/squid/patches/patch-lib_util_c
new file mode 100644
index 000000000..622df36d6
--- /dev/null
+++ b/package/squid/patches/patch-lib_util_c
@@ -0,0 +1,22 @@
+$Id$
+
+ the host tools don't need libm
+
+--- squid-2.5.STABLE13.orig/lib/util.c 2005-06-30 20:50:56.000000000 +0200
++++ squid-2.5.STABLE13/lib/util.c 2006-09-18 19:23:46.000000000 +0200
+@@ -704,6 +704,7 @@ xpercent(double part, double whole)
+ return xdiv(100 * part, whole);
+ }
+
++#ifndef BUILD_HOST_TOOL
+ int
+ xpercentInt(double part, double whole)
+ {
+@@ -714,6 +715,7 @@ xpercentInt(double part, double whole)
+ return (int) floor(xpercent(part, whole) + 0.5);
+ #endif
+ }
++#endif
+
+ /* somewhat safer division */
+ double
diff --git a/package/squid/patches/patch-src_Makefile_in b/package/squid/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..c77f4d6fb
--- /dev/null
+++ b/package/squid/patches/patch-src_Makefile_in
@@ -0,0 +1,19 @@
+$Id$
+
+ cross-configure kludge
+
+--- squid-2.5.STABLE13.orig/src/Makefile.in 2005-09-28 22:57:21.000000000 +0200
++++ squid-2.5.STABLE13/src/Makefile.in 2006-09-18 19:24:05.000000000 +0200
+@@ -702,7 +702,12 @@ cachemgr$(CGIEXT)$(EXEEXT): $(cachemgr__
+ $(LINK) $(cachemgr__CGIEXT__LDFLAGS) $(cachemgr__CGIEXT__OBJECTS) $(cachemgr__CGIEXT__LDADD) $(LIBS)
+ cf_gen$(EXEEXT): $(cf_gen_OBJECTS) $(cf_gen_DEPENDENCIES)
+ @rm -f cf_gen$(EXEEXT)
++ifneq (${HOSTCC},)
++ ${HOSTCC} ${INCLUDES} -DNDEBUG -DBUILD_HOST_TOOL -o cf_gen$(EXEEXT) \
++ $(srcdir)/cf_gen.c $(top_srcdir)/lib/util.c
++else
+ $(LINK) $(cf_gen_LDFLAGS) $(cf_gen_OBJECTS) $(cf_gen_LDADD) $(LIBS)
++endif
+ dnsserver$(EXEEXT): $(dnsserver_OBJECTS) $(dnsserver_DEPENDENCIES)
+ @rm -f dnsserver$(EXEEXT)
+ $(LINK) $(dnsserver_LDFLAGS) $(dnsserver_OBJECTS) $(dnsserver_LDADD) $(LIBS)
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 18:09:19 +0000