Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org --- .../patches/squid-3.0.STABLE1-perlpath.patch | 9 ---- squid/patches/squid-3.1.0.9-config.patch | 26 ------------ squid/patches/squid-3.1.0.9-location.patch | 41 ------------------- squid/squid.nm | 22 +++++----- 4 files changed, 10 insertions(+), 88 deletions(-) delete mode 100644 squid/patches/squid-3.0.STABLE1-perlpath.patch delete mode 100644 squid/patches/squid-3.1.0.9-config.patch delete mode 100644 squid/patches/squid-3.1.0.9-location.patch
diff --git a/squid/patches/squid-3.0.STABLE1-perlpath.patch b/squid/patches/squid-3.0.STABLE1-perlpath.patch deleted file mode 100644 index 19b512e1d..000000000 --- a/squid/patches/squid-3.0.STABLE1-perlpath.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath squid-3.0.STABLE1/contrib/url-normalizer.pl ---- squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath 1996-12-06 18:54:31.000000000 +0100 -+++ squid-3.0.STABLE1/contrib/url-normalizer.pl 2008-01-23 12:07:50.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -Tw -+#!/usr/bin/perl -Tw - - # From: Markus Gyger mgyger@itr.ch - # diff --git a/squid/patches/squid-3.1.0.9-config.patch b/squid/patches/squid-3.1.0.9-config.patch deleted file mode 100644 index 09d7a156e..000000000 --- a/squid/patches/squid-3.1.0.9-config.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre ---- squid-3.0.STABLE9/src/cf.data.pre.config 2008-09-09 18:06:44.000000000 +0200 -+++ squid-3.0.STABLE9/src/cf.data.pre 2008-10-19 23:34:17.000000000 +0200 -@@ -2135,7 +2136,7 @@ DOC_END - - NAME: logfile_rotate - TYPE: int --DEFAULT: 10 -+DEFAULT: 0 - LOC: Config.Log.rotateNumber - DOC_START - Specifies the number of logfile rotations to make when you -@@ -3254,11 +3256,11 @@ COMMENT_END - - NAME: cache_mgr - TYPE: string --DEFAULT: webmaster -+DEFAULT: root - LOC: Config.adminEmail - DOC_START - Email-address of local cache manager who will receive -- mail if the cache dies. The default is "webmaster." -+ mail if the cache dies. The default is "root." - DOC_END - - NAME: mail_from diff --git a/squid/patches/squid-3.1.0.9-location.patch b/squid/patches/squid-3.1.0.9-location.patch deleted file mode 100644 index 816b358bd..000000000 --- a/squid/patches/squid-3.1.0.9-location.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up squid-3.1.0.9/QUICKSTART.location squid-3.1.0.9/QUICKSTART ---- squid-3.1.0.9/QUICKSTART.location 2009-06-26 12:35:27.000000000 +0200 -+++ squid-3.1.0.9/QUICKSTART 2009-07-17 14:03:10.000000000 +0200 -@@ -12,10 +12,9 @@ After you retrieved, compiled and instal - INSTALL in the same directory), you have to configure the squid.conf - file. This is the list of the values you *need* to change, because no - sensible defaults could be defined. Do not touch the other variables --for now. We assume you have installed Squid in the default location: --/usr/local/squid -+for now. - --Uncomment and edit the following lines in /usr/local/squid/etc/squid.conf: -+Uncomment and edit the following lines in /etc/squid/squid.conf: - - ============================================================================== - -@@ -56,7 +55,7 @@ cache_effective_user - Some configuration lines which are optional but may be needed. - - --cache_dir ufs /usr/local/squid/var/cache 100 16 256 -+cache_dir ufs /var/spool/squid 100 16 256 - - Add here (first number, here 100) the amount of hard disk space - (in megabytes) to devote to caching. -@@ -84,12 +83,12 @@ After editing squid.conf to your liking, - line TWICE: - - To create any disk cache_dir configured: -- % /usr/local/squid/sbin/squid -z -+ % /usr/sbin/squid -z - - To start squid: -- % /usr/local/squid/sbin/squid -+ % /usr/sbin/squid - --Check in the cache.log (/usr/local/squid/var/logs/cache.log) that -+Check in the cache.log (/var/log/squid/cache.log) that - everything is all right. - - Once Squid created all its files (it can take several minutes on some diff --git a/squid/squid.nm b/squid/squid.nm index 9db970596..ccd96c27c 100644 --- a/squid/squid.nm +++ b/squid/squid.nm @@ -4,14 +4,15 @@ ###############################################################################
name = squid -major_ver = 3.1 -version = %{major_ver}.19 -release = 2 +major_ver = 5 +minor_ver = 7 +version = %{major_ver}.%{minor_ver} +release = 1
groups = Networking/Daemons -url = http://www.squid-cache.org/ +url = https://www.squid-cache.org/ license = GPLv2+ -summary = The Squid proxy caching server. +summary = The Squid proxy caching server
description Squid is a high-performance proxy caching server for Web clients, @@ -22,7 +23,7 @@ description DNS lookups, and implements negative caching of failed requests. end
-source_dl = http://www.squid-cache.org/Versions/v3/%%7Bmajor_ver%7D/ +source_dl = http://www.squid-cache.org/Versions/v%%7Bver_major%7D/
build requires @@ -33,8 +34,8 @@ build samba-devel pam-devel libcap-devel - /usr/bin/smbclient shadow-utils + systemd-devel end
CFLAGS += -Wno-error @@ -58,9 +59,8 @@ build --enable-kill-parent-hack \ --enable-snmp \ --enable-arp-acl \ - --enable-ipf-transparent \ --enable-htcp \ - --enable-ssl \ + --disable-ssl \ --enable-forw-via-db \ --disable-cache-digests \ --enable-poll \ @@ -71,7 +71,7 @@ build --enable-linux-netfilter \ --disable-ident-lookups \ --enable-internal-dns \ - --enable-auth=basic,ntlm \ + --enable-auth \ --enable-basic-auth-helpers="LDAP,MSNT,multi-domain-NTLM,PAM,NCSA,SMB,squid_radius_auth" \ --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \ --enable-ntlm-fail-open \ @@ -148,8 +148,6 @@ packages /bin/systemctl try-restart squid.service >/dev/null 2>&1 || : end
- requires = /usr/bin/smbclient - filter_requires = perl.Auth.* end