This commit is contained in:
Henrik Nordstrom 2015-03-15 13:10:10 +01:00
parent ba09037440
commit 4979fbd147
2 changed files with 17 additions and 11 deletions

View File

@ -1,2 +1,2 @@
632b4dfc3d40b419cb4c060e01d547bf squid-3.4.12.tar.xz 0330ec9f69e333c2a81fa4502ba96a22 squid-3.5.2.tar.xz
d29da67f153b861aa29513208f55f0ef squid-3.4.12.tar.xz.asc 77e21831ec7f982fc87459e7a746ef67 squid-3.5.2.tar.xz.asc

View File

@ -1,7 +1,7 @@
%define __perl_requires %{SOURCE98} %define __perl_requires %{SOURCE98}
Name: squid Name: squid
Version: 3.4.12 Version: 3.5.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
@ -9,8 +9,8 @@ Epoch: 7
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.4/squid-%{version}.tar.xz Source0: http://www.squid-cache.org/Versions/v3/3.5/squid-%{version}.tar.xz
Source1: http://www.squid-cache.org/Versions/v3/3.4/squid-%{version}.tar.xz.asc Source1: http://www.squid-cache.org/Versions/v3/3.5/squid-%{version}.tar.xz.asc
Source2: squid.logrotate Source2: squid.logrotate
Source3: squid.sysconfig Source3: squid.sysconfig
Source4: squid.pam Source4: squid.pam
@ -90,9 +90,12 @@ lookup program (dnsserver), a program for retrieving FTP data
%patch201 -p1 -b .config %patch201 -p1 -b .config
%patch202 -p1 -b .location %patch202 -p1 -b .location
%patch203 -p1 -b .perlpath %patch203 -p1 -b .perlpath
%patch204 -p1 -b .fpic # Fails on 3.5.1
%patch205 -p1 -b .ltdl #%patch204 -p1 -b .fpic
%patch206 -p1 -b .active-ftp # Fails on 3.5.1
#%patch205 -p1 -b .ltdl
# Fails on 3.5.1
#%patch206 -p1 -b .active-ftp
%build %build
%ifarch sparcv9 sparc64 s390 s390x %ifarch sparcv9 sparc64 s390 s390x
@ -116,7 +119,7 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now"
--enable-eui \ --enable-eui \
--enable-follow-x-forwarded-for \ --enable-follow-x-forwarded-for \
--enable-auth \ --enable-auth \
--enable-auth-basic="DB,LDAP,MSNT,MSNT-multi-domain,NCSA,NIS,PAM,POP3,RADIUS,SASL,SMB,getpwnam" \ --enable-auth-basic="DB,LDAP,MSNT-multi-domain,NCSA,NIS,PAM,POP3,RADIUS,SASL,SMB,getpwnam" \
--enable-auth-ntlm="smb_lm,fake" \ --enable-auth-ntlm="smb_lm,fake" \
--enable-auth-digest="file,LDAP,eDirectory" \ --enable-auth-digest="file,LDAP,eDirectory" \
--enable-auth-negotiate="kerberos" \ --enable-auth-negotiate="kerberos" \
@ -231,9 +234,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/squid/mime.conf %config(noreplace) %{_sysconfdir}/squid/mime.conf
%config(noreplace) %{_sysconfdir}/squid/errorpage.css %config(noreplace) %{_sysconfdir}/squid/errorpage.css
%config(noreplace) %{_sysconfdir}/sysconfig/squid %config(noreplace) %{_sysconfdir}/sysconfig/squid
%config(noreplace) %{_sysconfdir}/squid/msntauth.conf
# These are not noreplace because they are just sample config files # These are not noreplace because they are just sample config files
%config %{_sysconfdir}/squid/msntauth.conf.default
%config %{_sysconfdir}/squid/squid.conf.default %config %{_sysconfdir}/squid/squid.conf.default
%config %{_sysconfdir}/squid/mime.conf.default %config %{_sysconfdir}/squid/mime.conf.default
%config %{_sysconfdir}/squid/errorpage.css.default %config %{_sysconfdir}/squid/errorpage.css.default
@ -290,6 +291,11 @@ fi
%changelog %changelog
* Fri Mar 15 2015 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.5.2-1
- Update to latest upstream version 3.5.2
- Remove deprecated (and renamed) squid_msnt_auth basic auth helper. Only
performs LM authentication and not considered useful in todays networks.
* Wed Feb 25 2015 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.4.12-1 * Wed Feb 25 2015 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.4.12-1
- Update to latest upstream version 3.4.12 - Update to latest upstream version 3.4.12
- bug #1173946: Disable -march=native compile time optimization, use Fedora defaults. - bug #1173946: Disable -march=native compile time optimization, use Fedora defaults.