Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-proxy/squid
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-05-28 05:23:45 +0000
committerAlin Năstac <mrness@gentoo.org>2007-05-28 05:23:45 +0000
commitd11536ee0d7239f40ebc776e0f7a7844bfc2592c (patch)
tree404d7eafcc0f7fa80a1dc5952ceaf37fc11b5228 /net-proxy/squid
parentRemove obsolete versions. Version bump (#180067). Add qos patch and USE flag ... (diff)
downloadhistorical-d11536ee0d7239f40ebc776e0f7a7844bfc2592c.tar.gz
historical-d11536ee0d7239f40ebc776e0f7a7844bfc2592c.tar.bz2
historical-d11536ee0d7239f40ebc776e0f7a7844bfc2592c.zip
correct some default paths
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'net-proxy/squid')
-rw-r--r--net-proxy/squid/Manifest14
-rw-r--r--net-proxy/squid/files/squid-2.6.13-gentoo.patch58
2 files changed, 54 insertions, 18 deletions
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index aa37a7710fbe..17bf7dce1fca 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -13,10 +13,10 @@ AUX squid-2.6.13-ToS_Hit_ToS_Preserve.patch 7810 RMD160 273973cc1f5072a21410ae11
MD5 beecfea2c05de23050e344666bc6fae0 files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch 7810
RMD160 273973cc1f5072a21410ae11b7da3e1996467bb6 files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch 7810
SHA256 68248b85f59e743a4944575b95a6d7d8f31ff48947bec6bb6d5845a6bcd55553 files/squid-2.6.13-ToS_Hit_ToS_Preserve.patch 7810
-AUX squid-2.6.13-gentoo.patch 13104 RMD160 61f3fb7dd3d07fb13378dedce2d656bd49e26a91 SHA1 722784ffa932d2a3898c662901f07452d3ed1b6c SHA256 b00ac55600f700a9be6a67ad694072e1f54666e3bc9e1a01b59e8b30cbfbcb49
-MD5 0eef467fb46939a84386cb2b3ce47bb1 files/squid-2.6.13-gentoo.patch 13104
-RMD160 61f3fb7dd3d07fb13378dedce2d656bd49e26a91 files/squid-2.6.13-gentoo.patch 13104
-SHA256 b00ac55600f700a9be6a67ad694072e1f54666e3bc9e1a01b59e8b30cbfbcb49 files/squid-2.6.13-gentoo.patch 13104
+AUX squid-2.6.13-gentoo.patch 14841 RMD160 23a036615850a8470a48fe4c2754a29dd5590bad SHA1 807075a7dc7286a278b00e97b49ed969428f9978 SHA256 7651661bc29e47efb00d67a068042bd795ae0c78ba4518a770027a644e7e4a2f
+MD5 f514c82161bc293ce22d0c3534f15c90 files/squid-2.6.13-gentoo.patch 14841
+RMD160 23a036615850a8470a48fe4c2754a29dd5590bad files/squid-2.6.13-gentoo.patch 14841
+SHA256 7651661bc29e47efb00d67a068042bd795ae0c78ba4518a770027a644e7e4a2f files/squid-2.6.13-gentoo.patch 14841
AUX squid-2.6.13-qos.patch 9677 RMD160 2f0446dd7e76d9d3779d3f191c2dc50e792063fb SHA1 49b3794bb00ba28537caa4c29f830c52f6076513 SHA256 0e041ae5cc2461f2b2a1592fab46ea4ff6dae2df43fb10ae27ec88d5eaee35cc
MD5 103dd991681d1d0ee65cb565a00e3218 files/squid-2.6.13-qos.patch 9677
RMD160 2f0446dd7e76d9d3779d3f191c2dc50e792063fb files/squid-2.6.13-qos.patch 9677
@@ -72,7 +72,7 @@ SHA256 04d841d3dc6bf9aad0831ec3ecb08ef55aeb12fc23dec3d3c500e804d5d90dfc files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (GNU/Linux)
-iD8DBQFGWmOUJnxX6mF440QRAsTUAKCZrufTVdJjxB3gkoVhTp7RG4F/BACg6+dA
-xuqwE7JsQViQ6fdWAVga9uY=
-=CIHE
+iD8DBQFGWmdrJnxX6mF440QRAmwqAJ0SuFgj3B+DDwxcAo9QeVeeDLwKJwCeKGSS
+lRCwfIcgEDAFJaWnT5DbElc=
+=4ggx
-----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-2.6.13-gentoo.patch b/net-proxy/squid/files/squid-2.6.13-gentoo.patch
index f2c9e0f4d064..f25c388f3f6e 100644
--- a/net-proxy/squid/files/squid-2.6.13-gentoo.patch
+++ b/net-proxy/squid/files/squid-2.6.13-gentoo.patch
@@ -1,6 +1,30 @@
+diff -Nru squid-2.6.STABLE13.orig/helpers/basic_auth/MSNT/confload.c squid-2.6.STABLE13/helpers/basic_auth/MSNT/confload.c
+--- squid-2.6.STABLE13.orig/helpers/basic_auth/MSNT/confload.c 2002-06-26 22:09:48.000000000 +0300
++++ squid-2.6.STABLE13/helpers/basic_auth/MSNT/confload.c 2007-05-28 08:16:10.000000000 +0300
+@@ -24,7 +24,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-2.6.STABLE13.orig/helpers/basic_auth/MSNT/msntauth.conf.default squid-2.6.STABLE13/helpers/basic_auth/MSNT/msntauth.conf.default
+--- squid-2.6.STABLE13.orig/helpers/basic_auth/MSNT/msntauth.conf.default 2002-06-26 21:44:28.000000000 +0300
++++ squid-2.6.STABLE13/helpers/basic_auth/MSNT/msntauth.conf.default 2007-05-28 08:15:06.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-2.6.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.STABLE13/helpers/basic_auth/SMB/Makefile.am
--- squid-2.6.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am 2005-05-17 19:56:26.000000000 +0300
-+++ squid-2.6.STABLE13/helpers/basic_auth/SMB/Makefile.am 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/helpers/basic_auth/SMB/Makefile.am 2007-05-28 08:13:59.000000000 +0300
@@ -14,7 +14,7 @@
## FIXME: autoconf should test for the samba path.
@@ -12,7 +36,7 @@ diff -Nru squid-2.6.STABLE13.orig/helpers/basic_auth/SMB/Makefile.am squid-2.6.S
libexec_SCRIPTS = $(SMB_AUTH_HELPER)
diff -Nru squid-2.6.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.STABLE13/helpers/basic_auth/SMB/smb_auth.sh
--- squid-2.6.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh 2001-01-08 01:36:46.000000000 +0200
-+++ squid-2.6.STABLE13/helpers/basic_auth/SMB/smb_auth.sh 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/helpers/basic_auth/SMB/smb_auth.sh 2007-05-28 08:13:59.000000000 +0300
@@ -24,7 +24,7 @@
read AUTHSHARE
read AUTHFILE
@@ -33,7 +57,7 @@ diff -Nru squid-2.6.STABLE13.orig/helpers/basic_auth/SMB/smb_auth.sh squid-2.6.S
diff -Nru squid-2.6.STABLE13.orig/snmplib/snmp_api.c squid-2.6.STABLE13/snmplib/snmp_api.c
--- squid-2.6.STABLE13.orig/snmplib/snmp_api.c 2006-06-02 20:32:44.000000000 +0300
-+++ squid-2.6.STABLE13/snmplib/snmp_api.c 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/snmplib/snmp_api.c 2007-05-28 08:13:59.000000000 +0300
@@ -121,7 +121,7 @@
}
@@ -43,9 +67,21 @@ diff -Nru squid-2.6.STABLE13.orig/snmplib/snmp_api.c squid-2.6.STABLE13/snmplib/
* the input pdu. length is the length of the input packet. If any errors
* are encountered, NULL is returned. If not, the community is.
*/
+diff -Nru squid-2.6.STABLE13.orig/src/access_log.c squid-2.6.STABLE13/src/access_log.c
+--- squid-2.6.STABLE13.orig/src/access_log.c 2007-02-03 23:59:24.000000000 +0200
++++ squid-2.6.STABLE13/src/access_log.c 2007-05-28 08:15:36.000000000 +0300
+@@ -1225,7 +1225,7 @@
+ LogfileStatus = LOG_ENABLE;
+ }
+ #if HEADERS_LOG
+- headerslog = logfileOpen("/usr/local/squid/logs/headers.log", MAX_URL << 1, 0);
++ headerslog = logfileOpen("/var/log/squid/headers.log", MAX_URL << 1, 0);
+ assert(NULL != headerslog);
+ #endif
+ #if FORW_VIA_DB
diff -Nru squid-2.6.STABLE13.orig/src/auth/digest/auth_digest.c squid-2.6.STABLE13/src/auth/digest/auth_digest.c
--- squid-2.6.STABLE13.orig/src/auth/digest/auth_digest.c 2006-07-31 02:27:04.000000000 +0300
-+++ squid-2.6.STABLE13/src/auth/digest/auth_digest.c 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/src/auth/digest/auth_digest.c 2007-05-28 08:13:59.000000000 +0300
@@ -1271,7 +1271,7 @@
nonce = authenticateDigestNonceFindNonce(digest_request->nonceb64);
if (!nonce) {
@@ -68,7 +104,7 @@ diff -Nru squid-2.6.STABLE13.orig/src/auth/digest/auth_digest.c squid-2.6.STABLE
/* we don't need the scheme specific data anymore */
diff -Nru squid-2.6.STABLE13.orig/src/cf.data.pre squid-2.6.STABLE13/src/cf.data.pre
--- squid-2.6.STABLE13.orig/src/cf.data.pre 2007-04-25 00:30:03.000000000 +0300
-+++ squid-2.6.STABLE13/src/cf.data.pre 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/src/cf.data.pre 2007-05-28 08:13:59.000000000 +0300
@@ -344,12 +344,12 @@
NAME: htcp_port
IFDEF: USE_HTCP
@@ -174,7 +210,7 @@ diff -Nru squid-2.6.STABLE13.orig/src/cf.data.pre squid-2.6.STABLE13/src/cf.data
NAME: snmp_access
diff -Nru squid-2.6.STABLE13.orig/src/client_side.c squid-2.6.STABLE13/src/client_side.c
--- squid-2.6.STABLE13.orig/src/client_side.c 2007-03-20 23:26:34.000000000 +0200
-+++ squid-2.6.STABLE13/src/client_side.c 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/src/client_side.c 2007-05-28 08:13:59.000000000 +0300
@@ -4591,14 +4591,7 @@
debug(83, 2) ("clientNegotiateSSL: Session %p reused on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
} else {
@@ -192,7 +228,7 @@ diff -Nru squid-2.6.STABLE13.orig/src/client_side.c squid-2.6.STABLE13/src/clien
debug(83, 2) ("clientNegotiateSSL: New session %p on FD %d (%s:%d)\n", SSL_get_session(ssl), fd, fd_table[fd].ipaddr, (int) fd_table[fd].remote_port);
diff -Nru squid-2.6.STABLE13.orig/src/defines.h squid-2.6.STABLE13/src/defines.h
--- squid-2.6.STABLE13.orig/src/defines.h 2007-02-04 00:58:20.000000000 +0200
-+++ squid-2.6.STABLE13/src/defines.h 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/src/defines.h 2007-05-28 08:13:59.000000000 +0300
@@ -259,7 +259,7 @@
/* were to look for errors if config path fails */
@@ -204,7 +240,7 @@ diff -Nru squid-2.6.STABLE13.orig/src/defines.h squid-2.6.STABLE13/src/defines.h
/* gb_type operations */
diff -Nru squid-2.6.STABLE13.orig/src/delay_pools.c squid-2.6.STABLE13/src/delay_pools.c
--- squid-2.6.STABLE13.orig/src/delay_pools.c 2006-10-23 14:22:21.000000000 +0300
-+++ squid-2.6.STABLE13/src/delay_pools.c 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/src/delay_pools.c 2007-05-28 08:13:59.000000000 +0300
@@ -613,7 +613,7 @@
}
@@ -216,7 +252,7 @@ diff -Nru squid-2.6.STABLE13.orig/src/delay_pools.c squid-2.6.STABLE13/src/delay
*/
diff -Nru squid-2.6.STABLE13.orig/src/main.c squid-2.6.STABLE13/src/main.c
--- squid-2.6.STABLE13.orig/src/main.c 2007-03-13 00:25:40.000000000 +0200
-+++ squid-2.6.STABLE13/src/main.c 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/src/main.c 2007-05-28 08:13:59.000000000 +0300
@@ -372,6 +372,22 @@
asnFreeMemory();
}
@@ -296,7 +332,7 @@ diff -Nru squid-2.6.STABLE13.orig/src/main.c squid-2.6.STABLE13/src/main.c
squid_signal(SIGINT, SIG_IGN, SA_RESTART);
diff -Nru squid-2.6.STABLE13.orig/src/Makefile.am squid-2.6.STABLE13/src/Makefile.am
--- squid-2.6.STABLE13.orig/src/Makefile.am 2007-05-06 01:06:55.000000000 +0300
-+++ squid-2.6.STABLE13/src/Makefile.am 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/src/Makefile.am 2007-05-28 08:13:59.000000000 +0300
@@ -320,12 +320,12 @@
DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
@@ -315,7 +351,7 @@ diff -Nru squid-2.6.STABLE13.orig/src/Makefile.am squid-2.6.STABLE13/src/Makefil
DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
diff -Nru squid-2.6.STABLE13.orig/src/mib.txt squid-2.6.STABLE13/src/mib.txt
--- squid-2.6.STABLE13.orig/src/mib.txt 2006-09-22 05:49:24.000000000 +0300
-+++ squid-2.6.STABLE13/src/mib.txt 2007-05-28 07:26:25.000000000 +0300
++++ squid-2.6.STABLE13/src/mib.txt 2007-05-28 08:13:59.000000000 +0300
@@ -314,7 +314,7 @@
MAX-ACCESS read-only
STATUS current