From 6610733bd93dc511398704f8c3d9d60098c88d2c Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Mon, 11 Jul 2016 21:22:16 +0200 Subject: [PATCH] Update to 4.0.11 --- sources | 4 ++-- ....9-config.patch => squid-4.0.11-config.patch | 11 ++++++----- squid.spec | 17 ++++++++++------- 3 files changed, 18 insertions(+), 14 deletions(-) rename squid-3.1.0.9-config.patch => squid-4.0.11-config.patch (52%) diff --git a/sources b/sources index 55204d5..80ca119 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a1d990284c429a63ee85d80ee5b3b8b9 squid-3.5.19.tar.xz -f3c868d716f88b9ac8c848897c323634 squid-3.5.19.tar.xz.asc +94a0c36cd4ef969b94054e75c0993c83 squid-4.0.11.tar.xz +b423f44bd39e5f848d9fa0e9401b6d84 squid-4.0.11.tar.xz.asc diff --git a/squid-3.1.0.9-config.patch b/squid-4.0.11-config.patch similarity index 52% rename from squid-3.1.0.9-config.patch rename to squid-4.0.11-config.patch index 436875c..a4faae8 100644 --- a/squid-3.1.0.9-config.patch +++ b/squid-4.0.11-config.patch @@ -1,6 +1,7 @@ ---- ./src/cf.data.pre 2013-04-27 05:34:48.000000000 +0200 -+++ ./src/cf.data.pre 2013-05-03 10:13:16.007067356 +0200 -@@ -4178,7 +4178,7 @@ +diff -up squid-4.0.11/src/cf.data.pre.config squid-4.0.11/src/cf.data.pre +--- squid-4.0.11/src/cf.data.pre.config 2016-06-09 22:32:57.000000000 +0200 ++++ 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 TYPE: int @@ -8,8 +9,8 @@ +DEFAULT: 0 LOC: Config.Log.rotateNumber DOC_START - Specifies the number of logfile rotations to make when you -@@ -5782,11 +5782,11 @@ + Specifies the default number of logfile rotations to make when you +@@ -6444,11 +6444,11 @@ COMMENT_END NAME: cache_mgr TYPE: string diff --git a/squid.spec b/squid.spec index bcf8eb1..d38b4ff 100644 --- a/squid.spec +++ b/squid.spec @@ -1,16 +1,16 @@ %define __perl_requires %{SOURCE98} Name: squid -Version: 3.5.19 -Release: 2%{?dist} +Version: 4.0.11 +Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 # See CREDITS for breakdown of non GPLv2+ code License: GPLv2+ and (LGPLv2+ and MIT and BSD and Public Domain) Group: System Environment/Daemons URL: http://www.squid-cache.org -Source0: http://www.squid-cache.org/Versions/v3/3.5/squid-%{version}.tar.xz -Source1: http://www.squid-cache.org/Versions/v3/3.5/squid-%{version}.tar.xz.asc +Source0: http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz +Source1: http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz.asc Source2: squid.logrotate Source3: squid.sysconfig Source4: squid.pam @@ -27,7 +27,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-3.1.0.9-config.patch +Patch201: squid-4.0.11-config.patch Patch202: squid-3.1.0.9-location.patch Patch203: squid-3.0.STABLE1-perlpath.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-follow-x-forwarded-for \ --enable-auth \ - --enable-auth-basic="DB,LDAP,MSNT-multi-domain,NCSA,NIS,PAM,POP3,RADIUS,SASL,SMB,getpwnam" \ - --enable-auth-ntlm="smb_lm,fake" \ + --enable-auth-basic="DB,fake,getpwnam,LDAP,NCSA,NIS,PAM,POP3,RADIUS,SASL,SMB,SMB_LM" \ + --enable-auth-ntlm="SMB_LM,fake" \ --enable-auth-digest="file,LDAP" \ --enable-auth-negotiate="kerberos" \ --enable-external-acl-helpers="LDAP_group,time_quota,session,unix_group,wbinfo_group" \ @@ -287,6 +287,9 @@ fi %changelog +* Mon Jul 11 2016 Henrik Nordstrom - 7:4.0.11-1 +- new version 4.0.11 + * Wed May 18 2016 Luboš Uhliarik - 7:3.5.19-2 - Resolves: #1336993 - Mistyped command in dirname /etc/NetworkManager/dispatcher.d/20-squid