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

Update to 4.0.11

Browse Source
This commit is contained in:
Henrik Nordstrom 2016-07-11 21:22:16 +02:00
parent deedcea681
commit 6610733bd9
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sources
View File

@ -1,2 +1,2 @@
a1d990284c429a63ee85d80ee5b3b8b9 squid-3.5.19.tar.xz 94a0c36cd4ef969b94054e75c0993c83 squid-4.0.11.tar.xz
f3c868d716f88b9ac8c848897c323634 squid-3.5.19.tar.xz.asc b423f44bd39e5f848d9fa0e9401b6d84 squid-4.0.11.tar.xz.asc

11
squid-3.1.0.9-config.patch → squid-4.0.11-config.patch
View File

@ -1,6 +1,7 @@
--- ./src/cf.data.pre 2013-04-27 05:34:48.000000000 +0200 diff -up squid-4.0.11/src/cf.data.pre.config squid-4.0.11/src/cf.data.pre
+++ ./src/cf.data.pre 2013-05-03 10:13:16.007067356 +0200 --- squid-4.0.11/src/cf.data.pre.config 2016-06-09 22:32:57.000000000 +0200
@@ -4178,7 +4178,7 @@ +++ squid-4.0.11/src/cf.data.pre 2016-07-11 21:08:35.090976840 +0200
@@ -4658,7 +4658,7 @@ DOC_END
NAME: logfile_rotate NAME: logfile_rotate
TYPE: int TYPE: int
@ -8,8 +9,8 @@
+DEFAULT: 0 +DEFAULT: 0
LOC: Config.Log.rotateNumber LOC: Config.Log.rotateNumber
DOC_START DOC_START
Specifies the number of logfile rotations to make when you Specifies the default number of logfile rotations to make when you
@@ -5782,11 +5782,11 @@ @@ -6444,11 +6444,11 @@ COMMENT_END
NAME: cache_mgr NAME: cache_mgr
TYPE: string TYPE: string

17
squid.spec
View File

@ -1,16 +1,16 @@
%define __perl_requires %{SOURCE98} %define __perl_requires %{SOURCE98}
Name: squid Name: squid
Version: 3.5.19 Version: 4.0.11
Release: 2%{?dist} Release: 1%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code # See CREDITS for breakdown of non GPLv2+ code
License: GPLv2+ and (LGPLv2+ and MIT and BSD and Public Domain) License: GPLv2+ and (LGPLv2+ and MIT and BSD and Public Domain)
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.squid-cache.org URL: http://www.squid-cache.org
Source0: http://www.squid-cache.org/Versions/v3/3.5/squid-%{version}.tar.xz Source0: http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz
Source1: http://www.squid-cache.org/Versions/v3/3.5/squid-%{version}.tar.xz.asc Source1: http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz.asc
Source2: squid.logrotate Source2: squid.logrotate
Source3: squid.sysconfig Source3: squid.sysconfig
Source4: squid.pam Source4: squid.pam
@ -27,7 +27,7 @@ Source98: perl-requires-squid.sh
# Local patches # Local patches
# Applying upstream patches first makes it less likely that local patches # Applying upstream patches first makes it less likely that local patches
# will break upstream ones. # will break upstream ones.
Patch201: squid-3.1.0.9-config.patch Patch201: squid-4.0.11-config.patch
Patch202: squid-3.1.0.9-location.patch Patch202: squid-3.1.0.9-location.patch
Patch203: squid-3.0.STABLE1-perlpath.patch Patch203: squid-3.0.STABLE1-perlpath.patch
Patch204: squid-3.5.9-include-guards.patch Patch204: squid-3.5.9-include-guards.patch
@ -115,8 +115,8 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
--enable-eui \ --enable-eui \
--enable-follow-x-forwarded-for \ --enable-follow-x-forwarded-for \
--enable-auth \ --enable-auth \
--enable-auth-basic="DB,LDAP,MSNT-multi-domain,NCSA,NIS,PAM,POP3,RADIUS,SASL,SMB,getpwnam" \ --enable-auth-basic="DB,fake,getpwnam,LDAP,NCSA,NIS,PAM,POP3,RADIUS,SASL,SMB,SMB_LM" \
--enable-auth-ntlm="smb_lm,fake" \ --enable-auth-ntlm="SMB_LM,fake" \
--enable-auth-digest="file,LDAP" \ --enable-auth-digest="file,LDAP" \
--enable-auth-negotiate="kerberos" \ --enable-auth-negotiate="kerberos" \
--enable-external-acl-helpers="LDAP_group,time_quota,session,unix_group,wbinfo_group" \ --enable-external-acl-helpers="LDAP_group,time_quota,session,unix_group,wbinfo_group" \
@ -287,6 +287,9 @@ fi
%changelog %changelog
* Mon Jul 11 2016 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:4.0.11-1
- new version 4.0.11
* Wed May 18 2016 Luboš Uhliarik <luhliari@redhat.com> - 7:3.5.19-2 * Wed May 18 2016 Luboš Uhliarik <luhliari@redhat.com> - 7:3.5.19-2
- Resolves: #1336993 - Mistyped command in dirname - Resolves: #1336993 - Mistyped command in dirname
/etc/NetworkManager/dispatcher.d/20-squid /etc/NetworkManager/dispatcher.d/20-squid