| 1 |
eras 12/08/27 13:56:01 |
| 2 |
|
| 3 |
Added: squid-3.2.1-gentoo.patch |
| 4 |
Log: |
| 5 |
Version bump - bug #431554 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-proxy/squid/files/squid-3.2.1-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.2.1-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.2.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: squid-3.2.1-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/configure.ac b/configure.ac |
| 18 |
index a863327..deb44ed 100644 |
| 19 |
--- a/configure.ac |
| 20 |
+++ b/configure.ac |
| 21 |
@@ -26,9 +26,9 @@ PRESET_CFLAGS="$CFLAGS" |
| 22 |
PRESET_LDFLAGS="$LDFLAGS" |
| 23 |
|
| 24 |
dnl Set default LDFLAGS |
| 25 |
-if test "x$LDFLAGS" = "x" ; then |
| 26 |
- LDFLAGS="-g" |
| 27 |
-fi |
| 28 |
+dnl if test "x$LDFLAGS" = "x" ; then |
| 29 |
+dnl LDFLAGS="-g" |
| 30 |
+dnl fi |
| 31 |
|
| 32 |
# Check for GNU cc |
| 33 |
AC_PROG_CC |
| 34 |
diff --git a/helpers/basic_auth/SMB/basic_smb_auth.sh b/helpers/basic_auth/SMB/basic_smb_auth.sh |
| 35 |
index 2a1abb3..b3ebb7a 100755 |
| 36 |
--- a/helpers/basic_auth/SMB/basic_smb_auth.sh |
| 37 |
+++ b/helpers/basic_auth/SMB/basic_smb_auth.sh |
| 38 |
@@ -24,7 +24,7 @@ read NMBCAST |
| 39 |
read AUTHSHARE |
| 40 |
read AUTHFILE |
| 41 |
read SMBUSER |
| 42 |
-read SMBPASS |
| 43 |
+read -r SMBPASS |
| 44 |
|
| 45 |
# Find domain controller |
| 46 |
echo "Domain name: $DOMAINNAME" |
| 47 |
@@ -47,7 +47,7 @@ else |
| 48 |
addropt="" |
| 49 |
fi |
| 50 |
echo "Query address options: $addropt" |
| 51 |
-dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` |
| 52 |
+dcip=`nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` |
| 53 |
echo "Domain controller IP address: $dcip" |
| 54 |
[ -n "$dcip" ] || exit 1 |
| 55 |
|
| 56 |
diff --git a/src/Makefile.am b/src/Makefile.am |
| 57 |
index 6b69267..10f506a 100644 |
| 58 |
--- a/src/Makefile.am |
| 59 |
+++ b/src/Makefile.am |
| 60 |
@@ -867,8 +867,8 @@ DEFAULT_LOG_PREFIX = $(DEFAULT_LOG_DIR) |
| 61 |
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log |
| 62 |
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log |
| 63 |
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log |
| 64 |
-DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state |
| 65 |
-DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/ssl_db |
| 66 |
+DEFAULT_NETDB_FILE = $(localstatedir)/lib/squid/netdb.state |
| 67 |
+DEFAULT_SSL_DB_DIR = $(localstatedir)/lib/squid/ssl_db |
| 68 |
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` |
| 69 |
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` |
| 70 |
DEFAULT_LOGFILED = $(libexecdir)/`echo log_file_daemon | sed '$(transform);s/$$/$(EXEEXT)/'` |
| 71 |
diff --git a/src/cf.data.pre b/src/cf.data.pre |
| 72 |
index 697233e..311c3ea 100644 |
| 73 |
--- a/src/cf.data.pre |
| 74 |
+++ b/src/cf.data.pre |
| 75 |
@@ -906,6 +906,7 @@ acl Safe_ports port 280 # http-mgmt |
| 76 |
acl Safe_ports port 488 # gss-http |
| 77 |
acl Safe_ports port 591 # filemaker |
| 78 |
acl Safe_ports port 777 # multiling http |
| 79 |
+acl Safe_ports port 901 # SWAT |
| 80 |
acl CONNECT method CONNECT |
| 81 |
NOCOMMENT_END |
| 82 |
DOC_END |
| 83 |
@@ -4778,11 +4782,11 @@ COMMENT_END |
| 84 |
|
| 85 |
NAME: cache_mgr |
| 86 |
TYPE: string |
| 87 |
-DEFAULT: webmaster |
| 88 |
+DEFAULT: root |
| 89 |
LOC: Config.adminEmail |
| 90 |
DOC_START |
| 91 |
Email-address of local cache manager who will receive |
| 92 |
- mail if the cache dies. The default is "webmaster." |
| 93 |
+ mail if the cache dies. The default is "root". |
| 94 |
DOC_END |
| 95 |
|
| 96 |
NAME: mail_from |
| 97 |
@@ -7442,7 +7446,7 @@ DOC_END |
| 98 |
NAME: forwarded_for |
| 99 |
COMMENT: on|off|transparent|truncate|delete |
| 100 |
TYPE: string |
| 101 |
-DEFAULT: on |
| 102 |
+DEFAULT: delete |
| 103 |
LOC: opt_forwarded_for |
| 104 |
DOC_START |
| 105 |
If set to "on", Squid will append your client's IP address |
| 106 |
diff --git a/src/debug.cc b/src/debug.cc |
| 107 |
index 64ab0ba..062119a 100644 |
| 108 |
--- a/src/debug.cc |
| 109 |
+++ b/src/debug.cc |
| 110 |
@@ -450,7 +450,7 @@ _db_init(const char *logfile, const char *options) |
| 111 |
#if HAVE_SYSLOG && defined(LOG_LOCAL4) |
| 112 |
|
| 113 |
if (Debug::log_syslog) |
| 114 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); |
| 115 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); |
| 116 |
|
| 117 |
#endif /* HAVE_SYSLOG */ |
| 118 |
|
| 119 |
diff --git a/src/main.cc b/src/main.cc |
| 120 |
index d6eb01a..0b93f0e 100644 |
| 121 |
--- a/src/main.cc |
| 122 |
+++ b/src/main.cc |
| 123 |
@@ -1657,7 +1657,7 @@ watch_child(char *argv[]) |
| 124 |
if (!IamMasterProcess()) |
| 125 |
return; |
| 126 |
|
| 127 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
| 128 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); |
| 129 |
|
| 130 |
if ((pid = fork()) < 0) |
| 131 |
syslog(LOG_ALERT, "fork failed: %s", xstrerror()); |
| 132 |
@@ -1720,7 +1720,7 @@ watch_child(char *argv[]) |
| 133 |
|
| 134 |
if ((pid = fork()) == 0) { |
| 135 |
/* child */ |
| 136 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
| 137 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); |
| 138 |
prog = argv[0]; |
| 139 |
argv[0] = const_cast<char*>(kid.name().termedBuf()); |
| 140 |
execvp(prog, argv); |
| 141 |
@@ -1733,7 +1733,7 @@ watch_child(char *argv[]) |
| 142 |
} |
| 143 |
|
| 144 |
/* parent */ |
| 145 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
| 146 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_LOCAL4); |
| 147 |
|
| 148 |
squid_signal(SIGINT, SIG_IGN, SA_RESTART); |
Archives