diff --git a/pgp.asc b/pgp.asc deleted file mode 100644 index 2f745739ac76e5e140365206287b1de8b3feeb0b..0000000000000000000000000000000000000000 Binary files a/pgp.asc and /dev/null differ diff --git a/squid-6.3.tar.xz b/squid-6.3.tar.xz deleted file mode 100644 index bbb5297b539a85d3aaecfde0bf1bf5816fd18acd..0000000000000000000000000000000000000000 Binary files a/squid-6.3.tar.xz and /dev/null differ diff --git a/squid-6.3.tar.xz.asc b/squid-6.3.tar.xz.asc deleted file mode 100644 index 05f242d895010257353bc2f0f4f185e478c2a12d..0000000000000000000000000000000000000000 --- a/squid-6.3.tar.xz.asc +++ /dev/null @@ -1,25 +0,0 @@ -File: squid-6.3.tar.xz -Date: Sun 03 Sep 2023 15:42:32 UTC -Size: 2547264 -MD5 : 2512b5d27856e6f91a97719784506893 -SHA1: 7bd74034015c6a4d345a4d277a431908bed2ec4a -Key : CD6DBF8EF3B17D3E - B068 84ED B779 C89B 044E 64E3 CD6D BF8E F3B1 7D3E - keyring = http://www.squid-cache.org/pgp.asc - keyserver = pool.sks-keyservers.net ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEsGiE7bd5yJsETmTjzW2/jvOxfT4FAmT0qW8ACgkQzW2/jvOx -fT56xRAAjfNBcwBJzAMjXoGBPypHb6NmNDamFblgS11EBXrUFqTK/GyYCxYbXwxJ -MEt4xnxJKehEelInd03gw7o9z+402gdlGFzCwtuNb5BmYTvIGgudNIC/LzpTiuaG -mPgIsSaRSsIrzVpgrz5MzWGj2lwUi+wg+x1hwB0GYVzxHDXTikNrvBgSbK47Z4cR -Fc/4iGhNJ3iGnML0LSStbXAsHuXx8LmI0tD9koy688eVSL9AUymoJVrkU3iBFIGY -MKVr9icrtwvqhT7doFdiKw4AfGL5ex/RxjY/sbu4OtDlsx6oQPKNNSjZt+vG92lT -yZGKQGBtdQV8O0J7REeaHIt8TiKlNvmw1J+65pMpx7DYo7Dd0YZh9DHSJrG/zDWE -CT7WxKNV0Mt8k3bnhHpMqeV2t/AHdUzRULymUI46JrtBaNzb+mduwagCV6/EGENU -kwJ+bvVg3H+30HmUIfNCuvlfFrLaCROKkmA5VQ5fNBQPLibJEZMi32haIn7Mftue -gw9MkxmX6kUi/1FhS9Kbe3qEOVrJnoaFDmfXn+iIeMpNTBNKGQOWUGPBZdsfRKLr -ISKMfxOjCHn072X2Abtbod1DSKgTc/XK4Wvc6LQfp8fDy4Kzzu4BZJmM4N6xgj2F -GO31kwuQhQFEFGUh6CXOiFeivlAaWBu3/rjh/SMREuir6IJ/K6o= -=/lJx ------END PGP SIGNATURE----- diff --git a/squid-6.5.tar.xz b/squid-6.5.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..4f64977e624ee9c335f5a1394de45853925bd81f Binary files /dev/null and b/squid-6.5.tar.xz differ diff --git a/squid.spec b/squid.spec index 81d506dd8bd28d8d48f78670fa5905d71b0e30d7..096e87bfb101ae675614cfbbc8af5c7af97c8283 100644 --- a/squid.spec +++ b/squid.spec @@ -3,7 +3,7 @@ %define anolis_release 1 Name: squid -Version: 6.3 +Version: 6.5 Release: %{anolis_release}%{?dist} Summary: The Squid proxy caching server Epoch: 7 @@ -12,8 +12,6 @@ License: GPLv2+ and (LGPLv2+ and MIT and BSD and Public Domain) URL: http://www.squid-cache.org Source0: http://www.squid-cache.org/Versions/v6/squid-%{version}.tar.xz -Source1: http://www.squid-cache.org/Versions/v6/squid-%{version}.tar.xz.asc -Source2: http://www.squid-cache.org/pgp.asc Source3: squid.logrotate Source4: squid.sysconfig Source5: squid.pam @@ -42,33 +40,24 @@ Requires: httpd-filesystem # squid_ldap_auth and other LDAP helpers require OpenLDAP BuildRequires: make -BuildRequires: openldap-devel -# squid_pam_auth requires PAM development libs -BuildRequires: pam-devel -# SSL support requires OpenSSL -BuildRequires: openssl-devel -# squid_kerb_aut requires Kerberos development libs -BuildRequires: krb5-devel -# time_quota requires TrivialDB -BuildRequires: libtdb-devel -# ESI support requires Expat & libxml2 -BuildRequires: expat-devel libxml2-devel -# TPROXY requires libcap, and also increases security somewhat -BuildRequires: libcap-devel -# eCAP support -BuildRequires: libecap-devel -#ip_user helper requires +BuildRequires: pkgconfig(cppunit) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(gnutls) >= 3.4.0 +BuildRequires: pkgconfig(krb5) +BuildRequires: pkgconfig(ldap) +BuildRequires: pkgconfig(libcap) >= 2.09 +BuildRequires: pkgconfig(libecap) >= 1.0 pkgconfig(libecap) < 1.1 +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(nettle) >= 3.4 +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(pam) +BuildRequires: pkgconfig(tdb) BuildRequires: gcc-c++ BuildRequires: libtool libtool-ltdl-devel BuildRequires: perl-generators # For test suite -BuildRequires: pkgconfig(cppunit) -# For verifying downloded src tarball -BuildRequires: gnupg2 -# for _tmpfilesdir and _unitdir macro BuildRequires: systemd-rpm-macros -# systemd notify -BuildRequires: systemd-devel %{?systemd_requires} %{?sysusers_requires_compat} @@ -90,23 +79,14 @@ lookup program (dnsserver), a program for retrieving FTP data %package doc Summary: Documentation files for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{EVR} BuildArch: noarch %description doc The %{name}-doc package contains documentation files for %{name}. %prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%setup -q - -# Local patches -%patch -P 201 -p1 -b .config -%patch -P 202 -p1 -b .location -%patch -P 203 -p1 -b .perlpath -%patch -P 204 -p1 -b .symlink-lang-err -%patch -P 205 -p1 -b .crash-half-closed - +%autosetup -p1 sed -i 's|@SYSCONFDIR@/squid.conf.documented|%{_pkgdocdir}/squid.conf.documented|' src/squid.8.in %build @@ -162,7 +142,7 @@ mkdir -p tools/tests %make_build %check -make check +%make_build check %install %make_install @@ -222,6 +202,8 @@ rm -f $RPM_BUILD_ROOT/squid.httpd.tmp # sysusers.d install -p -D -m 0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/squid.conf +%generate_compatibility_deps + %files %license COPYING %doc src/squid.conf.documented @@ -281,18 +263,6 @@ done exit 0 %pretrans -p --- temporarilly commented until https://bugzilla.redhat.com/show_bug.cgi?id=1936422 is resolved --- --- previously /usr/share/squid/errors/es-mx was symlink, now it is directory since squid v5 --- see https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacement/ --- Define the path to the symlink being replaced below. --- --- path = "/usr/share/squid/errors/es-mx" --- st = posix.stat(path) --- if st and st.type == "link" then --- os.remove(path) --- end - -- Due to a bug #447156 paths = {"/usr/share/squid/errors/zh-cn", "/usr/share/squid/errors/zh-tw"} for key,path in ipairs(paths) @@ -329,5 +299,8 @@ fi %changelog +* Tue Nov 07 2023 Funda Wang - 7:6.5-1 +- New version 6.5 + * Mon Sep 18 2023 mgb01105731 - 7:6.3-1 - Init upstream from version 6.3