From 0b60b2109c5116904adc86d125ca2a059a7c5bac Mon Sep 17 00:00:00 2001 From: Alin Năstac Date: Tue, 14 Jul 2009 06:35:43 +0000 Subject: Version bump (#277657). (Portage version: 2.1.6.13/cvs/Linux x86_64) --- net-proxy/squid/ChangeLog | 11 +- .../squid/files/squid-3.1.0.8_beta-gentoo.patch | 309 --------------------- .../squid/files/squid-3.1.0.9_beta-gentoo.patch | 309 +++++++++++++++++++++ .../squid/files/squid-3.1.0.9_beta-invconv.patch | 26 ++ net-proxy/squid/squid-3.1.0.8_beta.ebuild | 198 ------------- net-proxy/squid/squid-3.1.0.9_beta.ebuild | 199 +++++++++++++ 6 files changed, 544 insertions(+), 508 deletions(-) delete mode 100644 net-proxy/squid/files/squid-3.1.0.8_beta-gentoo.patch create mode 100644 net-proxy/squid/files/squid-3.1.0.9_beta-gentoo.patch create mode 100644 net-proxy/squid/files/squid-3.1.0.9_beta-invconv.patch delete mode 100644 net-proxy/squid/squid-3.1.0.8_beta.ebuild create mode 100644 net-proxy/squid/squid-3.1.0.9_beta.ebuild (limited to 'net-proxy/squid') diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index 2846e7af2f92..9bb18a9154cd 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-proxy/squid # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.259 2009/07/05 19:49:49 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.260 2009/07/14 06:35:43 mrness Exp $ + +*squid-3.1.0.9_beta (14 Jul 2009) + + 14 Jul 2009; Alin Năstac + -files/squid-3.1.0.8_beta-gentoo.patch, + +files/squid-3.1.0.9_beta-gentoo.patch, + +files/squid-3.1.0.9_beta-invconv.patch, -squid-3.1.0.8_beta.ebuild, + +squid-3.1.0.9_beta.ebuild: + Version bump (#277657). 05 Jul 2009; Markus Meier squid-3.0.15.ebuild: amd64 stable, bug #274405 diff --git a/net-proxy/squid/files/squid-3.1.0.8_beta-gentoo.patch b/net-proxy/squid/files/squid-3.1.0.8_beta-gentoo.patch deleted file mode 100644 index ba68dd7e5640..000000000000 --- a/net-proxy/squid/files/squid-3.1.0.8_beta-gentoo.patch +++ /dev/null @@ -1,309 +0,0 @@ -diff -Nru squid-3.1.0.8.orig/acinclude.m4 squid-3.1.0.8/acinclude.m4 ---- squid-3.1.0.8.orig/acinclude.m4 2009-05-23 14:30:51.000000000 +0200 -+++ squid-3.1.0.8/acinclude.m4 2009-06-16 00:03:52.000000000 +0200 -@@ -73,7 +73,7 @@ - AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) - AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ - ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc --${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null -+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null - res=$? - rm -f conftest.* - echo yes -diff -Nru squid-3.1.0.8.orig/configure.in squid-3.1.0.8/configure.in ---- squid-3.1.0.8.orig/configure.in 2009-05-23 14:31:40.000000000 +0200 -+++ squid-3.1.0.8/configure.in 2009-06-16 00:03:52.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 -@@ -259,13 +259,13 @@ - dnl TODO: check if the problem will be present in any other newer MinGW release. - case "$host_os" in - mingw|mingw32) -- SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments" -+ SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings" - ;; - *) -- SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" -+ SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations" - ;; - esac -- SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments" -+ SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings" - else - SQUID_CFLAGS= - SQUID_CXXFLAGS= -diff -Nru squid-3.1.0.8.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.8/helpers/basic_auth/MSNT/confload.c ---- squid-3.1.0.8.orig/helpers/basic_auth/MSNT/confload.c 2009-05-23 14:30:53.000000000 +0200 -+++ squid-3.1.0.8/helpers/basic_auth/MSNT/confload.c 2009-06-16 00:03:52.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.0.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.8/helpers/basic_auth/MSNT/msntauth.conf.default ---- squid-3.1.0.8.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2009-05-23 14:30:53.000000000 +0200 -+++ squid-3.1.0.8/helpers/basic_auth/MSNT/msntauth.conf.default 2009-06-16 00:03:52.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.0.8.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.8/helpers/basic_auth/SMB/Makefile.am ---- squid-3.1.0.8.orig/helpers/basic_auth/SMB/Makefile.am 2009-05-23 14:30:54.000000000 +0200 -+++ squid-3.1.0.8/helpers/basic_auth/SMB/Makefile.am 2009-06-16 00:03:52.000000000 +0200 -@@ -14,7 +14,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.0.8.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.8/helpers/basic_auth/SMB/smb_auth.sh ---- squid-3.1.0.8.orig/helpers/basic_auth/SMB/smb_auth.sh 2009-05-23 14:30:54.000000000 +0200 -+++ squid-3.1.0.8/helpers/basic_auth/SMB/smb_auth.sh 2009-06-16 00:03:52.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.0.8.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.8/helpers/external_acl/session/squid_session.8 ---- squid-3.1.0.8.orig/helpers/external_acl/session/squid_session.8 2009-05-23 14:30:54.000000000 +0200 -+++ squid-3.1.0.8/helpers/external_acl/session/squid_session.8 2009-06-16 00:03:52.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.0.8.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.8/helpers/external_acl/unix_group/squid_unix_group.8 ---- squid-3.1.0.8.orig/helpers/external_acl/unix_group/squid_unix_group.8 2009-05-23 14:30:54.000000000 +0200 -+++ squid-3.1.0.8/helpers/external_acl/unix_group/squid_unix_group.8 2009-06-16 00:03:52.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.0.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.8/helpers/negotiate_auth/squid_kerb_auth/configure.in ---- squid-3.1.0.8.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-05-23 14:30:55.000000000 +0200 -+++ squid-3.1.0.8/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-06-16 00:03:52.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 -@@ -531,7 +532,7 @@ - dnl set variable for use in automakefile(s) - AM_CONDITIONAL(HAVE_SPNEGO, test x"$ac_cv_have_spnego" = x"yes" ) - --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.0.8.orig/lib/libTrie/acinclude.m4 squid-3.1.0.8/lib/libTrie/acinclude.m4 ---- squid-3.1.0.8.orig/lib/libTrie/acinclude.m4 2009-05-23 14:30:56.000000000 +0200 -+++ squid-3.1.0.8/lib/libTrie/acinclude.m4 2009-06-16 00:03:52.000000000 +0200 -@@ -9,7 +9,7 @@ - AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) - AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ - ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc --${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null -+${CXX} -fhuge-objects -c conftest.cc 2>/dev/null - res=$? - rm -f conftest.* - echo yes -diff -Nru squid-3.1.0.8.orig/lib/libTrie/configure.in squid-3.1.0.8/lib/libTrie/configure.in ---- squid-3.1.0.8.orig/lib/libTrie/configure.in 2009-05-23 14:30:56.000000000 +0200 -+++ squid-3.1.0.8/lib/libTrie/configure.in 2009-06-16 00:03:52.000000000 +0200 -@@ -58,8 +58,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.0.8.orig/src/cf.data.pre squid-3.1.0.8/src/cf.data.pre ---- squid-3.1.0.8.orig/src/cf.data.pre 2009-05-23 14:31:02.000000000 +0200 -+++ squid-3.1.0.8/src/cf.data.pre 2009-06-16 00:03:52.000000000 +0200 -@@ -684,6 +684,8 @@ - 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 purge method PURGE - acl CONNECT method CONNECT - NOCOMMENT_END - DOC_END -@@ -803,6 +805,9 @@ - # Only allow cachemgr access from localhost - http_access allow manager localhost - http_access deny manager -+# Only allow purge requests from localhost -+http_access allow purge localhost -+http_access deny purge - # Deny requests to unknown ports - http_access deny !Safe_ports - # Deny CONNECT to other than SSL ports -@@ -820,6 +825,9 @@ - # from where browsing should be allowed - http_access allow localnet - -+# 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 -@@ -3639,11 +3647,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 -@@ -5761,7 +5769,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.0.8.orig/src/debug.cc squid-3.1.0.8/src/debug.cc ---- squid-3.1.0.8.orig/src/debug.cc 2009-05-23 14:31:03.000000000 +0200 -+++ squid-3.1.0.8/src/debug.cc 2009-06-16 00:03:52.000000000 +0200 -@@ -438,7 +438,7 @@ - #if HAVE_SYSLOG && defined(LOG_LOCAL4) - - if (opt_syslog_enable) -- 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.0.8.orig/src/main.cc squid-3.1.0.8/src/main.cc ---- squid-3.1.0.8.orig/src/main.cc 2009-05-23 14:31:03.000000000 +0200 -+++ squid-3.1.0.8/src/main.cc 2009-06-16 00:03:52.000000000 +0200 -@@ -1514,7 +1514,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()); -@@ -1558,7 +1558,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); -@@ -1566,7 +1566,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.0.8.orig/src/Makefile.am squid-3.1.0.8/src/Makefile.am ---- squid-3.1.0.8.orig/src/Makefile.am 2009-05-23 14:30:58.000000000 +0200 -+++ squid-3.1.0.8/src/Makefile.am 2009-06-16 00:05:55.000000000 +0200 -@@ -637,7 +637,6 @@ - - sysconf_DATA = \ - squid.conf.default \ -- squid.conf.documented \ - mime.conf.default - - data_DATA = \ -@@ -712,8 +711,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)/'` -@@ -749,7 +748,7 @@ - true - - squid.conf.default: squid.conf.documented -- $(EGREP) -v "^[#\ ]" squid.conf.documented | $(EGREP) . >squid.conf.default -+ cp squid.conf.documented squid.conf.default - - cf_parser.h: cf.data cf_gen$(EXEEXT) - ./cf_gen cf.data $(srcdir)/cf.data.depend -@@ -803,8 +802,6 @@ - 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; \ - $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) - - uninstall-local: diff --git a/net-proxy/squid/files/squid-3.1.0.9_beta-gentoo.patch b/net-proxy/squid/files/squid-3.1.0.9_beta-gentoo.patch new file mode 100644 index 000000000000..9307b26a4cbc --- /dev/null +++ b/net-proxy/squid/files/squid-3.1.0.9_beta-gentoo.patch @@ -0,0 +1,309 @@ +diff -Nru squid-3.1.0.9.orig/acinclude.m4 squid-3.1.0.9/acinclude.m4 +--- squid-3.1.0.9.orig/acinclude.m4 2009-06-26 12:35:27.000000000 +0200 ++++ squid-3.1.0.9/acinclude.m4 2009-07-14 07:49:12.000000000 +0200 +@@ -73,7 +73,7 @@ + AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) + AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ + ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc +-${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null ++${CXX} -fhuge-objects -c conftest.cc 2>/dev/null + res=$? + rm -f conftest.* + echo yes +diff -Nru squid-3.1.0.9.orig/configure.in squid-3.1.0.9/configure.in +--- squid-3.1.0.9.orig/configure.in 2009-07-14 07:47:57.000000000 +0200 ++++ squid-3.1.0.9/configure.in 2009-07-14 07:51:03.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 +@@ -259,13 +259,13 @@ + dnl TODO: check if the problem will be present in any other newer MinGW release. + case "$host_os" in + mingw|mingw32) +- SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wcomments" ++ SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings" + ;; + *) +- SQUID_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" ++ SQUID_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations" + ;; + esac +- SQUID_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments" ++ SQUID_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings" + else + SQUID_CFLAGS= + SQUID_CXXFLAGS= +diff -Nru squid-3.1.0.9.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.9/helpers/basic_auth/MSNT/confload.c +--- squid-3.1.0.9.orig/helpers/basic_auth/MSNT/confload.c 2009-06-26 12:35:29.000000000 +0200 ++++ squid-3.1.0.9/helpers/basic_auth/MSNT/confload.c 2009-07-14 07:49:12.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.0.9.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.9/helpers/basic_auth/MSNT/msntauth.conf.default +--- squid-3.1.0.9.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2009-06-26 12:35:29.000000000 +0200 ++++ squid-3.1.0.9/helpers/basic_auth/MSNT/msntauth.conf.default 2009-07-14 07:49:12.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.0.9.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.9/helpers/basic_auth/SMB/Makefile.am +--- squid-3.1.0.9.orig/helpers/basic_auth/SMB/Makefile.am 2009-06-26 12:35:30.000000000 +0200 ++++ squid-3.1.0.9/helpers/basic_auth/SMB/Makefile.am 2009-07-14 07:49:12.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.0.9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.9/helpers/basic_auth/SMB/smb_auth.sh +--- squid-3.1.0.9.orig/helpers/basic_auth/SMB/smb_auth.sh 2009-06-26 12:35:30.000000000 +0200 ++++ squid-3.1.0.9/helpers/basic_auth/SMB/smb_auth.sh 2009-07-14 07:49:12.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.0.9.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.9/helpers/external_acl/session/squid_session.8 +--- squid-3.1.0.9.orig/helpers/external_acl/session/squid_session.8 2009-06-26 12:35:31.000000000 +0200 ++++ squid-3.1.0.9/helpers/external_acl/session/squid_session.8 2009-07-14 07:49:12.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.0.9.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.9/helpers/external_acl/unix_group/squid_unix_group.8 +--- squid-3.1.0.9.orig/helpers/external_acl/unix_group/squid_unix_group.8 2009-06-26 12:35:31.000000000 +0200 ++++ squid-3.1.0.9/helpers/external_acl/unix_group/squid_unix_group.8 2009-07-14 07:49:12.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.0.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.9/helpers/negotiate_auth/squid_kerb_auth/configure.in +--- squid-3.1.0.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-06-26 12:35:31.000000000 +0200 ++++ squid-3.1.0.9/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-07-14 07:49:12.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 +@@ -531,7 +532,7 @@ + dnl set variable for use in automakefile(s) + AM_CONDITIONAL(HAVE_SPNEGO, test x"$ac_cv_have_spnego" = x"yes" ) + +-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.0.9.orig/lib/libTrie/acinclude.m4 squid-3.1.0.9/lib/libTrie/acinclude.m4 +--- squid-3.1.0.9.orig/lib/libTrie/acinclude.m4 2009-06-26 12:35:32.000000000 +0200 ++++ squid-3.1.0.9/lib/libTrie/acinclude.m4 2009-07-14 07:49:12.000000000 +0200 +@@ -9,7 +9,7 @@ + AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) + AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ + ac_cv_test_checkforhugeobjects=`echo "int foo;" > conftest.cc +-${CXX} -Werror -fhuge-objects -c conftest.cc 2>/dev/null ++${CXX} -fhuge-objects -c conftest.cc 2>/dev/null + res=$? + rm -f conftest.* + echo yes +diff -Nru squid-3.1.0.9.orig/lib/libTrie/configure.in squid-3.1.0.9/lib/libTrie/configure.in +--- squid-3.1.0.9.orig/lib/libTrie/configure.in 2009-06-26 12:35:32.000000000 +0200 ++++ squid-3.1.0.9/lib/libTrie/configure.in 2009-07-14 07:49:12.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.0.9.orig/src/cf.data.pre squid-3.1.0.9/src/cf.data.pre +--- squid-3.1.0.9.orig/src/cf.data.pre 2009-06-26 12:35:37.000000000 +0200 ++++ squid-3.1.0.9/src/cf.data.pre 2009-07-14 07:49:12.000000000 +0200 +@@ -685,6 +685,8 @@ + 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 purge method PURGE + acl CONNECT method CONNECT + NOCOMMENT_END + DOC_END +@@ -804,6 +806,9 @@ + # Only allow cachemgr access from localhost + http_access allow manager localhost + http_access deny manager ++# Only allow purge requests from localhost ++http_access allow purge localhost ++http_access deny purge + # Deny requests to unknown ports + http_access deny !Safe_ports + # Deny CONNECT to other than SSL ports +@@ -821,6 +826,9 @@ + # from where browsing should be allowed + http_access allow localnet + ++# 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 +@@ -3690,11 +3698,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 +@@ -5812,7 +5820,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.0.9.orig/src/debug.cc squid-3.1.0.9/src/debug.cc +--- squid-3.1.0.9.orig/src/debug.cc 2009-06-26 12:35:38.000000000 +0200 ++++ squid-3.1.0.9/src/debug.cc 2009-07-14 07:51:54.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.0.9.orig/src/main.cc squid-3.1.0.9/src/main.cc +--- squid-3.1.0.9.orig/src/main.cc 2009-06-26 12:35:39.000000000 +0200 ++++ squid-3.1.0.9/src/main.cc 2009-07-14 07:49:12.000000000 +0200 +@@ -1511,7 +1511,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()); +@@ -1555,7 +1555,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); +@@ -1563,7 +1563,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.0.9.orig/src/Makefile.am squid-3.1.0.9/src/Makefile.am +--- squid-3.1.0.9.orig/src/Makefile.am 2009-06-26 12:35:33.000000000 +0200 ++++ squid-3.1.0.9/src/Makefile.am 2009-07-14 07:49:12.000000000 +0200 +@@ -629,7 +629,6 @@ + + sysconf_DATA = \ + squid.conf.default \ +- squid.conf.documented \ + mime.conf.default + + data_DATA = \ +@@ -704,8 +703,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)/'` +@@ -739,7 +738,7 @@ + true + + squid.conf.default: squid.conf.documented +- $(EGREP) -v "^[#\ ]" squid.conf.documented | $(EGREP) . >squid.conf.default ++ cp squid.conf.documented squid.conf.default + + cf_parser.h: cf.data cf_gen$(EXEEXT) + ./cf_gen cf.data $(srcdir)/cf.data.depend +@@ -793,8 +792,6 @@ + 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; \ + $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX) + + uninstall-local: diff --git a/net-proxy/squid/files/squid-3.1.0.9_beta-invconv.patch b/net-proxy/squid/files/squid-3.1.0.9_beta-invconv.patch new file mode 100644 index 000000000000..7d487c73afc6 --- /dev/null +++ b/net-proxy/squid/files/squid-3.1.0.9_beta-invconv.patch @@ -0,0 +1,26 @@ +diff -Nru squid-3.1.0.9.orig/src/ftp.cc squid-3.1.0.9/src/ftp.cc +--- squid-3.1.0.9.orig/src/ftp.cc 2009-06-26 12:35:38.000000000 +0200 ++++ squid-3.1.0.9/src/ftp.cc 2009-07-14 08:12:44.000000000 +0200 +@@ -526,16 +526,18 @@ + void + FtpStateData::loginParser(const char *login, int escaped) + { +- char *s = NULL; ++ const char *s = NULL; + debugs(9, 4, HERE << ": login='" << login << "', escaped=" << escaped); + debugs(9, 9, HERE << ": IN : login='" << login << "', escaped=" << escaped << ", user=" << user << ", password=" << password); + + if ((s = strchr(login, ':'))) { +- *s = '\0'; +- + /* if there was a username part */ + if (s > login) { +- xstrncpy(user, login, MAX_URL); ++ int len = s - login; ++ if (len > MAX_URL) ++ len = MAX_URL; ++ xstrncpy(user, login, len); ++ user[len] = '\0'; + if (escaped) + rfc1738_unescape(user); + } diff --git a/net-proxy/squid/squid-3.1.0.8_beta.ebuild b/net-proxy/squid/squid-3.1.0.8_beta.ebuild deleted file mode 100644 index bebff9baf1e8..000000000000 --- a/net-proxy/squid/squid-3.1.0.8_beta.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.8_beta.ebuild,v 1.2 2009/06/23 19:45:10 mrness Exp $ - -EAPI="2" - -inherit eutils pam toolchain-funcs linux-info - -RESTRICT="test" # check if test works in next bump - -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/_beta}.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 icap-client logrotate \ - mysql postgres sqlite \ - zero-penalty-hit \ - pf-transparent ipf-transparent kqueue \ - elibc_uclibc kernel_linux epoll" - -COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) - pam? ( virtual/pam ) - ldap? ( net-nds/openldap ) - kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) - ssl? ( dev-libs/openssl ) - sasl? ( dev-libs/cyrus-sasl ) - 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" -RDEPEND="${COMMON_DEPEND} - samba? ( net-fs/samba ) - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - sqlite? ( dev-perl/DBD-SQLite )" - -S="${WORKDIR}/${P/_beta}" - -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 - - enewgroup squid 31 - enewuser squid 31 -1 /var/cache/squid squid -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3-capability.patch - epatch "${FILESDIR}"/${P}-gentoo.patch - - # 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 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 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 \ - --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="password" \ - --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 \ - $(use_enable caps) \ - $(use_enable ipv6) \ - $(use_enable snmp) \ - $(use_enable ssl) \ - $(use_enable icap-client) \ - $(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 -} diff --git a/net-proxy/squid/squid-3.1.0.9_beta.ebuild b/net-proxy/squid/squid-3.1.0.9_beta.ebuild new file mode 100644 index 000000000000..af351b18b8c3 --- /dev/null +++ b/net-proxy/squid/squid-3.1.0.9_beta.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.9_beta.ebuild,v 1.1 2009/07/14 06:35:43 mrness Exp $ + +EAPI="2" + +inherit eutils pam toolchain-funcs linux-info + +RESTRICT="test" # check if test works in next bump + +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/_beta}.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 icap-client logrotate \ + mysql postgres sqlite \ + zero-penalty-hit \ + pf-transparent ipf-transparent kqueue \ + elibc_uclibc kernel_linux epoll" + +COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 ) + pam? ( virtual/pam ) + ldap? ( net-nds/openldap ) + kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) + ssl? ( dev-libs/openssl ) + sasl? ( dev-libs/cyrus-sasl ) + 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" +RDEPEND="${COMMON_DEPEND} + samba? ( net-fs/samba ) + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg ) + sqlite? ( dev-perl/DBD-SQLite )" + +S="${WORKDIR}/${P/_beta}" + +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 + + enewgroup squid 31 + enewuser squid 31 -1 /var/cache/squid squid +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3-capability.patch + epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-invconv.patch + + # 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 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 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 \ + --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="password" \ + --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 \ + $(use_enable caps) \ + $(use_enable ipv6) \ + $(use_enable snmp) \ + $(use_enable ssl) \ + $(use_enable icap-client) \ + $(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-65-gdbad