[squid/f14] 3.1.15 SQUID-2011:3

[Henrik Nordström]

commit 1f7165b708195585b940456f658b532d620f930c
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Mon Aug 29 09:12:18 2011 +0200

    3.1.15 SQUID-2011:3

 .gitignore |    2 ++
 sources    |    4 ++--
 squid.spec |   38 +++++++++++++++++++++-----------------
 3 files changed, 25 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 171d7a8..d58490b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ squid-3.1-10021.patch
 /squid-3.1.12.tar.bz2.asc
 /squid-3.1.14.tar.bz2
 /squid-3.1.14.tar.bz2.asc
+/squid-3.1.15.tar.bz2
+/squid-3.1.15.tar.bz2.asc
diff --git a/sources b/sources
index 61cfc2b..71a48e3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8f82a451b04c3bf3c29202c548d2f2dd  squid-3.1.14.tar.bz2
-2b7412515e0da07bc525b1115b8c6b51  squid-3.1.14.tar.bz2.asc
+73d47363ddccc400bc0fb2f814c63a92  squid-3.1.15.tar.bz2
+564bab02326216828cb76d198582a115  squid-3.1.15.tar.bz2.asc
diff --git a/squid.spec b/squid.spec
index a7afecf..49b02db 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,11 +3,12 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.1.14
+Version:  3.1.15
 Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
-License:  GPLv2
+# 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.1/squid-%{version}.tar.bz2
@@ -93,7 +94,7 @@ export LDFLAGS="-pie"
    --libexecdir=%{_libdir}/squid \
    --localstatedir=/var \
    --datadir=%{_datadir}/squid \
-   --sysconfdir=/etc/squid \
+   --sysconfdir=%{_sysconfdir}/squid \
    --with-logdir='$(localstatedir)/log/squid' \
    --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
@@ -141,7 +142,7 @@ make \
 	install
 echo "
 #
-# This is /etc/httpd/conf.d/squid.conf
+# This is %{_sysconfdir}/httpd/conf.d/squid.conf
 #
 
 ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
@@ -155,18 +156,18 @@ ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
 </Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
 
 
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-mkdir -p $RPM_BUILD_ROOT/etc/pam.d
-mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d/
-mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d
-install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/squid
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/squid
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/squid
-install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid
-install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT/etc/httpd/conf.d/squid.conf
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/20-squid
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/squid
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/squid
+install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/squid
+install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/squid
+install -m 644 $RPM_BUILD_ROOT/squid.httpd.tmp $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/squid.conf
+install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/20-squid
 mkdir -p $RPM_BUILD_ROOT/var/log/squid
 mkdir -p $RPM_BUILD_ROOT/var/spool/squid
 chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
@@ -178,7 +179,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/snmp/mibs
 mv $RPM_BUILD_ROOT/usr/share/squid/mib.txt $RPM_BUILD_ROOT/usr/share/snmp/mibs/SQUID-MIB.txt
 
 # squid.conf.documented is documentation. We ship that in doc/
-rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/squid/squid.conf.documented
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_bindir}/{RunAccel,RunCache}
@@ -267,6 +268,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Aug 29 2011 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.1.15-1
+- update to latest upstream 3.1.15 fixing SQUID-2011:3
+
 * Fri Jul 22 2011 Jiri Skala <jskala at redhat.com> - 7:3.1.14-1
 - Update to 3.1.14 upstream release