Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 227903 Details for
Bug 311927
net-proxy/squid-3.1.5 bump request
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated squid-${PV}-gentoo.patch
squid-3.1.1-gentoo.patch (text/plain), 12.05 KB, created by
Cosmin Giradu
on 2010-04-15 13:07:48 UTC
(
hide
)
Description:
Updated squid-${PV}-gentoo.patch
Filename:
MIME Type:
Creator:
Cosmin Giradu
Created:
2010-04-15 13:07:48 UTC
Size:
12.05 KB
patch
obsolete
>diff -Nru squid-3.1.1.orig/acinclude.m4 squid-3.1.1/acinclude.m4 >--- squid-3.1.1.orig/acinclude.m4 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/acinclude.m4 2010-04-15 16:28:17.000000000 +0300 >@@ -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.1.orig/configure.in squid-3.1.1/configure.in >--- squid-3.1.1.orig/configure.in 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/configure.in 2010-04-15 16:28:49.000000000 +0300 >@@ -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.1.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.1/helpers/basic_auth/MSNT/confload.c >--- squid-3.1.1.orig/helpers/basic_auth/MSNT/confload.c 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/helpers/basic_auth/MSNT/confload.c 2010-04-15 16:29:51.000000000 +0300 >@@ -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.1.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.1/helpers/basic_auth/MSNT/msntauth.conf.default >--- squid-3.1.1.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/helpers/basic_auth/MSNT/msntauth.conf.default 2010-04-15 16:30:39.000000000 +0300 >@@ -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.1.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.1/helpers/basic_auth/SMB/Makefile.am >--- squid-3.1.1.orig/helpers/basic_auth/SMB/Makefile.am 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/helpers/basic_auth/SMB/Makefile.am 2010-04-15 16:31:23.000000000 +0300 >@@ -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.1.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.1/helpers/basic_auth/SMB/smb_auth.sh >--- squid-3.1.1.orig/helpers/basic_auth/SMB/smb_auth.sh 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/helpers/basic_auth/SMB/smb_auth.sh 2010-04-15 16:32:48.000000000 +0300 >@@ -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.1.orig/helpers/external_acl/session/squid_session.8 squid-3.1.1/helpers/external_acl/session/squid_session.8 >--- squid-3.1.1.orig/helpers/external_acl/session/squid_session.8 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/helpers/external_acl/session/squid_session.8 2010-04-15 16:33:36.000000000 +0300 >@@ -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.1.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.1/helpers/external_acl/unix_group/squid_unix_group.8 >--- squid-3.1.1.orig/helpers/external_acl/unix_group/squid_unix_group.8 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/helpers/external_acl/unix_group/squid_unix_group.8 2010-04-15 16:34:17.000000000 +0300 >@@ -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.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in >--- squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-04-15 17:35:20.000000000 +0300 >@@ -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.1.orig/lib/libTrie/acinclude.m4 squid-3.1.1/lib/libTrie/acinclude.m4 >--- squid-3.1.1.orig/lib/libTrie/acinclude.m4 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/lib/libTrie/acinclude.m4 2010-04-15 17:35:48.000000000 +0300 >@@ -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.1.orig/lib/libTrie/configure.in squid-3.1.1/lib/libTrie/configure.in >--- squid-3.1.1.orig/lib/libTrie/configure.in 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/lib/libTrie/configure.in 2010-04-15 17:36:46.000000000 +0300 >@@ -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.1.orig/src/Makefile.am squid-3.1.1/src/Makefile.am >--- squid-3.1.1.orig/src/Makefile.am 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/src/Makefile.am 2010-04-15 17:44:39.000000000 +0300 >@@ -638,7 +638,6 @@ > > sysconf_DATA = \ > squid.conf.default \ >- squid.conf.documented \ > mime.conf.default > > data_DATA = \ >@@ -718,8 +717,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) > > uninstall-local: squid.conf.default >diff -Nru squid-3.1.1.orig/src/cf.data.pre squid-3.1.1/src/cf.data.pre >--- squid-3.1.1.orig/src/cf.data.pre 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/src/cf.data.pre 2010-04-15 17:39:56.000000000 +0300 >@@ -718,6 +718,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 >@@ -867,6 +868,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 >@@ -4037,11 +4041,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 >@@ -6353,7 +6357,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.1.orig/src/debug.cc squid-3.1.1/src/debug.cc >--- squid-3.1.1.orig/src/debug.cc 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/src/debug.cc 2010-04-15 17:40:27.000000000 +0300 >@@ -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.1.orig/src/main.cc squid-3.1.1/src/main.cc >--- squid-3.1.1.orig/src/main.cc 2010-04-15 16:27:19.000000000 +0300 >+++ squid-3.1.1/src/main.cc 2010-04-15 17:41:34.000000000 +0300 >@@ -1535,7 +1535,7 @@ > if (*(argv[0]) == '(') > return; > >- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); >+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); > > if ((pid = fork()) < 0) > syslog(LOG_ALERT, "fork failed: %s", xstrerror()); >@@ -1579,7 +1579,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_LOCAL4); > prog = xstrdup(argv[0]); > argv[0] = xstrdup("(squid)"); > execvp(prog, argv); >@@ -1587,7 +1587,7 @@ > } > > /* parent */ >- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); >+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); > > syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=227903">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 311927
:
227901
|
227903
|
227905
|
227907
|
230083
|
231689
|
238797
|
238799
|
238801
|
238803
|
238805
|
238807
|
238809
