Accepting request 159652 from home:bruno_friedmann:branches:server:proxy

Rework the systemd squid.service to make it able to intialize cache directory (squid -z) fixing bnc#802635
Removing the unneeded bash wrapper
Upgrade to bugfixes upstream release 3.2.9

- New revision for squid.service (using only sed)
  handle multiple cache_dir line
  Added sed as require 
- Packaging : fixed systemd squid.service 
	- Rework on squid.service ExecStartPre line 
	  remove dependency on unfunctionnal wrapper 
	- Fix bnc#802635 (creating cache struture fail on first call)
	- Fixed Type=forking and remove the use off -N (non daemon flag)
	- Fixed missing pid file
	- Structural : add all -k to end of Exec/Stop line
	- Ulimit : Added LimitNOFile=4096 ( same value as in /etc/sysconfig)
		but there's no way to decode dynamically /etc/sysconfig
	- Remove syslog.target ( no need anymore : advise from fcrozat )
	- Clean up squid_cache_build.sh 
- Changes to squid-3.2.9 (12 Mar 2013):
	- Regression fix: Accept-Language header parse
	- Bug 3673: Silence 'Failed to select source' messages
	- Fix authentication headers sent on peer digest requests
	- Fix build error on Solaris, OpenIndiana, Omnios
- Changes to squid-3.2.8 (02 Mar 2013):
	- Bug 3767: tcp_outgoing_tos/mark ACLs do not obey acl_uses_indirect_client
	- Bug 3763: diskd Error: no filename in shm buffer
	- Bug 3752: objects that cannot be cached in memory are not cached on disk
	- Bug 3753: Removes the domain from the cache_peer server pconn key
	- Bug 3749: IDENT lookup using wrong ports to identify the user
	- Bug 3723: tcp_outgoing_tos/mark broken for CONNECT requests
	- Bug 3686: cache_dir max-size default fails
	- Bug 3515: crash in FtpStateData::ftpTimeout
	- Bug 3329: Quieten orphan Comm::Connection messages
	- Make squid -z for cache_dir rock preserve the rock DB

OBS-URL: https://build.opensuse.org/request/show/159652
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=34

squid-3.2.7.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85d2e0d6273af0b6167f1d328ef8a81d2b5659d60c9280d94fbc64cee6e9af1d
-size 2893325

squid-3.2.7.tar.bz2.asc

@@ -1,20 +0,0 @@
-File: squid-3.2.7.tar.bz2
-Date: Fri Feb  1 11:24:08 UTC 2013
-Size: 2893325
-MD5 : 3e4d21b24c39d5066791017919866a64
-SHA1: 3e22bd64258a4232c51d7bfd0344a6c54522cab5
-Key : 0xFF5CF463 <squid3@treenet.co.nz>
-      fingerprint = EA31 CC5E 9488 E516 8D2D  CC5E B268 E706 FF5C F463
-      keyring = http://www.squid-cache.org/pgp.asc
-      keyserver = subkeys.pgp.net
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQEcBAABAgAGBQJRC6h9AAoJELJo5wb/XPRjuWsH/iX7FNcwSuMihU1Lf4tMjpzF
-XnvpVsfidTTdYXW8YBT6+sSD3ocBfCv+/fnUlYzUCovTxapZmratuLRCcSed9/UM
-7yZIpI05R+WDMBDQMv807JF/MKIIo83aRGcfkY+8n5k0mLIFdyx2KWZLg2q7Ngou
-/5n9vxqr2afak3DODKBHG28BG3McdjJ+oiFaYb7jHuiLkBafRdvhoGm4yVJCP2gY
-Znf0VXqGD0DdlTFWh3uUX8hDSZbTdiyTTl93KJdrnujUbx6zhTNMRZcaSclK8pIO
-veqb4jFMawNgZDn2mXXea5lStYB2h5u4KcnZRIOW0DpCd0Ylud6EbAQMSbRdhF4=
-=j8x/
------END PGP SIGNATURE-----

squid-3.2.9.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82d3d4cecfa4379b5197026198e34870a26977e6f6b175f5257241a3075767e6
+size 2897511

squid-3.2.9.tar.bz2.asc

@@ -0,0 +1,20 @@
+File: squid-3.2.9.tar.bz2
+Date: Tue Mar 12 10:47:39 UTC 2013
+Size: 2897511
+MD5 : de02be3c1f72e0d818374438044261a6
+SHA1: a2cec791e333a492a1d243c2e6228cb93a9de39d
+Key : 0xFF5CF463 <squid3@treenet.co.nz>
+      fingerprint = EA31 CC5E 9488 E516 8D2D  CC5E B268 E706 FF5C F463
+      keyring = http://www.squid-cache.org/pgp.asc
+      keyserver = subkeys.pgp.net
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQEcBAABAgAGBQJRP76eAAoJELJo5wb/XPRjVeMH+wYmoYLcIwLMjnhCoQRLDEjP
+YAbgpaspWisUNKwUsAeb4c58wIA/OXYalD+4B6evNKMz5EhLNAPCP+VdQj8FERU8
+7ibeOgXmNPizuDpwMVJAeAIcVVp8+QjswBGBoMDXgr/5wmJrF2238N3VuqwYwZ5R
+vFcpIDK/2yUh09os6ncR3j7BTe9A7qUU4AVcYiBL670U/ASHhGhh8rihRVlbhCJY
+BrwBb+nGQUwnjwCptzC4dONv/hZYJ55WZ/j29xQS5OfDeJM91l4VGdoGOCwMgjLi
+ygx4dbMfKv86e+WxfHmuyXajgMe+IwarUmlDQxHQpaVS+kksM6avj3YbieIo8/0=
+=jsS7
+-----END PGP SIGNATURE-----

squid.changes

@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Fri Mar 15 10:31:02 UTC 2013 - bruno@ioda-net.ch
+
+- New revision for squid.service (using only sed)
+  handle multiple cache_dir line
+  Added sed as require 
+
+Thu Mar 14 13:08:54 UTC 2013 - bruno@ioda-net.ch
+
+- Packaging : fixed systemd squid.service 
+	- Rework on squid.service ExecStartPre line 
+	  remove dependency on unfunctionnal wrapper 
+	- Fix bnc#802635 (creating cache struture fail on first call)
+	- Fixed Type=forking and remove the use off -N (non daemon flag)
+	- Fixed missing pid file
+	- Structural : add all -k to end of Exec/Stop line
+	- Ulimit : Added LimitNOFile=4096 ( same value as in /etc/sysconfig)
+		but there's no way to decode dynamically /etc/sysconfig
+	- Remove syslog.target ( no need anymore : advise from fcrozat )
+	- Clean up squid_cache_build.sh 
+- Changes to squid-3.2.9 (12 Mar 2013):
+	- Regression fix: Accept-Language header parse
+	- Bug 3673: Silence 'Failed to select source' messages
+	- Fix authentication headers sent on peer digest requests
+	- Fix build error on Solaris, OpenIndiana, Omnios
+
+- Changes to squid-3.2.8 (02 Mar 2013):
+
+	- Bug 3767: tcp_outgoing_tos/mark ACLs do not obey acl_uses_indirect_client
+	- Bug 3763: diskd Error: no filename in shm buffer
+	- Bug 3752: objects that cannot be cached in memory are not cached on disk
+	- Bug 3753: Removes the domain from the cache_peer server pconn key
+	- Bug 3749: IDENT lookup using wrong ports to identify the user
+	- Bug 3723: tcp_outgoing_tos/mark broken for CONNECT requests
+	- Bug 3686: cache_dir max-size default fails
+	- Bug 3515: crash in FtpStateData::ftpTimeout
+	- Bug 3329: Quieten orphan Comm::Connection messages
+	- Make squid -z for cache_dir rock preserve the rock DB
+	- Fixed several server connect problems
+	- ... and some build issues on Solaris, OpenIndiana, MacOS X
+	- ... and some documentation and debugs polishing
+
 -------------------------------------------------------------------
 Wed Feb 20 23:24:06 UTC 2013 - e.istomin@edss.ee
 

squid.service

@@ -1,13 +1,16 @@
 [Unit]
 Description=Squid caching proxy
-After=syslog.target network.target named.service
+After=network.target named.service nss-lookup.service
 
 [Service]
-EnvironmentFile=/etc/sysconfig/squid
+Type=forking
-ExecStartPre=/usr/sbin/squid_cache_swap.sh
+EnvironmentFile=-/etc/sysconfig/squid
-ExecStart=/usr/sbin/squid -F -N $SQUID_START_OPTIONS  -f /etc/squid/squid.conf
+ExecStartPre=/bin/sh -c "test -d \"`sed -n 's/^cache_dir\s\+[[:alnum:]]\+\s\+\([[:graph:]\/]\+\)\s.*/\1/p' /etc/squid/squid.conf | sed '1 q'`/00\" || /usr/sbin/squid -z -F -N -S -f /etc/squid/squid.conf"
-ExecReload=/usr/sbin/squid -F -N $SQUID_START_OPTIONS -k reconfigure -f /etc/squid/squid.conf
+ExecStart=/usr/sbin/squi etF $SQUID_START_OPTIONS  -f /etc/squid/squid.conf
-ExecStop=/usr/sbin/squid -F -N -k shutdown -f /etc/squid/squid.conf
+ExecReload=/usr/sbin/squid -F $SQUID_START_OPTIONS -f /etc/squid/squid.conf -k reconfigure
+ExecStop=/usr/sbin/squid -F -f /etc/squid/squid.conf -k shutdown
+LimitNOFILE=4096
+PIDFile=/var/run/squid.pid
 
 [Install]
 WantedBy=multi-user.target

squid.spec

@@ -23,7 +23,7 @@ Name:           squid
 Summary:        Squid Version 3.2 WWW Proxy Server
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Proxy
-Version:        3.2.7
+Version:        3.2.9
 Release:        0
 Url:            http://www.squid-cache.org/Versions/v3/3.2
 Source0:        http://www.squid-cache.org/Versions/v3/3.2/%{name}-%{version}.tar.bz2
@@ -37,7 +37,6 @@ Source7:        %{name}.logrotate
 Source9:        %{name}.permissions
 Source10:       README.kerberos
 Source11:       %{name}.service
-Source12:       squid_cache_swap.sh
 Source13:       %{name}.keyring
 #
 # the following patches are downloaded directly from the webserver
@@ -107,6 +106,7 @@ BuildRequires:  systemd
 %endif
 
 Requires:       logrotate
+Requires:       sed
 Provides:       http_proxy
 
 # due to package rename
@@ -135,8 +135,8 @@ The most important of these new features are:
  * Cache Manager access changes
 
   First STABLE release Date: 02 Aug 2010
-  Latest Release: 3.2.7
+  Latest Release: 3.2.9
-  Latest Release Date: 01 Feb 2013
+  Latest Release Date: 12 Mar 2013
 
 %prep
 %gpg_verify %{S:1}
@@ -257,7 +257,6 @@ fdupes -q -n -r %{buildroot}%{_prefix}
 
 %if 0%{?has_systemd}
 install -D -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}.service
-install -D -m 755 %{SOURCE12} %{buildroot}%{_sbindir}/squid_cache_swap.sh
 %endif
 
 %pre
@@ -332,7 +331,6 @@ rm -rf %{buildroot}
 %doc %{_mandir}/man?/*
 %if 0%{?has_systemd}
 %{_unitdir}/%{name}.service
-%{_sbindir}/squid_cache_swap.sh
 %endif
 %attr(750,%{name},root) %dir %{_localstatedir}/cache/%{name}/
 %attr(750,%{name},root) %dir %{_localstatedir}/log/%{name}/

squid_cache_swap.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-if [ -f /etc/sysconfig/squid ]; then
-	. /etc/sysconfig/squid
-fi
-
-SQUID_CONF=${SQUID_CONF:-"/etc/squid/squid.conf"}
-
-CACHE_SWAP=`sed -e 's/#.*//g' $SQUID_CONF | \
-	grep cache_dir | awk '{ print $3 }'`
-
-for adir in $CACHE_SWAP; do
-	if [ ! -d $adir/00 ]; then
-		echo -n "init_cache_dir $adir... "
-		squid -z -F -f $SQUID_CONF >> /var/log/squid/squid.out 2>&1
-	fi
-done