From cdbf893314db671a4bd86d875afbe93ddf329995 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sat, 2 Jul 2011 16:35:02 +0200 Subject: helpers/negotiate_auth/squid_kerb_auth configure fail cause of a test to --squid-dir= is not handling cross-compiling. https://bugs.gentoo.org/show_bug.cgi?id=370931 --- net-proxy/squid/Manifest | 6 + .../squid-3.1.8-BJA-squid_kerb_auth-cross.diff | 12 + net-proxy/squid/files/squid-3.1.8-gentoo.patch | 281 +++++++++++++++++++++ net-proxy/squid/files/squid-3.1.8-libmd5.patch | 16 ++ net-proxy/squid/files/squid-3.1.8-qafixes.patch | 39 +++ net-proxy/squid/squid-3.1.8.ebuild | 215 ++++++++++++++++ 6 files changed, 569 insertions(+) create mode 100644 net-proxy/squid/files/squid-3.1.8-BJA-squid_kerb_auth-cross.diff create mode 100644 net-proxy/squid/files/squid-3.1.8-gentoo.patch create mode 100644 net-proxy/squid/files/squid-3.1.8-libmd5.patch create mode 100644 net-proxy/squid/files/squid-3.1.8-qafixes.patch create mode 100644 net-proxy/squid/squid-3.1.8.ebuild (limited to 'net-proxy') diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest index 4d2e9348..c08ad78e 100644 --- a/net-proxy/squid/Manifest +++ b/net-proxy/squid/Manifest @@ -4,7 +4,13 @@ AUX squid-3.0.13-BJA-util-cast-xstr.diff 787 RMD160 608c8fe69d2e4fb520ecbd5691b5 AUX squid-3.0.13-adapted-zph.patch 6838 RMD160 5a8728e93498ce03fdcbc1926c63271d562b9671 SHA1 1f6453eb8d00e3ac84b4000aeb14cdf3da54f9d4 SHA256 13f4c3cd42ce662cf0e13fb4ca27b0e50562d22af69aabc373a1ff299c694a29 AUX squid-3.0.13-gentoo.patch 13095 RMD160 5184e54faef48bf5ed8c93d92761e39be8885739 SHA1 f671c6aa4a051b9f454afc08769bafedc3c92f2e SHA256 2209444bdd0149404a77478f8d445cc7a0b4e012a25557dbf8a2e3659b0883d9 AUX squid-3.0.13-heimdal.patch 780 RMD160 4cf5b9494a0537bdd0f886b46e7f0685d0e428be SHA1 71b99ceed606c3e41db9f0f78a8d993d8e35a407 SHA256 a51da87baf57bf251c0c401a29b296a89ffa391f5da6e821bbe15a309dd76537 +AUX squid-3.1.8-BJA-squid_kerb_auth-cross.diff 403 RMD160 8755466b7819d9f78dc4f763557578d790984fa3 SHA1 d2997a3ba8cfe8b5ffc850217bce09d32c49a05e SHA256 c1fef483bd997e44d5079728d1a1855565ff9e7f67796be5bea969f305b5b1f4 +AUX squid-3.1.8-gentoo.patch 12364 RMD160 5a825dfd6d18ce8c91e16d8f0841737bc87b3d74 SHA1 29ae980d9b5ecf6b6b1481a36d2d4abb254c4a0a SHA256 bef6ba17f25aa07a5d3691c7a4af7ff478a6c0948b20a867808184a2839417b6 +AUX squid-3.1.8-libmd5.patch 588 RMD160 ae825720524b07bd2c0ae77b15b657fdd9392617 SHA1 5deb1d7a5f6c91b9a910f6460d2df6bc7b07c18e SHA256 c09de18fbcc1b5c4dda19f91c2182e179d05938a235774113a7a3af5862909d5 +AUX squid-3.1.8-qafixes.patch 2214 RMD160 ed05e224d5f392b43f88d1d72415d7539fb3e77b SHA1 4991eb402b9192e3cd18871d3cca7469d10eef35 SHA256 f02b1dbd7afca670b804b616b74e006a2f7aa0bd08988c3120b4064258754af8 DIST squid-2.7.STABLE3.tar.gz 1782040 RMD160 80410ce27f3abd0601e10ab5d69099d9f3caaf28 SHA1 0c99054d5fd6537da467acbf299ffe5f1a542ae3 SHA256 d987578c6ca26ca8c8d6fad920580cc39b6ebe95c8ff727b1b6d3c5625fe428d DIST squid-3.0.STABLE13.tar.gz 2454967 RMD160 8da76671013bf4100cbc4c2976e228f81323344e SHA1 6f0f1079a027c64a9f95b7b6c9bdd943af28a42e SHA256 8764fe16c8873bcc5c0c7e5f97b22e70dec186d1182ca4803ec94761bac750e1 +DIST squid-3.1.8.tar.gz 3253846 RMD160 d5264a517b57774a9f536bee7977ac9769fca63f SHA1 1b3e14e653a77462607aefa7931605a5e24829b9 SHA256 7a8bf96fb0f8245ff0ad6bd7895d6f4f79518c80deb4ef05e0c2a36b22c9b9ac EBUILD squid-2.7.3.ebuild 5802 RMD160 8747f84d1cbe8d9a8b406b7006c498310479a3c5 SHA1 169f0233823fd63efe12830cb931994e6c305006 SHA256 71e2a0b10dc566b649fc3eb619ee515fefa4d4e0347340dea4fc01284eadcd86 EBUILD squid-3.0.13.ebuild 6563 RMD160 b7e733a007809a59000c1b3fa0c82a6fe9322945 SHA1 6f92a04f690ce5d0d1c1b5c677ef63911b53b46f SHA256 f1bf14d030360bc6851641e8124b0145ea8dfe7a5e52984c5ddb683377f5a678 +EBUILD squid-3.1.8.ebuild 7076 RMD160 cdc0487249e8d34282c8a5e9abed2724ba2cde2b SHA1 01a62b00bcb065fd0e958d3b3e9391a47bf7af2b SHA256 6ef32386ffaec148828389f5709f29c0a96484a2749e6cc74fac921c7221faa1 diff --git a/net-proxy/squid/files/squid-3.1.8-BJA-squid_kerb_auth-cross.diff b/net-proxy/squid/files/squid-3.1.8-BJA-squid_kerb_auth-cross.diff new file mode 100644 index 00000000..c6bfa792 --- /dev/null +++ b/net-proxy/squid/files/squid-3.1.8-BJA-squid_kerb_auth-cross.diff @@ -0,0 +1,12 @@ +--- helpers/negotiate_auth/squid_kerb_auth/configure.in.ori 2011-06-09 22:23:38.000000000 +0200 ++++ helpers/negotiate_auth/squid_kerb_auth/configure.in 2011-06-09 22:23:53.000000000 +0200 +@@ -378,7 +378,8 @@ + #endif + }], + ac_cv_have_squid=yes, +- ac_cv_have_squid=no) ++ ac_cv_have_squid=no, ++ ac_cv_have_squid=yes) + ]) + LDFLAGS="$LDFLAGS -L../../../lib" + if test "x$ac_cv_have_squid" = "xyes"; then diff --git a/net-proxy/squid/files/squid-3.1.8-gentoo.patch b/net-proxy/squid/files/squid-3.1.8-gentoo.patch new file mode 100644 index 00000000..d48eedfe --- /dev/null +++ b/net-proxy/squid/files/squid-3.1.8-gentoo.patch @@ -0,0 +1,281 @@ +diff -Nru squid-3.1.8.orig/acinclude.m4 squid-3.1.8/acinclude.m4 +--- squid-3.1.8.orig/acinclude.m4 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/acinclude.m4 2010-09-23 23:34:10.000000000 +0200 +@@ -75,7 +75,7 @@ + AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) + AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ + ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc +-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null ++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null + res=$? + rm -f conftest.* + echo yes +diff -Nru squid-3.1.8.orig/configure.in squid-3.1.8/configure.in +--- squid-3.1.8.orig/configure.in 2010-09-04 05:26:52.000000000 +0200 ++++ squid-3.1.8/configure.in 2010-09-23 23:34:10.000000000 +0200 +@@ -16,9 +16,9 @@ + PRESET_LDFLAGS="$LDFLAGS" + + dnl Set default LDFLAGS +-if test -z "$LDFLAGS"; then +- LDFLAGS="-g" +-fi ++dnl if test -z "$LDFLAGS"; then ++dnl LDFLAGS="-g" ++dnl fi + + dnl Check for GNU cc + AC_PROG_CC +diff -Nru squid-3.1.8.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.8/helpers/basic_auth/MSNT/confload.c +--- squid-3.1.8.orig/helpers/basic_auth/MSNT/confload.c 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/helpers/basic_auth/MSNT/confload.c 2010-09-23 23:34:10.000000000 +0200 +@@ -27,7 +27,7 @@ + + /* Path to configuration file */ + #ifndef SYSCONFDIR +-#define SYSCONFDIR "/usr/local/squid/etc" ++#define SYSCONFDIR "/etc/squid" + #endif + #define CONFIGFILE SYSCONFDIR "/msntauth.conf" + +diff -Nru squid-3.1.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.8/helpers/basic_auth/MSNT/msntauth.conf.default +--- squid-3.1.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/helpers/basic_auth/MSNT/msntauth.conf.default 2010-09-23 23:34:10.000000000 +0200 +@@ -8,6 +8,6 @@ + server other_PDC other_BDC otherdomain + + # Denied and allowed users. Comment these if not needed. +-#denyusers /usr/local/squid/etc/msntauth.denyusers +-#allowusers /usr/local/squid/etc/msntauth.allowusers ++#denyusers /etc/squid/msntauth.denyusers ++#allowusers /etc/squid/msntauth.allowusers + +diff -Nru squid-3.1.8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.8/helpers/basic_auth/SMB/Makefile.am +--- squid-3.1.8.orig/helpers/basic_auth/SMB/Makefile.am 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.am 2010-09-23 23:34:10.000000000 +0200 +@@ -16,7 +16,7 @@ + ## FIXME: autoconf should test for the samba path. + + SMB_AUTH_HELPER = smb_auth.sh +-SAMBAPREFIX=/usr/local/samba ++SAMBAPREFIX=/usr + SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) + + libexec_SCRIPTS = $(SMB_AUTH_HELPER) +diff -Nru squid-3.1.8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.8/helpers/basic_auth/SMB/smb_auth.sh +--- squid-3.1.8.orig/helpers/basic_auth/SMB/smb_auth.sh 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/helpers/basic_auth/SMB/smb_auth.sh 2010-09-23 23:34:10.000000000 +0200 +@@ -24,7 +24,7 @@ + read AUTHSHARE + read AUTHFILE + read SMBUSER +-read SMBPASS ++read -r SMBPASS + + # Find domain controller + echo "Domain name: $DOMAINNAME" +@@ -47,7 +47,7 @@ + addropt="" + fi + echo "Query address options: $addropt" +-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` ++dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` + echo "Domain controller IP address: $dcip" + [ -n "$dcip" ] || exit 1 + +diff -Nru squid-3.1.8.orig/helpers/external_acl/session/squid_session.8 squid-3.1.8/helpers/external_acl/session/squid_session.8 +--- squid-3.1.8.orig/helpers/external_acl/session/squid_session.8 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/helpers/external_acl/session/squid_session.8 2010-09-23 23:34:10.000000000 +0200 +@@ -35,7 +35,7 @@ + .P + Configuration example using the default automatic mode + .IP +-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session ++external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session + .IP + acl session external session + .IP +diff -Nru squid-3.1.8.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.8/helpers/external_acl/unix_group/squid_unix_group.8 +--- squid-3.1.8.orig/helpers/external_acl/unix_group/squid_unix_group.8 2010-09-04 05:25:58.000000000 +0200 ++++ squid-3.1.8/helpers/external_acl/unix_group/squid_unix_group.8 2010-09-23 23:34:10.000000000 +0200 +@@ -27,7 +27,7 @@ + This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 + matches users in group2 or group3 + .IP +-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p ++external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p + .IP + acl usergroup1 external unix_group group1 + .IP +diff -Nru squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in +--- squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-09-04 05:25:58.000000000 +0200 ++++ squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-09-23 23:34:10.000000000 +0200 +@@ -17,6 +17,7 @@ + + AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@compuserve.com]) + AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5) ++AM_MAINTAINER_MODE + AC_CONFIG_SRCDIR([squid_kerb_auth.c]) + + AC_PROG_CC +@@ -467,7 +468,7 @@ + echo "configure: ##" + echo "configure: ## -----------------------------##" + +-MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow" ++MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow" + for ac_cv_my_cflag in $MY_CFLAGS; do + echo "int main() + { +diff -Nru squid-3.1.8.orig/lib/libTrie/acinclude.m4 squid-3.1.8/lib/libTrie/acinclude.m4 +--- squid-3.1.8.orig/lib/libTrie/acinclude.m4 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/lib/libTrie/acinclude.m4 2010-09-23 23:34:10.000000000 +0200 +@@ -11,7 +11,7 @@ + AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) + AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ + ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc +-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null ++${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null + res=$? + rm -f conftest.* + echo yes +diff -Nru squid-3.1.8.orig/lib/libTrie/configure.in squid-3.1.8/lib/libTrie/configure.in +--- squid-3.1.8.orig/lib/libTrie/configure.in 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/lib/libTrie/configure.in 2010-09-23 23:34:10.000000000 +0200 +@@ -59,8 +59,8 @@ + + dnl set useful flags + if test "$GCC" = "yes"; then +- TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" +- TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments" ++ TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations" ++ TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings" + else + TRIE_CFLAGS= + TRIE_CXXFLAGS= +diff -Nru squid-3.1.8.orig/src/cf.data.pre squid-3.1.8/src/cf.data.pre +--- squid-3.1.8.orig/src/cf.data.pre 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/src/cf.data.pre 2010-09-23 23:34:10.000000000 +0200 +@@ -716,6 +716,7 @@ + acl Safe_ports port 488 # gss-http + acl Safe_ports port 591 # filemaker + acl Safe_ports port 777 # multiling http ++acl Safe_ports port 901 # SWAT + acl CONNECT method CONNECT + NOCOMMENT_END + DOC_END +@@ -864,6 +865,9 @@ + http_access allow localnet + http_access allow localhost + ++# Allow the localhost to have access by default ++http_access allow localhost ++ + # And finally deny all other access to this proxy + http_access deny all + NOCOMMENT_END +@@ -4036,11 +4040,11 @@ + + NAME: cache_mgr + TYPE: string +-DEFAULT: webmaster ++DEFAULT: root + LOC: Config.adminEmail + DOC_START + Email-address of local cache manager who will receive +- mail if the cache dies. The default is "webmaster." ++ mail if the cache dies. The default is "root". + DOC_END + + NAME: mail_from +@@ -6357,7 +6361,7 @@ + NAME: forwarded_for + COMMENT: on|off|transparent|truncate|delete + TYPE: string +-DEFAULT: on ++DEFAULT: delete + LOC: opt_forwarded_for + DOC_START + If set to "on", Squid will append your client's IP address +diff -Nru squid-3.1.8.orig/src/debug.cc squid-3.1.8/src/debug.cc +--- squid-3.1.8.orig/src/debug.cc 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/src/debug.cc 2010-09-23 23:34:10.000000000 +0200 +@@ -452,7 +452,7 @@ + #if HAVE_SYSLOG && defined(LOG_LOCAL4) + + if (Debug::log_syslog) +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); + + #endif /* HAVE_SYSLOG */ + +diff -Nru squid-3.1.8.orig/src/main.cc squid-3.1.8/src/main.cc +--- squid-3.1.8.orig/src/main.cc 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/src/main.cc 2010-09-23 23:34:10.000000000 +0200 +@@ -1556,7 +1556,7 @@ + if (*(argv[0]) == '(') + return; + +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); + + if ((pid = fork()) < 0) + syslog(LOG_ALERT, "fork failed: %s", xstrerror()); +@@ -1600,7 +1600,7 @@ + + if ((pid = fork()) == 0) { + /* child */ +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); + prog = xstrdup(argv[0]); + argv[0] = xstrdup("(squid)"); + execvp(prog, argv); +@@ -1608,7 +1608,7 @@ + } + + /* parent */ +- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); ++ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); + + syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); + +diff -Nru squid-3.1.8.orig/src/Makefile.am squid-3.1.8/src/Makefile.am +--- squid-3.1.8.orig/src/Makefile.am 2010-09-04 05:25:57.000000000 +0200 ++++ squid-3.1.8/src/Makefile.am 2010-09-23 23:34:10.000000000 +0200 +@@ -638,7 +638,6 @@ + + sysconf_DATA = \ + squid.conf.default \ +- squid.conf.documented \ + mime.conf.default + + data_DATA = \ +@@ -719,8 +718,8 @@ + DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log + DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log + DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) +-DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state +-DEFAULT_SWAP_DIR = $(localstatedir)/cache ++DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state ++DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid + DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` + DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` +@@ -797,13 +796,11 @@ + @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ + echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ + else \ +- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ +- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ ++ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ ++ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ + fi +- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ +- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ +- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \ +- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \ ++ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ ++ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ + $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \ + $(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)` + diff --git a/net-proxy/squid/files/squid-3.1.8-libmd5.patch b/net-proxy/squid/files/squid-3.1.8-libmd5.patch new file mode 100644 index 00000000..1e28b843 --- /dev/null +++ b/net-proxy/squid/files/squid-3.1.8-libmd5.patch @@ -0,0 +1,16 @@ +diff -Nru squid-3.1.8.orig/configure.in squid-3.1.8/configure.in +--- squid-3.1.8.orig/configure.in 2010-09-23 23:34:49.000000000 +0200 ++++ squid-3.1.8/configure.in 2010-09-23 23:36:41.000000000 +0200 +@@ -2730,7 +2730,11 @@ + dnl libcrypt (eg FreeBSD) + AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"]) + dnl Solaris10 provides MD5 natively through libmd5 +-AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"]) ++case "$host" in ++ *-solaris*) ++ AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"]) ++ ;; ++esac + AC_SUBST(CRYPTLIB) + + dnl Check for libdl, used by auth_modules/PAM diff --git a/net-proxy/squid/files/squid-3.1.8-qafixes.patch b/net-proxy/squid/files/squid-3.1.8-qafixes.patch new file mode 100644 index 00000000..63006897 --- /dev/null +++ b/net-proxy/squid/files/squid-3.1.8-qafixes.patch @@ -0,0 +1,39 @@ +diff -Nru squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in +--- squid-3.1.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-09-23 23:34:49.000000000 +0200 ++++ squid-3.1.8/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-09-23 23:35:45.000000000 +0200 +@@ -94,7 +94,7 @@ + else + ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` + if test "x$ac_gssapi_libs" != "x" ; then +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +@@ -118,7 +118,7 @@ + fi + ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` + if test "x$ac_gssapi_libs" != "x" ; then +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +@@ -172,7 +172,7 @@ + ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` + LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" + fi +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) +@@ -201,7 +201,7 @@ + ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` + LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" + fi +- LDFLAGS="$LDFLAGS $ac_gssapi_libs" ++ LIBS="$LIBS $ac_gssapi_libs" + else + for lib in $ac_gss_libs; do + AC_CHECK_LIB($lib,main) diff --git a/net-proxy/squid/squid-3.1.8.ebuild b/net-proxy/squid/squid-3.1.8.ebuild new file mode 100644 index 00000000..73a6a8c7 --- /dev/null +++ b/net-proxy/squid/squid-3.1.8.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.8.ebuild,v 1.9 2010/10/09 16:31:59 armin76 Exp $ + +EAPI="2" + +inherit eutils pam toolchain-funcs + +DESCRIPTION="A full-featured web proxy cache" +HOMEPAGE="http://www.squid-cache.org/" +SRC_URI="http://www.squid-cache.org/Versions/v3/3.1/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \ + ecap icap-client \ + mysql postgres sqlite \ + zero-penalty-hit \ + pf-transparent ipf-transparent kqueue \ + elibc_uclibc kernel_linux +epoll tproxy" +RESTRICT=test + +COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) + pam? ( virtual/pam ) + ldap? ( net-nds/openldap ) + kerberos? ( virtual/krb5 ) + ssl? ( dev-libs/openssl ) + sasl? ( dev-libs/cyrus-sasl ) + ecap? ( net-libs/libecap ) + selinux? ( sec-policy/selinux-squid ) + !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) + >=sys-libs/db-4 + dev-lang/perl" +DEPEND="${COMMON_DEPEND} + sys-devel/automake + sys-devel/autoconf + sys-devel/libtool + sys-apps/ed + test? ( dev-util/cppunit )" +RDEPEND="${COMMON_DEPEND} + samba? ( net-fs/samba ) + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + sqlite? ( dev-perl/DBD-SQLite )" + +pkg_setup() { + if grep -qs '^[[:space:]]*cache_dir[[:space:]]\+coss' "${ROOT}"etc/squid/squid.conf; then + eerror "coss store IO has been disabled by upstream due to stability issues!" + eerror "If you want to install this version, switch the store type to something else" + eerror "before attempting to install this version again." + + die "/etc/squid/squid.conf: cache_dir use a disabled store type" + fi + + if use tproxy && ! use caps; then + eerror "libcap is required by Transparent Proxy support for Netfilter TPROXY!" + eerror "Please enable caps USE flag and try again." + + die "invalid combination of USE flags" + fi + + enewgroup squid 31 + enewuser squid 31 -1 /var/cache/squid squid +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-qafixes.patch + epatch "${FILESDIR}"/${P}-libmd5.patch + epatch "${FILESDIR}"/${P}-BJA-squid_kerb_auth-cross.diff + + # eautoreconf breaks lib/libLtdl/libtool script + ./bootstrap.sh || die "autoreconf failed" +} + +src_configure() { + local myconf="" + + local basic_modules="getpwnam,NCSA,MSNT" + use samba && basic_modules="SMB,multi-domain-NTLM,${basic_modules}" + use ldap && basic_modules="LDAP,${basic_modules}" + use pam && basic_modules="PAM,${basic_modules}" + use sasl && basic_modules="SASL,${basic_modules}" + use nis && ! use elibc_uclibc && basic_modules="YP,${basic_modules}" + use radius && basic_modules="squid_radius_auth,${basic_modules}" + if use mysql || use postgres || use sqlite ; then + basic_modules="DB,${basic_modules}" + fi + + local digest_modules="password" + use ldap && digest_modules="ldap,${digest_modules}" + + local ext_helpers="ip_user,session,unix_group" + use samba && ext_helpers="wbinfo_group,${ext_helpers}" + use ldap && ext_helpers="ldap_group,${ext_helpers}" + + local ntlm_helpers="fakeauth" + use samba && ntlm_helpers="smb_lm,${ntlm_helpers}" + + local negotiate_helpers= + if use kerberos; then + negotiate_helpers="squid_kerb_auth" + has_version app-crypt/mit-krb5 \ + && myconf="--enable-mit --disable-heimdal" \ + || myconf="--disable-mit --enable-heimdal" + fi + + # coss support has been disabled + # If it is re-enabled again, make sure you don't enable it for elibc_uclibc (#61175) + myconf="${myconf} --enable-storeio=ufs,diskd,aufs" + + if use kernel_linux; then + myconf="${myconf} --enable-linux-netfilter + $(use_enable tproxy linux-tproxy) + $(use_enable epoll)" + elif use kernel_FreeBSD || use kernel_OpenBSD || use kernel_NetBSD ; then + myconf="${myconf} $(use_enable kqueue)" + if use pf-transparent; then + myconf="${myconf} --enable-pf-transparent" + elif use ipf-transparent; then + myconf="${myconf} --enable-ipf-transparent" + fi + fi + + export CC=$(tc-getCC) + + econf \ + --sysconfdir=/etc/squid \ + --libexecdir=/usr/libexec/squid \ + --localstatedir=/var \ + --with-pidfile=/var/run/squid.pid \ + --datadir=/usr/share/squid \ + --with-logdir=/var/log/squid \ + --with-default-user=squid \ + --enable-auth="basic,digest,negotiate,ntlm" \ + --enable-removal-policies="lru,heap" \ + --enable-digest-auth-helpers="${digest_modules}" \ + --enable-basic-auth-helpers="${basic_modules}" \ + --enable-external-acl-helpers="${ext_helpers}" \ + --enable-ntlm-auth-helpers="${ntlm_helpers}" \ + --enable-negotiate-auth-helpers="${negotiate_helpers}" \ + --enable-useragent-log \ + --enable-cache-digests \ + --enable-delay-pools \ + --enable-referer-log \ + --enable-arp-acl \ + --with-large-files \ + --with-filedescriptors=8192 \ + --disable-strict-error-checking \ + $(use_enable caps) \ + $(use_enable ipv6) \ + $(use_enable snmp) \ + $(use_enable ssl) \ + $(use_enable icap-client) \ + $(use_enable ecap) \ + $(use_enable zero-penalty-hit zph-qos) \ + ${myconf} || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + # need suid root for looking into /etc/shadow + fowners root:squid /usr/libexec/squid/ncsa_auth + fowners root:squid /usr/libexec/squid/pam_auth + fperms 4750 /usr/libexec/squid/ncsa_auth + fperms 4750 /usr/libexec/squid/pam_auth + + # some cleanups + rm -f "${D}"/usr/bin/Run* + + dodoc CONTRIBUTORS CREDITS ChangeLog QUICKSTART SPONSORS doc/*.txt \ + helpers/ntlm_auth/no_check/README.no_check_ntlm_auth + newdoc helpers/basic_auth/SMB/README README.auth_smb + dohtml helpers/basic_auth/MSNT/README.html RELEASENOTES.html + newdoc helpers/basic_auth/LDAP/README README.auth_ldap + doman helpers/basic_auth/LDAP/*.8 + dodoc helpers/basic_auth/SASL/squid_sasl_auth* + + newpamd "${FILESDIR}/squid.pam" squid + newconfd "${FILESDIR}/squid.confd" squid + if use logrotate; then + newinitd "${FILESDIR}/squid.initd-logrotate" squid + insinto /etc/logrotate.d + newins "${FILESDIR}/squid.logrotate" squid + else + newinitd "${FILESDIR}/squid.initd" squid + exeinto /etc/cron.weekly + newexe "${FILESDIR}/squid.cron" squid.cron + fi + + rm -rf "${D}"/var + diropts -m0755 -o squid -g squid + keepdir /var/cache/squid /var/log/squid +} + +pkg_postinst() { + echo + ewarn "Squid authentication helpers have been installed suid root." + ewarn "This allows shadow based authentication (see bug #52977 for more)." + echo + ewarn "Be careful what type of cache_dir you select!" + ewarn " 'diskd' is optimized for high levels of traffic, but it might seem slow" + ewarn "when there isn't sufficient traffic to keep squid reasonably busy." + ewarn " If your traffic level is low to moderate, use 'aufs' or 'ufs'." + echo + ewarn "Squid can be configured to run in transparent mode like this:" + ewarn " ${HILITE}http_port internal-addr:3128 transparent${NORMAL}" + if use zero-penalty-hit; then + echo + ewarn "In order for zph_preserve_miss_tos to work, you will have to alter your kernel" + ewarn "with the patch that can be found on http://zph.bratcheda.org site." + fi +} -- cgit v1.2.3