[squid] upgrade to squid-3.2, BZ#720445 - native unit file, SysVinitscript subpackage
Jiri Skala
jskala at fedoraproject.org
Thu Jul 21 12:09:00 UTC 2011
commit d84a05e94570471f1c0b3b56cb20dbf8a83245e5
Author: Jiri Skala <jskala at redhat.com>
Date: Thu Jul 21 14:08:43 2011 +0200
upgrade to squid-3.2, BZ#720445 - native unit file, SysVinitscript subpackage
squid-3.0.STABLE7-from_manpg.patch | 80 ----------
squid-3.1.11-unused.patch | 288 ------------------------------------
squid-3.1.9-ltdl.patch | 14 +-
squid-3.2.0.9-fpic.patch | 36 +++++
squid.spec | 87 ++++++++----
5 files changed, 102 insertions(+), 403 deletions(-)
---
diff --git a/squid-3.1.9-ltdl.patch b/squid-3.1.9-ltdl.patch
index de0654a..938a45a 100644
--- a/squid-3.1.9-ltdl.patch
+++ b/squid-3.1.9-ltdl.patch
@@ -29,13 +29,13 @@ diff -up squid-3.1.9/Makefile.am.ltdl squid-3.1.9/Makefile.am
#
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
--DIST_SUBDIRS = compat lib libltdl snmplib scripts src icons errors contrib doc helpers test-suite tools
-+DIST_SUBDIRS = compat lib snmplib scripts src icons errors contrib doc helpers test-suite tools
+-DIST_SUBDIRS = compat lib libltdl snmplib scripts icons errors contrib doc helpers src test-suite tools
++DIST_SUBDIRS = compat lib snmplib scripts icons errors contrib doc helpers src test-suite tools
SUBDIRS = compat lib $(makesnmplib)
-if USE_LOADABLE_MODULES
-SUBDIRS += libltdl
-endif
- SUBDIRS += scripts src icons errors doc helpers test-suite tools
+ SUBDIRS += scripts icons errors doc helpers src tools test-suite
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
diff -up squid-3.1.9/Makefile.in.ltdl squid-3.1.9/Makefile.in
@@ -54,8 +54,8 @@ diff -up squid-3.1.9/Makefile.in.ltdl squid-3.1.9/Makefile.in
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
--DIST_SUBDIRS = compat lib libltdl snmplib scripts src icons errors contrib doc helpers test-suite tools
-+DIST_SUBDIRS = compat lib snmplib scripts src icons errors contrib doc helpers test-suite tools
- SUBDIRS = compat lib $(makesnmplib) $(am__append_1) scripts src icons \
- errors doc helpers test-suite tools
+-DIST_SUBDIRS = compat lib libltdl snmplib scripts icons errors contrib doc helpers src test-suite tools
++DIST_SUBDIRS = compat lib snmplib scripts icons errors contrib doc helpers src test-suite tools
+ SUBDIRS = compat lib $(makesnmplib) $(am__append_1) scripts icons \
+ errors doc helpers src tools test-suite
DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
diff --git a/squid-3.2.0.9-fpic.patch b/squid-3.2.0.9-fpic.patch
new file mode 100644
index 0000000..357c6a0
--- /dev/null
+++ b/squid-3.2.0.9-fpic.patch
@@ -0,0 +1,36 @@
+diff -up squid-3.2.0.9/compat/Makefile.in.fpic squid-3.2.0.9/compat/Makefile.in
+--- squid-3.2.0.9/compat/Makefile.in.fpic 2011-07-01 11:38:35.332618191 +0200
++++ squid-3.2.0.9/compat/Makefile.in 2011-07-01 11:41:07.207345197 +0200
+@@ -316,7 +316,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = $(SQUID_CFLAGS)
++AM_CFLAGS = $(SQUID_CFLAGS) -fPIC
+ AM_CXXFLAGS = $(SQUID_CXXFLAGS)
+ CLEANFILES = testHeaders
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \
+diff -up squid-3.2.0.9/snmplib/Makefile.am.fpic squid-3.2.0.9/snmplib/Makefile.am
+--- squid-3.2.0.9/snmplib/Makefile.am.fpic 2011-07-01 11:40:12.557741046 +0200
++++ squid-3.2.0.9/snmplib/Makefile.am 2011-07-01 11:41:10.201378312 +0200
+@@ -2,7 +2,7 @@
+ ##
+ ## Makefile for libsnmp.
+ ##
+-AM_CFLAGS = $(SQUID_CFLAGS)
++AM_CFLAGS = $(SQUID_CFLAGS) -fPIC
+ AM_CXXFLAGS = $(SQUID_CXXFLAGS)
+ noinst_LIBRARIES = libsnmplib.a
+ libsnmplib_a_SOURCES = asn1.c parse.c snmp_vars.c \
+diff -up squid-3.2.0.9/snmplib/Makefile.in.fpic squid-3.2.0.9/snmplib/Makefile.in
+--- squid-3.2.0.9/snmplib/Makefile.in.fpic 2011-07-01 12:04:44.083181152 +0200
++++ squid-3.2.0.9/snmplib/Makefile.in 2011-07-01 12:05:06.796437407 +0200
+@@ -286,7 +286,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = $(SQUID_CFLAGS)
++AM_CFLAGS = $(SQUID_CFLAGS) -fPIC
+ AM_CXXFLAGS = $(SQUID_CXXFLAGS)
+ noinst_LIBRARIES = libsnmplib.a
+ libsnmplib_a_SOURCES = asn1.c parse.c snmp_vars.c \
diff --git a/squid.spec b/squid.spec
index 0c9fde4..31d881f 100644
--- a/squid.spec
+++ b/squid.spec
@@ -3,8 +3,8 @@
## % define __find_requires %{SOURCE99}
Name: squid
-Version: 3.1.12
-Release: 3%{?dist}
+Version: 3.2.0.9
+Release: 1%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code
@@ -12,12 +12,13 @@ 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
-Source1: http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
+#Source1: http://www.squid-cache.org/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
Source2: squid.init
Source3: squid.logrotate
Source4: squid.sysconfig
Source5: squid.pam
Source6: squid.nm
+Source7: squid.service
Source98: perl-requires-squid.sh
## Source99: filter-requires-squid.sh
@@ -30,16 +31,18 @@ Source98: perl-requires-squid.sh
Patch201: squid-3.1.0.9-config.patch
Patch202: squid-3.1.0.9-location.patch
Patch203: squid-3.0.STABLE1-perlpath.patch
-Patch204: squid-3.0.STABLE7-from_manpg.patch
+Patch204: squid-3.2.0.9-fpic.patch
Patch205: squid-3.1.9-ltdl.patch
-Patch206: squid-3.1.11-unused.patch
+#Patch206: squid-3.2.0.9-lecap.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: bash >= 2.0
Requires(pre): shadow-utils
Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/service /sbin/chkconfig
-Requires(postun): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
# squid_ldap_auth and other LDAP helpers require OpenLDAP
BuildRequires: openldap-devel
# squid_pam_auth requires PAM development libs
@@ -55,8 +58,8 @@ BuildRequires: expat-devel libxml2-devel
# TPROXY requires libcap, and also increases security somewhat
BuildRequires: libcap-devel
# eCAP support
-BuildRequires: libecap-devel
-# eCAP and some other need libltdl
+#BuildRequires: libecap-devel
+#
BuildRequires: libtool libtool-ltdl-devel
%description
@@ -71,6 +74,16 @@ Squid consists of a main server program squid, a Domain Name System
lookup program (dnsserver), a program for retrieving FTP data
(ftpget), and some management and client tools.
+%package sysvinit
+Group: System Environment/Daemons
+Summary: SysV initscript for squid caching proxy
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+
+%description sysvinit
+The squid-sysvinit contains SysV initscritps support.
+
%prep
%setup -q
@@ -79,19 +92,19 @@ lookup program (dnsserver), a program for retrieving FTP data
%patch201 -p1 -b .config
%patch202 -p1 -b .location
%patch203 -p1 -b .perlpath
-%patch204 -p1 -b .from_manpg
+%patch204 -p1 -b .fpic
%patch205 -p1 -b .ltdl
-%patch206 -p1 -b .unused
+#%patch206 -p1 -b .lecap
%build
%ifarch sparcv9 sparc64 s390 s390x
- export CXXFLAGS="$RPM_OPT_FLAGS -fPIE"
- export CFLAGS="$RPM_OPT_FLAGS -fPIE"
+ CXXFLAGS="$RPM_OPT_FLAGS -fPIE" \
+ CFLAGS="$RPM_OPT_FLAGS -fPIE" \
%else
- export CXXFLAGS="$RPM_OPT_FLAGS -fpie"
- export CFLAGS="$RPM_OPT_FLAGS -fpie"
+ CXXFLAGS="$RPM_OPT_FLAGS -fpie" \
+ CFLAGS="$RPM_OPT_FLAGS -fpie" \
%endif
-export LDFLAGS="-pie"
+LDFLAGS="-pie"
%configure \
--exec_prefix=/usr \
@@ -104,11 +117,11 @@ export LDFLAGS="-pie"
--disable-dependency-tracking \
--enable-arp-acl \
--enable-follow-x-forwarded-for \
- --enable-auth="basic,digest,ntlm,negotiate" \
- --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
- --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
- --enable-digest-auth-helpers="password,ldap,eDirectory" \
- --enable-negotiate-auth-helpers="squid_kerb_auth" \
+ --enable-auth \
+ --enable-auth-basic="DB,LDAP,MSNT,MSNT-multi-domain,NCSA,NIS,PAM,POP3,RADIUS,SASL,SMB,getpwnam" \
+ --enable-auth-ntlm="smb_lm,fake" \
+ --enable-auth-digest="file,LDAP,eDirectory" \
+ --enable-auth-negotiate="kerberos" \
--enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
--enable-cache-digests \
--enable-cachemgr-hostname=localhost \
@@ -128,7 +141,6 @@ export LDFLAGS="-pie"
--enable-useragent-log \
--enable-wccpv2 \
--enable-esi \
- --enable-ecap \
--with-aio \
--with-default-user="squid" \
--with-filedescriptors=16384 \
@@ -167,10 +179,12 @@ 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
+mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
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 %{SOURCE7} ${RPM_BUILD_ROOT}/lib/systemd/system
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
@@ -198,6 +212,7 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING COPYRIGHT README ChangeLog QUICKSTART src/squid.conf.documented
%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
+/lib/systemd/system/squid.service
%attr(755,root,root) %dir %{_sysconfdir}/squid
%attr(755,root,root) %dir %{_libdir}/squid
%attr(750,squid,squid) %dir /var/log/squid
@@ -221,16 +236,19 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/squid
%attr(-,root,root) %{_datadir}/squid/errors
-%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/squid
%attr(755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/20-squid
%{_datadir}/squid/icons
%{_sbindir}/squid
%{_bindir}/squidclient
+%{_bindir}/purge
%{_mandir}/man8/*
%{_mandir}/man1/*
%{_libdir}/squid/*
%{_datadir}/snmp/mibs/SQUID-MIB.txt
+%files sysvinit
+%attr(755,root,root) %{_sysconfdir}/rc.d/init.d/squid
+
%pre
if ! getent group squid >/dev/null 2>&1; then
/usr/sbin/groupadd -g 23 squid
@@ -251,18 +269,18 @@ done
exit 0
%post
-/sbin/chkconfig --add squid
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%preun
if [ $1 = 0 ] ; then
- service squid stop >/dev/null 2>&1
- rm -f /var/log/squid/*
- /sbin/chkconfig --del squid
+ /bin/systemctl disable squid.service > /dev/null 2>&1 || :
+ /bin/systemctl stop squid.service > /dev/null 2>&1 || :
fi
%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ "$1" -ge "1" ] ; then
- service squid condrestart >/dev/null 2>&1
+ /bin/systemctl try-restart squid.service > /dev/null 2>&1 || :
fi
%triggerin -- samba-common
@@ -272,7 +290,20 @@ fi
/usr/sbin/usermod -a -G wbpriv squid >/dev/null 2>&1 || \
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
+%triggerun -- %{name} < 7:3.2.0.9-1
+ /sbin/chkconfig --del squid >/dev/null 2>&1 || :
+ /bin/systemctl try-restart squid.service >/dev/null 2>&1 || :
+
+%triggerpostun -n %{name}-sysvinit -- %{name} < 7:3.2.0.9-1
+ /sbin/chkconfig --add squid >/dev/null 2>&1 || :
+
%changelog
+* Tue Jun 07 2011 Jiri Skala <jskala at redhat.com> - 7:3.2.0.9-1
+- upgrade to squid-3.2
+- fixes #720445 - Provide native systemd unit file
+- SysV initscript moved to subpackage
+- temproary disabled eCap
+
* Wed May 18 2011 Jiri Skala <jskala at redhat.com> - 7:3.1.12-3
- enabled eCAP support
More information about the scm-commits
mailing list