Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch')
-rw-r--r--net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch311
1 files changed, 0 insertions, 311 deletions
diff --git a/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch b/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch
deleted file mode 100644
index 79eea0969888..000000000000
--- a/net-proxy/squid/files/squid-3.1.0.7_beta-gentoo.patch
+++ /dev/null
@@ -1,311 +0,0 @@
-diff -Nru squid-3.1.0.7.orig/acinclude.m4 squid-3.1.0.7/acinclude.m4
---- squid-3.1.0.7.orig/acinclude.m4 2009-04-08 10:50:50.000000000 +0000
-+++ squid-3.1.0.7/acinclude.m4 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/configure.in squid-3.1.0.7/configure.in
---- squid-3.1.0.7.orig/configure.in 2009-04-08 10:51:47.000000000 +0000
-+++ squid-3.1.0.7/configure.in 2009-04-26 10:58:36.000000000 +0000
-@@ -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
-@@ -243,13 +243,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.7.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.0.7/helpers/basic_auth/MSNT/confload.c
---- squid-3.1.0.7.orig/helpers/basic_auth/MSNT/confload.c 2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/MSNT/confload.c 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.0.7/helpers/basic_auth/MSNT/msntauth.conf.default
---- squid-3.1.0.7.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/MSNT/msntauth.conf.default 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.0.7/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.0.7.orig/helpers/basic_auth/SMB/Makefile.am 2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/SMB/Makefile.am 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.0.7/helpers/basic_auth/SMB/smb_auth.sh
---- squid-3.1.0.7.orig/helpers/basic_auth/SMB/smb_auth.sh 2009-04-08 10:50:55.000000000 +0000
-+++ squid-3.1.0.7/helpers/basic_auth/SMB/smb_auth.sh 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/external_acl/session/squid_session.8 squid-3.1.0.7/helpers/external_acl/session/squid_session.8
---- squid-3.1.0.7.orig/helpers/external_acl/session/squid_session.8 2009-04-08 10:50:56.000000000 +0000
-+++ squid-3.1.0.7/helpers/external_acl/session/squid_session.8 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.0.7/helpers/external_acl/unix_group/squid_unix_group.8
---- squid-3.1.0.7.orig/helpers/external_acl/unix_group/squid_unix_group.8 2009-04-08 10:50:56.000000000 +0000
-+++ squid-3.1.0.7/helpers/external_acl/unix_group/squid_unix_group.8 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.7/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.0.7.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-04-08 10:50:56.000000000 +0000
-+++ squid-3.1.0.7/helpers/negotiate_auth/squid_kerb_auth/configure.in 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/lib/libTrie/acinclude.m4 squid-3.1.0.7/lib/libTrie/acinclude.m4
---- squid-3.1.0.7.orig/lib/libTrie/acinclude.m4 2009-04-08 10:50:58.000000000 +0000
-+++ squid-3.1.0.7/lib/libTrie/acinclude.m4 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/lib/libTrie/configure.in squid-3.1.0.7/lib/libTrie/configure.in
---- squid-3.1.0.7.orig/lib/libTrie/configure.in 2009-04-08 10:50:58.000000000 +0000
-+++ squid-3.1.0.7/lib/libTrie/configure.in 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/src/cf.data.pre squid-3.1.0.7/src/cf.data.pre
---- squid-3.1.0.7.orig/src/cf.data.pre 2009-04-08 10:51:03.000000000 +0000
-+++ squid-3.1.0.7/src/cf.data.pre 2009-04-26 10:58:36.000000000 +0000
-@@ -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
-@@ -3614,11 +3622,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
-@@ -5736,7 +5744,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.7.orig/src/debug.cc squid-3.1.0.7/src/debug.cc
---- squid-3.1.0.7.orig/src/debug.cc 2009-04-08 10:51:03.000000000 +0000
-+++ squid-3.1.0.7/src/debug.cc 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/src/main.cc squid-3.1.0.7/src/main.cc
---- squid-3.1.0.7.orig/src/main.cc 2009-04-08 10:51:05.000000000 +0000
-+++ squid-3.1.0.7/src/main.cc 2009-04-26 10:58:36.000000000 +0000
-@@ -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.7.orig/src/Makefile.am squid-3.1.0.7/src/Makefile.am
---- squid-3.1.0.7.orig/src/Makefile.am 2009-04-08 10:51:02.000000000 +0000
-+++ squid-3.1.0.7/src/Makefile.am 2009-04-26 10:59:13.000000000 +0000
-@@ -638,7 +638,6 @@
-
- sysconf_DATA = \
- squid.conf.default \
-- squid.conf.documented \
- mime.conf.default
-
- data_DATA = \
-@@ -712,9 +711,9 @@
- DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid
--DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR = $(localstatedir)/cache
-+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid
-+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)/'`
-@@ -750,7 +749,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
-@@ -804,8 +803,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: