squid: Update to version 6.3-1

[ipfire-3.x.git] / squid / squid.nm

diff --git a/squid/squid.nm b/squid/squid.nm
index e2d74d59c009f82b1c88aade4f1754949dc5277d..0441ae65808eeb17dd12cfd6a6b6fd32fb6023fc 100644 (file)
--- a/squid/squid.nm
+++ b/squid/squid.nm
@@ -4,15 +4,15 @@
 ###############################################################################
 
 name       = squid
-major_ver  = 3.1
-version    = %{major_ver}.16
-release    = 5
+major_ver  = 6
+minor_ver  = 3
+version    = %{major_ver}.%{minor_ver}
+release    = 1
 
-maintainer = Christian Schmidt <christian.schmidt@ipfire.org>
 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,
@@ -23,20 +23,20 @@ description
        DNS lookups, and implements negative caching of failed requests.
 end
 
-source_dl  = http://www.squid-cache.org/Versions/v3/%{major_ver}/
+source_dl  = http://www.squid-cache.org/Versions/v%{major_ver}/
 
 build
        requires
                gcc-c++
+               libxcrypt-devel
                libxml2-devel
                openssl-devel
                openldap-devel
                samba-devel
-               iptables-devel
                pam-devel
                libcap-devel
-               /usr/bin/smbclient
                shadow-utils
+               systemd-devel
        end
 
        CFLAGS += -Wno-error
@@ -60,9 +60,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 \
@@ -73,7 +72,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 \
@@ -107,6 +106,9 @@ build
                cp -vf %{DIR_SOURCE}/cache_swap.sh %{BUILDROOT}/usr/lib/squid/
                chmod 755 %{BUILDROOT}/usr/lib/squid/cache_swap.sh
                chown -Rv squid:squid %{BUILDROOT}/usr/lib/squid/cache_swap.sh
+
+               # Drop /var/run
+               rm -rvf %{BUILDROOT}%{localstatedir}/run
        end
 end
 
@@ -150,9 +152,7 @@ packages
                        /bin/systemctl try-restart squid.service >/dev/null 2>&1 || :
                end
 
-               requires = /usr/bin/smbclient
-
-               filter_requires = perl\(Authen::Smb\)
+               filter_requires = perl.Auth.*
        end
 
        package %{name}-debuginfo