diff --git a/sources b/sources index 91c4319..82f0b74 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (squid-4.11.tar.xz) = 02d4bb4d5860124347670615e69b1b92be7ea4fc0131e54091a06cb2e67bd73583d8e6cbe472473f0c59764611a49561d02ab9fe2bf0305ce4652d4ec7714f26 -SHA512 (squid-4.11.tar.xz.asc) = df90af48cf32b4bd8ad3803c363180048fadacd0b1dbee4b74bf7fe2ce9ef2a4fda1790ceb4a4e1ec7c1bf66b323e3975c05a7f6dcb697c445186f577cfb16e9 +SHA512 (squid-4.12.tar.xz) = 96fa700a0c28711eb1ec5e44e1d324dc8d3accdddbc675def8babe057e2cc71083bd3817bc37cbd9f3c03772743df578573ee3698bbd6131df68c3580ad31ef4 +SHA512 (squid-4.12.tar.xz.asc) = 3283912319f5a027b4c9302f3ed26082d7f22e3797b39edd7eaa3df10904fb170352745a0dc1eda50c4c669b2037d9c596a8163f827f5060ec3ecfe0d6b22b27 SHA512 (pgp.asc) = 09f7012030d68831dfc083d67ca63ee54ed851482ca8d0e9505b444ee3e7ddeed62369b53f2917c9b2e0e57cc0533fce46e8cafd2ebcd1c6cb186b516efd0ad2 diff --git a/squid-4.11-systemd.patch b/squid-4.11-systemd.patch deleted file mode 100644 index 0ee7fd7..0000000 --- a/squid-4.11-systemd.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure b/configure -index 17b2ebf..9530f6b 100755 ---- a/configure -+++ b/configure -@@ -33915,6 +33915,7 @@ done - fi - if test "x$SYSTEMD_LIBS" != "x" ; then - CXXFLAGS="$SYSTEMD_CFLAGS $CXXFLAGS" -+ LDFLAGS="$SYSTEMD_LIBS $LDFLAGS" - - $as_echo "#define USE_SYSTEMD 1" >>confdefs.h - -diff --git a/src/Debug.h b/src/Debug.h -index 6eecd01..ddd9e38 100644 ---- a/src/Debug.h -+++ b/src/Debug.h -@@ -99,6 +99,10 @@ public: - - /// configures the active debugging context to write syslog ALERT - static void ForceAlert(); -+ -+ /// prefixes each grouped debugs() line after the first one in the group -+ static std::ostream& Extra(std::ostream &os) { return os << "\n "; } -+ - private: - static Context *Current; ///< deepest active context; nil outside debugs() - }; diff --git a/squid.spec b/squid.spec index b59ea45..82f07bb 100644 --- a/squid.spec +++ b/squid.spec @@ -1,7 +1,7 @@ %define __perl_requires %{SOURCE98} Name: squid -Version: 4.11 +Version: 4.12 Release: 1%{?dist} Summary: The Squid proxy caching server Epoch: 7 @@ -296,6 +296,9 @@ fi %changelog +* Mon Jun 15 2020 Lubos Uhliarik - 7:4.12-1 +- new version 4.12 + * Thu May 07 2020 Lubos Uhliarik - 7:4.11-1 - new version 4.11 - libsystemd integration