| 1 |
mrness 10/11/27 12:57:05 |
| 2 |
|
| 3 |
Added: squid-3.1.9-qafixes.patch squid-3.1.9-gentoo.patch |
| 4 |
squid-3.1.9-libmd5.patch |
| 5 |
Removed: squid-3.1.6-libmd5.patch squid-2.7.7-gentoo.patch |
| 6 |
squid-3.1.6-bug3011.patch squid-3.1.6-qafixes.patch |
| 7 |
squid-3.1.6-gentoo.patch squid-2-capability.patch |
| 8 |
squid-3-capability.patch |
| 9 |
Log: |
| 10 |
Version bump (#342997). |
| 11 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.1 net-proxy/squid/files/squid-3.1.9-qafixes.patch |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.9-qafixes.patch?rev=1.1&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.9-qafixes.patch?rev=1.1&content-type=text/plain |
| 18 |
|
| 19 |
Index: squid-3.1.9-qafixes.patch |
| 20 |
=================================================================== |
| 21 |
diff -Nru squid-3.1.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.9/helpers/negotiate_auth/squid_kerb_auth/configure.in |
| 22 |
--- squid-3.1.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-11-27 13:44:10.000000000 +0100 |
| 23 |
+++ squid-3.1.9/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-11-27 13:44:46.000000000 +0100 |
| 24 |
@@ -94,7 +94,7 @@ |
| 25 |
else |
| 26 |
ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` |
| 27 |
if test "x$ac_gssapi_libs" != "x" ; then |
| 28 |
- LDFLAGS="$LDFLAGS $ac_gssapi_libs" |
| 29 |
+ LIBS="$LIBS $ac_gssapi_libs" |
| 30 |
else |
| 31 |
for lib in $ac_gss_libs; do |
| 32 |
AC_CHECK_LIB($lib,main) |
| 33 |
@@ -118,7 +118,7 @@ |
| 34 |
fi |
| 35 |
ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null` |
| 36 |
if test "x$ac_gssapi_libs" != "x" ; then |
| 37 |
- LDFLAGS="$LDFLAGS $ac_gssapi_libs" |
| 38 |
+ LIBS="$LIBS $ac_gssapi_libs" |
| 39 |
else |
| 40 |
for lib in $ac_gss_libs; do |
| 41 |
AC_CHECK_LIB($lib,main) |
| 42 |
@@ -172,7 +172,7 @@ |
| 43 |
ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` |
| 44 |
LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" |
| 45 |
fi |
| 46 |
- LDFLAGS="$LDFLAGS $ac_gssapi_libs" |
| 47 |
+ LIBS="$LIBS $ac_gssapi_libs" |
| 48 |
else |
| 49 |
for lib in $ac_gss_libs; do |
| 50 |
AC_CHECK_LIB($lib,main) |
| 51 |
@@ -201,7 +201,7 @@ |
| 52 |
ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'` |
| 53 |
LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2" |
| 54 |
fi |
| 55 |
- LDFLAGS="$LDFLAGS $ac_gssapi_libs" |
| 56 |
+ LIBS="$LIBS $ac_gssapi_libs" |
| 57 |
else |
| 58 |
for lib in $ac_gss_libs; do |
| 59 |
AC_CHECK_LIB($lib,main) |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.1 net-proxy/squid/files/squid-3.1.9-gentoo.patch |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.9-gentoo.patch?rev=1.1&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.9-gentoo.patch?rev=1.1&content-type=text/plain |
| 67 |
|
| 68 |
Index: squid-3.1.9-gentoo.patch |
| 69 |
=================================================================== |
| 70 |
diff -Nru squid-3.1.9.orig/acinclude.m4 squid-3.1.9/acinclude.m4 |
| 71 |
--- squid-3.1.9.orig/acinclude.m4 2010-10-25 13:34:24.000000000 +0200 |
| 72 |
+++ squid-3.1.9/acinclude.m4 2010-11-27 13:43:30.000000000 +0100 |
| 73 |
@@ -75,7 +75,7 @@ |
| 74 |
AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) |
| 75 |
AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ |
| 76 |
ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc |
| 77 |
-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null |
| 78 |
+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null |
| 79 |
res=$? |
| 80 |
rm -f conftest.* |
| 81 |
echo yes |
| 82 |
diff -Nru squid-3.1.9.orig/configure.in squid-3.1.9/configure.in |
| 83 |
--- squid-3.1.9.orig/configure.in 2010-10-25 13:35:32.000000000 +0200 |
| 84 |
+++ squid-3.1.9/configure.in 2010-11-27 13:43:30.000000000 +0100 |
| 85 |
@@ -16,9 +16,9 @@ |
| 86 |
PRESET_LDFLAGS="$LDFLAGS" |
| 87 |
|
| 88 |
dnl Set default LDFLAGS |
| 89 |
-if test -z "$LDFLAGS"; then |
| 90 |
- LDFLAGS="-g" |
| 91 |
-fi |
| 92 |
+dnl if test -z "$LDFLAGS"; then |
| 93 |
+dnl LDFLAGS="-g" |
| 94 |
+dnl fi |
| 95 |
|
| 96 |
dnl Check for GNU cc |
| 97 |
AC_PROG_CC |
| 98 |
diff -Nru squid-3.1.9.orig/helpers/basic_auth/MSNT/confload.c squid-3.1.9/helpers/basic_auth/MSNT/confload.c |
| 99 |
--- squid-3.1.9.orig/helpers/basic_auth/MSNT/confload.c 2010-10-25 13:34:23.000000000 +0200 |
| 100 |
+++ squid-3.1.9/helpers/basic_auth/MSNT/confload.c 2010-11-27 13:43:30.000000000 +0100 |
| 101 |
@@ -27,7 +27,7 @@ |
| 102 |
|
| 103 |
/* Path to configuration file */ |
| 104 |
#ifndef SYSCONFDIR |
| 105 |
-#define SYSCONFDIR "/usr/local/squid/etc" |
| 106 |
+#define SYSCONFDIR "/etc/squid" |
| 107 |
#endif |
| 108 |
#define CONFIGFILE SYSCONFDIR "/msntauth.conf" |
| 109 |
|
| 110 |
diff -Nru squid-3.1.9.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-3.1.9/helpers/basic_auth/MSNT/msntauth.conf.default |
| 111 |
--- squid-3.1.9.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2010-10-25 13:34:24.000000000 +0200 |
| 112 |
+++ squid-3.1.9/helpers/basic_auth/MSNT/msntauth.conf.default 2010-11-27 13:43:30.000000000 +0100 |
| 113 |
@@ -8,6 +8,6 @@ |
| 114 |
server other_PDC other_BDC otherdomain |
| 115 |
|
| 116 |
# Denied and allowed users. Comment these if not needed. |
| 117 |
-#denyusers /usr/local/squid/etc/msntauth.denyusers |
| 118 |
-#allowusers /usr/local/squid/etc/msntauth.allowusers |
| 119 |
+#denyusers /etc/squid/msntauth.denyusers |
| 120 |
+#allowusers /etc/squid/msntauth.allowusers |
| 121 |
|
| 122 |
diff -Nru squid-3.1.9.orig/helpers/basic_auth/SMB/Makefile.am squid-3.1.9/helpers/basic_auth/SMB/Makefile.am |
| 123 |
--- squid-3.1.9.orig/helpers/basic_auth/SMB/Makefile.am 2010-10-25 13:34:24.000000000 +0200 |
| 124 |
+++ squid-3.1.9/helpers/basic_auth/SMB/Makefile.am 2010-11-27 13:43:30.000000000 +0100 |
| 125 |
@@ -16,7 +16,7 @@ |
| 126 |
## FIXME: autoconf should test for the samba path. |
| 127 |
|
| 128 |
SMB_AUTH_HELPER = smb_auth.sh |
| 129 |
-SAMBAPREFIX=/usr/local/samba |
| 130 |
+SAMBAPREFIX=/usr |
| 131 |
SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) |
| 132 |
|
| 133 |
libexec_SCRIPTS = $(SMB_AUTH_HELPER) |
| 134 |
diff -Nru squid-3.1.9.orig/helpers/basic_auth/SMB/smb_auth.sh squid-3.1.9/helpers/basic_auth/SMB/smb_auth.sh |
| 135 |
--- squid-3.1.9.orig/helpers/basic_auth/SMB/smb_auth.sh 2010-10-25 13:34:25.000000000 +0200 |
| 136 |
+++ squid-3.1.9/helpers/basic_auth/SMB/smb_auth.sh 2010-11-27 13:43:30.000000000 +0100 |
| 137 |
@@ -24,7 +24,7 @@ |
| 138 |
read AUTHSHARE |
| 139 |
read AUTHFILE |
| 140 |
read SMBUSER |
| 141 |
-read SMBPASS |
| 142 |
+read -r SMBPASS |
| 143 |
|
| 144 |
# Find domain controller |
| 145 |
echo "Domain name: $DOMAINNAME" |
| 146 |
@@ -47,7 +47,7 @@ |
| 147 |
addropt="" |
| 148 |
fi |
| 149 |
echo "Query address options: $addropt" |
| 150 |
-dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+ / { print $1 ; exit }'` |
| 151 |
+dcip=`$SAMBAPREFIX/bin/nmblookup $addropt "$PASSTHROUGH#1c" | awk '/^[0-9.]+\..+ / { print $1 ; exit }'` |
| 152 |
echo "Domain controller IP address: $dcip" |
| 153 |
[ -n "$dcip" ] || exit 1 |
| 154 |
|
| 155 |
diff -Nru squid-3.1.9.orig/helpers/external_acl/session/squid_session.8 squid-3.1.9/helpers/external_acl/session/squid_session.8 |
| 156 |
--- squid-3.1.9.orig/helpers/external_acl/session/squid_session.8 2010-10-25 13:34:23.000000000 +0200 |
| 157 |
+++ squid-3.1.9/helpers/external_acl/session/squid_session.8 2010-11-27 13:43:30.000000000 +0100 |
| 158 |
@@ -35,7 +35,7 @@ |
| 159 |
.P |
| 160 |
Configuration example using the default automatic mode |
| 161 |
.IP |
| 162 |
-external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/local/squid/libexec/squid_session |
| 163 |
+external_acl_type session ttl=300 negative_ttl=0 children=1 concurrency=200 %LOGIN /usr/libexec/squid/squid_session |
| 164 |
.IP |
| 165 |
acl session external session |
| 166 |
.IP |
| 167 |
diff -Nru squid-3.1.9.orig/helpers/external_acl/unix_group/squid_unix_group.8 squid-3.1.9/helpers/external_acl/unix_group/squid_unix_group.8 |
| 168 |
--- squid-3.1.9.orig/helpers/external_acl/unix_group/squid_unix_group.8 2010-10-25 13:34:25.000000000 +0200 |
| 169 |
+++ squid-3.1.9/helpers/external_acl/unix_group/squid_unix_group.8 2010-11-27 13:43:30.000000000 +0100 |
| 170 |
@@ -27,7 +27,7 @@ |
| 171 |
This squid.conf example defines two Squid acls. usergroup1 matches users in group1, and usergroup2 |
| 172 |
matches users in group2 or group3 |
| 173 |
.IP |
| 174 |
-external_acl_type unix_group %LOGIN /usr/local/squid/libexec/squid_unix_group -p |
| 175 |
+external_acl_type unix_group %LOGIN /usr/libexec/squid/squid_unix_group -p |
| 176 |
.IP |
| 177 |
acl usergroup1 external unix_group group1 |
| 178 |
.IP |
| 179 |
diff -Nru squid-3.1.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.9/helpers/negotiate_auth/squid_kerb_auth/configure.in |
| 180 |
--- squid-3.1.9.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-10-25 13:34:25.000000000 +0200 |
| 181 |
+++ squid-3.1.9/helpers/negotiate_auth/squid_kerb_auth/configure.in 2010-11-27 13:43:30.000000000 +0100 |
| 182 |
@@ -17,6 +17,7 @@ |
| 183 |
|
| 184 |
AC_INIT([squid_kerb_auth],[1.0.5],[markus_moeller@××××××××××.com]) |
| 185 |
AM_INIT_AUTOMAKE(squid_kerb_auth,1.0.5) |
| 186 |
+AM_MAINTAINER_MODE |
| 187 |
AC_CONFIG_SRCDIR([squid_kerb_auth.c]) |
| 188 |
|
| 189 |
AC_PROG_CC |
| 190 |
@@ -467,7 +468,7 @@ |
| 191 |
echo "configure: ##" |
| 192 |
echo "configure: ## -----------------------------##" |
| 193 |
|
| 194 |
-MY_CFLAGS="-Wall -Wextra -Werror -Wcomment -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow" |
| 195 |
+MY_CFLAGS="-Wall -Wextra -Wpointer-arith -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wdeclaration-after-statement -Wshadow" |
| 196 |
for ac_cv_my_cflag in $MY_CFLAGS; do |
| 197 |
echo "int main() |
| 198 |
{ |
| 199 |
diff -Nru squid-3.1.9.orig/lib/libTrie/acinclude.m4 squid-3.1.9/lib/libTrie/acinclude.m4 |
| 200 |
--- squid-3.1.9.orig/lib/libTrie/acinclude.m4 2010-10-25 13:34:24.000000000 +0200 |
| 201 |
+++ squid-3.1.9/lib/libTrie/acinclude.m4 2010-11-27 13:43:30.000000000 +0100 |
| 202 |
@@ -11,7 +11,7 @@ |
| 203 |
AC_MSG_CHECKING([whether compiler accepts -fhuge-objects]) |
| 204 |
AC_CACHE_VAL([ac_cv_test_checkforhugeobjects],[ |
| 205 |
ac_cv_test_checkforhugeobjects=`echo "int main(int argc, char **argv) { int foo; }" > conftest.cc |
| 206 |
-${CXX} -Werror -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null |
| 207 |
+${CXX} -fhuge-objects -o conftest.bin conftest.cc 2>/dev/null |
| 208 |
res=$? |
| 209 |
rm -f conftest.* |
| 210 |
echo yes |
| 211 |
diff -Nru squid-3.1.9.orig/lib/libTrie/configure.in squid-3.1.9/lib/libTrie/configure.in |
| 212 |
--- squid-3.1.9.orig/lib/libTrie/configure.in 2010-10-25 13:34:23.000000000 +0200 |
| 213 |
+++ squid-3.1.9/lib/libTrie/configure.in 2010-11-27 13:43:30.000000000 +0100 |
| 214 |
@@ -59,8 +59,8 @@ |
| 215 |
|
| 216 |
dnl set useful flags |
| 217 |
if test "$GCC" = "yes"; then |
| 218 |
- TRIE_CFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wcomments" |
| 219 |
- TRIE_CXXFLAGS="-Werror -Wall -Wpointer-arith -Wwrite-strings -Wcomments" |
| 220 |
+ TRIE_CFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations" |
| 221 |
+ TRIE_CXXFLAGS="-Wall -Wpointer-arith -Wwrite-strings" |
| 222 |
else |
| 223 |
TRIE_CFLAGS= |
| 224 |
TRIE_CXXFLAGS= |
| 225 |
diff -Nru squid-3.1.9.orig/src/cf.data.pre squid-3.1.9/src/cf.data.pre |
| 226 |
--- squid-3.1.9.orig/src/cf.data.pre 2010-10-25 13:34:25.000000000 +0200 |
| 227 |
+++ squid-3.1.9/src/cf.data.pre 2010-11-27 13:43:30.000000000 +0100 |
| 228 |
@@ -716,6 +716,7 @@ |
| 229 |
acl Safe_ports port 488 # gss-http |
| 230 |
acl Safe_ports port 591 # filemaker |
| 231 |
acl Safe_ports port 777 # multiling http |
| 232 |
+acl Safe_ports port 901 # SWAT |
| 233 |
acl CONNECT method CONNECT |
| 234 |
NOCOMMENT_END |
| 235 |
DOC_END |
| 236 |
@@ -862,6 +863,9 @@ |
| 237 |
http_access allow localnet |
| 238 |
http_access allow localhost |
| 239 |
|
| 240 |
+# Allow the localhost to have access by default |
| 241 |
+http_access allow localhost |
| 242 |
+ |
| 243 |
# And finally deny all other access to this proxy |
| 244 |
http_access deny all |
| 245 |
NOCOMMENT_END |
| 246 |
@@ -4027,11 +4031,11 @@ |
| 247 |
|
| 248 |
NAME: cache_mgr |
| 249 |
TYPE: string |
| 250 |
-DEFAULT: webmaster |
| 251 |
+DEFAULT: root |
| 252 |
LOC: Config.adminEmail |
| 253 |
DOC_START |
| 254 |
Email-address of local cache manager who will receive |
| 255 |
- mail if the cache dies. The default is "webmaster." |
| 256 |
+ mail if the cache dies. The default is "root". |
| 257 |
DOC_END |
| 258 |
|
| 259 |
NAME: mail_from |
| 260 |
@@ -6345,7 +6349,7 @@ |
| 261 |
NAME: forwarded_for |
| 262 |
COMMENT: on|off|transparent|truncate|delete |
| 263 |
TYPE: string |
| 264 |
-DEFAULT: on |
| 265 |
+DEFAULT: delete |
| 266 |
LOC: opt_forwarded_for |
| 267 |
DOC_START |
| 268 |
If set to "on", Squid will append your client's IP address |
| 269 |
diff -Nru squid-3.1.9.orig/src/debug.cc squid-3.1.9/src/debug.cc |
| 270 |
--- squid-3.1.9.orig/src/debug.cc 2010-10-25 13:34:24.000000000 +0200 |
| 271 |
+++ squid-3.1.9/src/debug.cc 2010-11-27 13:43:30.000000000 +0100 |
| 272 |
@@ -452,7 +452,7 @@ |
| 273 |
#if HAVE_SYSLOG && defined(LOG_LOCAL4) |
| 274 |
|
| 275 |
if (Debug::log_syslog) |
| 276 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, syslog_facility); |
| 277 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, syslog_facility); |
| 278 |
|
| 279 |
#endif /* HAVE_SYSLOG */ |
| 280 |
|
| 281 |
diff -Nru squid-3.1.9.orig/src/main.cc squid-3.1.9/src/main.cc |
| 282 |
--- squid-3.1.9.orig/src/main.cc 2010-10-25 13:34:25.000000000 +0200 |
| 283 |
+++ squid-3.1.9/src/main.cc 2010-11-27 13:43:30.000000000 +0100 |
| 284 |
@@ -1556,7 +1556,7 @@ |
| 285 |
if (*(argv[0]) == '(') |
| 286 |
return; |
| 287 |
|
| 288 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
| 289 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); |
| 290 |
|
| 291 |
if ((pid = fork()) < 0) |
| 292 |
syslog(LOG_ALERT, "fork failed: %s", xstrerror()); |
| 293 |
@@ -1600,7 +1600,7 @@ |
| 294 |
|
| 295 |
if ((pid = fork()) == 0) { |
| 296 |
/* child */ |
| 297 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
| 298 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); |
| 299 |
prog = xstrdup(argv[0]); |
| 300 |
argv[0] = xstrdup("(squid)"); |
| 301 |
execvp(prog, argv); |
| 302 |
@@ -1608,7 +1608,7 @@ |
| 303 |
} |
| 304 |
|
| 305 |
/* parent */ |
| 306 |
- openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY | LOG_CONS, LOG_LOCAL4); |
| 307 |
+ openlog(APP_SHORTNAME, LOG_PID | LOG_NDELAY, LOG_DAEMON); |
| 308 |
|
| 309 |
syslog(LOG_NOTICE, "Squid Parent: child process %d started", pid); |
| 310 |
|
| 311 |
diff -Nru squid-3.1.9.orig/src/Makefile.am squid-3.1.9/src/Makefile.am |
| 312 |
--- squid-3.1.9.orig/src/Makefile.am 2010-10-25 13:34:23.000000000 +0200 |
| 313 |
+++ squid-3.1.9/src/Makefile.am 2010-11-27 13:43:30.000000000 +0100 |
| 314 |
@@ -639,7 +639,6 @@ |
| 315 |
|
| 316 |
sysconf_DATA = \ |
| 317 |
squid.conf.default \ |
| 318 |
- squid.conf.documented \ |
| 319 |
mime.conf.default |
| 320 |
|
| 321 |
data_DATA = \ |
| 322 |
@@ -720,8 +719,8 @@ |
| 323 |
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log |
| 324 |
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log |
| 325 |
DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) |
| 326 |
-DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state |
| 327 |
-DEFAULT_SWAP_DIR = $(localstatedir)/cache |
| 328 |
+DEFAULT_NETDB_FILE = $(localstatedir)/run/netdb.state |
| 329 |
+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid |
| 330 |
DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` |
| 331 |
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` |
| 332 |
DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` |
| 333 |
@@ -798,13 +797,11 @@ |
| 334 |
@if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \ |
| 335 |
echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \ |
| 336 |
else \ |
| 337 |
- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ |
| 338 |
- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ |
| 339 |
+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \ |
| 340 |
+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE); \ |
| 341 |
fi |
| 342 |
- echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ |
| 343 |
- $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ |
| 344 |
- echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented"; \ |
| 345 |
- $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).documented; \ |
| 346 |
+ echo "$(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default"; \ |
| 347 |
+ $(INSTALL_DATA) squid.conf.documented $(DESTDIR)$(DEFAULT_CONFIG_FILE).default; \ |
| 348 |
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX); \ |
| 349 |
$(mkinstalldirs) $(DESTDIR)$(DEFAULT_SWAP_DIR); \ |
| 350 |
$(mkinstalldirs) $(DESTDIR)`dirname $(DEFAULT_PIDFILE)` |
| 351 |
|
| 352 |
|
| 353 |
|
| 354 |
1.1 net-proxy/squid/files/squid-3.1.9-libmd5.patch |
| 355 |
|
| 356 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.9-libmd5.patch?rev=1.1&view=markup |
| 357 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/squid/files/squid-3.1.9-libmd5.patch?rev=1.1&content-type=text/plain |
| 358 |
|
| 359 |
Index: squid-3.1.9-libmd5.patch |
| 360 |
=================================================================== |
| 361 |
diff -Nru squid-3.1.9.orig/configure.in squid-3.1.9/configure.in |
| 362 |
--- squid-3.1.9.orig/configure.in 2010-11-27 13:44:10.000000000 +0100 |
| 363 |
+++ squid-3.1.9/configure.in 2010-11-27 13:45:47.000000000 +0100 |
| 364 |
@@ -2786,7 +2786,11 @@ |
| 365 |
dnl libcrypt (eg FreeBSD) |
| 366 |
AC_CHECK_LIB(crypt, crypt, [CRYPTLIB="-lcrypt"]) |
| 367 |
dnl Solaris10 provides MD5 natively through libmd5 |
| 368 |
-AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"]) |
| 369 |
+case "$host" in |
| 370 |
+ *-solaris*) |
| 371 |
+ AC_CHECK_LIB(md5, MD5Init, [CRYPTLIB="$CRYPTLIB -lmd5"]) |
| 372 |
+ ;; |
| 373 |
+esac |
| 374 |
AC_SUBST(CRYPTLIB) |
| 375 |
|
| 376 |
dnl Check for libdl, used by auth_modules/PAM |
Archives