Drop obsolete legacy sys-v remanents
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
This commit is contained in:
parent
a9d6d1f079
commit
5dcaec0b66
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,4 +1,2 @@
|
||||
/*.asc
|
||||
/*.xz
|
||||
/squid-3.3-12542.patch
|
||||
/squid-3.4.4-1.fc21.src.rpm
|
||||
|
@ -1,49 +0,0 @@
|
||||
From 9c35377eaeebf366b3fbc65ddf19cce50551ad68 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Mon, 15 Feb 2016 18:39:45 +0100
|
||||
Subject: [PATCH] cppunit-config no longer exists, use pkg-config
|
||||
|
||||
---
|
||||
configure.ac | 12 +++++-------
|
||||
1 file changed, 5 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 981337d..2e663de 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -123,7 +123,6 @@ AC_PATH_PROG(LN, ln, cp)
|
||||
AC_PATH_PROG(CHMOD, chmod, $FALSE)
|
||||
AC_PATH_PROG(TR, tr, $FALSE)
|
||||
AC_PATH_PROG(RM, rm, $FALSE)
|
||||
-AC_PATH_PROG(CPPUNITCONFIG, cppunit-config, false)
|
||||
dnl Libtool 2.2.6 requires: rm -f
|
||||
RM="$RM -f"
|
||||
|
||||
@@ -2728,19 +2727,18 @@ SQUID_DEFINE_BOOL(X_ACCELERATOR_VARY,${enable_x_accelerator_vary:=no},
|
||||
AC_MSG_NOTICE([X-Accelerator-Vary support enabled: $enable_x_accelerator_vary])
|
||||
|
||||
|
||||
-if $CPPUNITCONFIG --help >/dev/null; then
|
||||
- squid_cv_cppunit_version="`$CPPUNITCONFIG --version`"
|
||||
+PKG_CHECK_MODULES([SQUID_CPPUNIT], [cppunit], [
|
||||
+ squid_cv_cppunit_version="`$PKG_CONFIG --modversion cppunit`"
|
||||
AC_MSG_NOTICE([using system installed cppunit version $squid_cv_cppunit_version])
|
||||
unset squid_cv_cppunit_version
|
||||
- SQUID_CPPUNIT_LIBS="`$CPPUNITCONFIG --libs`"
|
||||
SQUID_CPPUNIT_LA=''
|
||||
- SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`"
|
||||
-else
|
||||
+ SQUID_CPPUNIT_INC="$SQUID_CPPUNIT_CFLAGS"
|
||||
+], [
|
||||
AC_MSG_WARN([cppunit does not appear to be installed. squid does not require this, but code testing with 'make check' will fail.])
|
||||
SQUID_CPPUNIT_LA=''
|
||||
SQUID_CPPUNIT_LIBS=''
|
||||
SQUID_CPPUNIT_INC=''
|
||||
-fi
|
||||
+])
|
||||
|
||||
AC_ARG_WITH(cppunit-basedir,
|
||||
AS_HELP_STRING([--with-cppunit-basedir=PATH],
|
||||
--
|
||||
2.5.0
|
||||
|
12
squid.spec
12
squid.spec
@ -2,13 +2,13 @@
|
||||
|
||||
Name: squid
|
||||
Version: 4.2
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?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/v4/squid-%{version}.tar.xz
|
||||
Source1: http://www.squid-cache.org/Versions/v4/squid-%{version}.tar.xz.asc
|
||||
Source2: squid.logrotate
|
||||
@ -33,11 +33,8 @@ Patch203: squid-3.0.STABLE1-perlpath.patch
|
||||
Patch204: squid-3.5.9-include-guards.patch
|
||||
Patch205: squid-4.0.21-large-acl.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/chkconfig
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
@ -156,7 +153,6 @@ make \
|
||||
make check
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make \
|
||||
DESTDIR=$RPM_BUILD_ROOT \
|
||||
install
|
||||
@ -175,7 +171,6 @@ ScriptAlias /Squid/cgi-bin/cachemgr.cgi %{_libdir}/squid/cachemgr.cgi
|
||||
</Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
|
||||
|
||||
|
||||
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
|
||||
@ -294,6 +289,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Oct 14 2018 Peter Robinson <pbrobinson@fedoraproject.org> 7:4.2-3
|
||||
- Drop obsolete legacy sys-v remanents
|
||||
|
||||
* Mon Aug 20 2018 Luboš Uhliarik <luhliari@redhat.com> - 7:4.2-2
|
||||
- Resolves: #1618790 - SELinux 'dac_override' denial for cache_swap.sh
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user