rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- upgrade to latest upstream 2.6.STABLE16

Browse Source
This commit is contained in:
Martin Bacovsky 2007-09-14 06:18:59 +00:00
parent be4e2f1835
commit b4a4477887
4 changed files with 56 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
squid-2.6.STABLE14.tar.bz2
squid-2.6.STABLE16.tar.bz2

2
sources
View File

@ -1 +1 @@
eadb138d48320df8b99349121159c6bf squid-2.6.STABLE14.tar.bz2
849bee6f269e6c773f215fd4b41de0e3 squid-2.6.STABLE16.tar.bz2

86
squid-2.6.STABLE14-config.patch → squid-2.6.STABLE16-config.patch
View File

@ -1,6 +1,7 @@
--- squid-2.6.STABLE14/src/cf.data.pre.config 2007-06-26 01:34:57.000000000 +0200
+++ squid-2.6.STABLE14/src/cf.data.pre 2007-07-19 21:22:45.000000000 +0200
@@ -2961,6 +2961,7 @@
diff -up squid-2.6.STABLE16/src/cf.data.pre.config squid-2.6.STABLE16/src/cf.data.pre
--- squid-2.6.STABLE16/src/cf.data.pre.config 2007-09-05 23:50:15.000000000 +0200
+++ squid-2.6.STABLE16/src/cf.data.pre 2007-09-07 15:11:59.000000000 +0200
@@ -692,6 +692,7 @@ http_access deny CONNECT !SSL_ports
#http_access allow our_networks
# And finally deny all other access to this proxy
@ -8,7 +9,25 @@
http_access deny all
NOCOMMENT_END
DOC_END
@@ -3243,11 +3244,11 @@
@@ -2250,7 +2251,7 @@ DOC_END
NAME: logfile_rotate
TYPE: int
-DEFAULT: 10
+DEFAULT: 0
LOC: Config.Log.rotateNumber
DOC_START
Specifies the number of logfile rotations to make when you
@@ -2266,6 +2267,8 @@ DOC_START
purposes, so -k rotate uses another signal. It is best to get
in the habit of using 'squid -k rotate' instead of 'kill -USR1
<pid>'.
+
+logfile_rotate 0
DOC_END
NAME: emulate_httpd_log
@@ -3342,11 +3345,11 @@ COMMENT_END
NAME: cache_mgr
TYPE: string
@ -22,7 +41,7 @@
DOC_END
NAME: mail_from
@@ -3275,21 +3276,22 @@
@@ -3374,21 +3377,22 @@ DOC_END
NAME: cache_effective_user
TYPE: string
@ -48,7 +67,7 @@
LOC: Config.effectiveGroup
DOC_START
If you want Squid to run with a specific GID regardless of
@@ -3299,6 +3301,7 @@
@@ -3398,6 +3402,7 @@ DOC_START
and only this GID is effective. If Squid is not started as
root the user starting Squid must be member of the specified
group.
@ -56,25 +75,23 @@
DOC_END
NAME: httpd_suppress_version_string
@@ -3929,7 +3932,7 @@
NAME: logfile_rotate
TYPE: int
-DEFAULT: 10
@@ -4018,12 +4023,12 @@ COMMENT_END
NAME: snmp_port
TYPE: ushort
LOC: Config.Port.snmp
-DEFAULT: 3401
+DEFAULT: 0
LOC: Config.Log.rotateNumber
IFDEF: SQUID_SNMP
DOC_START
Specifies the number of logfile rotations to make when you
@@ -3945,6 +3948,8 @@
purposes, so -k rotate uses another signal. It is best to get
in the habit of using 'squid -k rotate' instead of 'kill -USR1
<pid>'.
+
+logfile_rotate 0
Squid can now serve statistics and status information via SNMP.
- By default it listens to port 3401 on the machine. If you don't
- wish to use SNMP, set this to "0".
+ A value of "0" disables SNMP support. If you wish to use SNMP,
+ set this to "3401" to use the normal SNMP support.
DOC_END
NAME: append_domain
@@ -4546,10 +4551,18 @@
NAME: snmp_access
@@ -4402,15 +4407,22 @@ TYPE: string
LOC: Config.errorDirectory
DEFAULT: @DEFAULT_ERROR_DIR@
DOC_START
@ -91,24 +108,17 @@
+ either to customize them to suit your language or company,
+ copy the template English files to another
directory and point this tag at them.
-
- The squid developers are interested in making squid available in
- a wide variety of languages. If you are making translations for a
- langauge that Squid does not currently provide please consider
- contributing your translation back to the project.
+
+ The squid developers are interested in making squid available in
+ a wide variety of languages. If you are making translations for a
+ langauge that Squid does not currently provide please consider
+ contributing your translation back to the project.
+error_directory @DEFAULT_ERROR_DIR@
DOC_END
NAME: maximum_single_addr_tries
@@ -4583,12 +4596,12 @@
NAME: snmp_port
TYPE: ushort
LOC: Config.Port.snmp
-DEFAULT: 3401
+DEFAULT: 0
IFDEF: SQUID_SNMP
DOC_START
Squid can now serve statistics and status information via SNMP.
- By default it listens to port 3401 on the machine. If you don't
- wish to use SNMP, set this to "0".
+ A value of "0" disables SNMP support. If you wish to use SNMP,
+ set this to "3401" to use the normal SNMP support.
DOC_END
NAME: snmp_access
NAME: error_map

9
squid.spec
View File

@ -4,8 +4,8 @@
Summary: The Squid proxy caching server
Name: squid
Version: 2.6.STABLE14
Release: 2%{?dist}
Version: 2.6.STABLE16
Release: 1%{?dist}
Epoch: 7
License: GPL
Group: System Environment/Daemons
@ -26,7 +26,7 @@ Source98: perl-requires-squid.sh
# Local patches
# Applying upstream patches first makes it less likely that local patches
# will break upstream ones.
Patch201: squid-2.6.STABLE14-config.patch
Patch201: squid-2.6.STABLE16-config.patch
Patch202: squid-2.5.STABLE4-location.patch
Patch203: squid-2.6.STABLE2-build.patch
Patch204: squid-2.5.STABLE4-perlpath.patch
@ -326,6 +326,9 @@ fi
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
%changelog
* Fri Sep 14 2007 Martin Bacovsky <mbacovsk@redhat.com> - 7:2.6.STABLE16-1
- upgrade to latest upstream 2.6.STABLE16
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 7:2.6.STABLE14-2
- Rebuild for selinux ppc32 issue.