diff --git a/RELEASENOTES.html b/RELEASENOTES.html
index 57b9b85..d9b3926 100644
--- a/RELEASENOTES.html
+++ b/RELEASENOTES.html
@@ -2,10 +2,10 @@
- Squid 3.4.4 release notes
+ Squid 3.4.5 release notes
-Squid 3.4.4 release notes
+Squid 3.4.5 release notes
Squid Developers
@@ -57,7 +57,7 @@ for Applied Network Research and members of the Web Caching community.
-The Squid Team are pleased to announce the release of Squid-3.4.4 for testing.
+The Squid Team are pleased to announce the release of Squid-3.4.5 for testing.
This new release is available for download from
http://www.squid-cache.org/Versions/v3/3.4/ or the
mirrors.
diff --git a/squid-3.4.4.tar.bz2 b/squid-3.4.4.tar.bz2
deleted file mode 100644
index 1c3999e..0000000
--- a/squid-3.4.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d15e7cc8b1cb25b1b552d938e622819a9cbf5c5bbb517875709a6088bbd3d1e5
-size 2812380
diff --git a/squid-3.4.4.tar.bz2.asc b/squid-3.4.4.tar.bz2.asc
deleted file mode 100644
index fbd8fd8..0000000
--- a/squid-3.4.4.tar.bz2.asc
+++ /dev/null
@@ -1,20 +0,0 @@
-File: squid-3.4.4.tar.bz2
-Date: Sun Mar 9 10:06:07 UTC 2014
-Size: 2812380
-MD5 : f9c7dd495e45042cc162d89cfbb97cc0
-SHA1: 1d5db3970d4a8bd460315d90253c5c20d96abdad
-Key : 0xFF5CF463
- fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463
- keyring = http://www.squid-cache.org/pgp.asc
- keyserver = subkeys.pgp.net
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJTHD43AAoJELJo5wb/XPRjD/QH/3GMK+VPmnP5QiMgr995Zp+o
-ZHfQoVXO679Mq55Yv53ZSCE8xUGtqwaabm/3pP+U1URrs2kTJV+392fN43RmZ7R+
-11zvIXJD3/dGAHAKQlxELMskWNNAdQWCpXGhKaJFU0ghvqlGpq1hLx2M5DqOgJBU
-DoFLFUQdKLPU8n1PwnY3SKdT3q3VxpSVbaUx+doQnsNW2Fj2NBj/kb2TQy/1UmyF
-FWVpn6Gr3BMCrl4uiw1yiCdHty61Tt6BH6swjA7sQjcenMLWQjNzRzGgM4TfhlvR
-czHrrJDbpNZ7Z8NBGvyAYBQmsFRxNm51yIFmpRst+PJBZuNJFW4RB9lek1hWsuk=
-=zJQN
------END PGP SIGNATURE-----
diff --git a/squid-3.4.6.tar.bz2 b/squid-3.4.6.tar.bz2
new file mode 100644
index 0000000..f021a92
--- /dev/null
+++ b/squid-3.4.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37338218562a2c85e855b4fa472848ca8f8a0408f3e04d15636acdaace3811ca
+size 3057715
diff --git a/squid-3.4.6.tar.bz2.asc b/squid-3.4.6.tar.bz2.asc
new file mode 100644
index 0000000..f224eff
--- /dev/null
+++ b/squid-3.4.6.tar.bz2.asc
@@ -0,0 +1,20 @@
+File: squid-3.4.6.tar.bz2
+Date: Wed Jun 25 15:31:30 UTC 2014
+Size: 3057715
+MD5 : d3ca4ce0a039bbba8258d6b67d6afaa1
+SHA1: 0b8850a0bf73d85797e441e589324da8309cd738
+Key : 0xFF5CF463
+ fingerprint = EA31 CC5E 9488 E516 8D2D CC5E B268 E706 FF5C F463
+ keyring = http://www.squid-cache.org/pgp.asc
+ keyserver = subkeys.pgp.net
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJTqx1kAAoJELJo5wb/XPRjsjEIAOCdBy3rvR5fK5JluK2uUjkf
++EQbglgl10SoMMxS63mswFI5ZlpyHffPhpuL9RGOSeRxjUV7S9a8I9WuG+1ox6Of
+P6VXZxnUpZNwSWht7MJL8gIUs8oafYsPPlwP9r67VxQeP8Nz42HwsYOaWhNVi72w
+TU2axLEnIg89qg9heG7jN1gFBYOSTW4arW3+1Rzefo5sNvLXjbtE1i6woLYp+9E1
+v/ZXPo/LIW7WoV8/n/kr43PMGExPg40YZXVybdKBtHjybpLzxJSPv61cKqMtzN9C
+b6RRjLNM8BuVGdi8wdEDJuwCcnIbT8Bsqi6SPYDDfkNRhh+CBp8/mA9Rdgg+QVE=
+=OMF0
+-----END PGP SIGNATURE-----
diff --git a/squid-cert_tool_use_bash_not_ksh.patch b/squid-cert_tool_use_bash_not_ksh.patch
new file mode 100644
index 0000000..dd8d74e
--- /dev/null
+++ b/squid-cert_tool_use_bash_not_ksh.patch
@@ -0,0 +1,66 @@
+diff -rNU 60 ../squid-3.4.6-o/helpers/external_acl/kerberos_ldap_group/cert_tool ./helpers/external_acl/kerberos_ldap_group/cert_tool
+--- ../squid-3.4.6-o/helpers/external_acl/kerberos_ldap_group/cert_tool 2014-06-25 16:41:39.000000000 +0200
++++ ./helpers/external_acl/kerberos_ldap_group/cert_tool 2014-08-14 16:40:59.000000000 +0200
+@@ -1,61 +1,61 @@
+-#!/bin/ksh
++#!/bin/bash
+ #
+ # -----------------------------------------------------------------------------
+ #
+ # Author: Markus Moeller (markus_moeller at compuserve.com)
+ #
+ # Copyright (C) 2007 Markus Moeller. All rights reserved.
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # -----------------------------------------------------------------------------
+ #
+ #
+ # creates the following files:
+ # .cert
+ # secmod.db
+ # key3.db
+ # cert8.db
+ #
+ #
+ if [ -z "$1" ]; then
+ echo "Usage: `basename $0` ldap-server port"
+ exit 0
+ fi
+ if [ -z "$2" ]; then
+ port=636
+ else
+ port=$2
+ fi
+
+ server=$1
+
+ #
+ # Remove old files
+ #
+ rm ${server}_[0-9]*.cert 2>/dev/null
+ #
+ # Get certs and store in .cert file
+ #
+ ( openssl s_client -showcerts -connect $server:$port 2>/dev/null < ostart ) {print $0 >>"'$server'_"start".cert"};
+ if ( $0 ~ /END CERTIFICATE/) { ostart=start } }'
+
+ #
+ # from mozilla-nss-tools
+ # /usr/sfw/bin on Solaris
diff --git a/squid.changes b/squid.changes
index 58853bf..0d9f3f7 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,47 @@
+-------------------------------------------------------------------
+Thu Sep 4 16:02:45 UTC 2014 - chris@computersalat.de
+
+- fix for bnc#894840
+ * fix logrotate file (sharedscripts)
+
+-------------------------------------------------------------------
+Sun Aug 31 09:32:01 UTC 2014 - boris@steki.net
+
+- add --disable-arch-native configure param as vmware does not
+ emulate all instruction set and squid fails with
+ "Illegal instruction" more info at
+ http://wiki.squid-cache.org/KnowledgeBase/IllegalInstructionError
+
+-------------------------------------------------------------------
+Thu Aug 14 16:42:17 CEST 2014 - draht@suse.de
+
+- squid-cert_tool_use_bash_not_ksh.patch:
+ /usr/sbin/cert_tool should use bash, not ksh. [bnc#891313]
+
+-------------------------------------------------------------------
+Sun Aug 10 21:16:29 UTC 2014 - chris@computersalat.de
+
+- Changes to squid-3.4.6 (25 Jun 2014):
+ * Regression: segmentation fault logging with %tg format specifier
+ * Bug 4065: round-robin neighbor selection with unequal weights
+ * Bug 4056: assertion MemPools[type] from netdbExchangeStart()
+ * Bug 4050: segmentation fault in CommSelectEngine::checkEvents on helper response
+ * Fix segmentation fault setting up server SSL connnection
+ * Fix hanging Non-HTTPS connections on SSL-bump enabled port
+ * Fix Cache Manager actions listed more than once
+ * ... and many minor memory leaks
+ * ... and several portability build issues
+ * ... and some documentation updates
+- Changes to squid-3.4.5 (02 May 2014):
+ * Regression Bug 4051: inverted test on CONNECT payload existence
+ * Regression Fix: order dependency between cache_dir and maximum_object_size
+ * Fix logformat %note display
+ * Resolve 'dying from an unhandled exception: c'
+ * Copyright: Update CONTRIBUTORS list of copyright holders
+- fix deps
+ * libtool >= 2.4
+ * older libtool needs --with-included-ltd
+
-------------------------------------------------------------------
Thu Jul 31 14:01:54 UTC 2014 - dimstar@opensuse.org
diff --git a/squid.logrotate b/squid.logrotate
index 1c32741..657182d 100644
--- a/squid.logrotate
+++ b/squid.logrotate
@@ -1,3 +1,18 @@
+/var/log/squid/access.log /var/log/squid/store.log {
+ compress
+ dateext
+ maxage 365
+ rotate 99
+ size=+4096k
+ notifempty
+ missingok
+ create 640 squid root
+ sharedscripts
+ postrotate
+ /etc/init.d/squid reload
+ endscript
+}
+
/var/log/squid/cache.log {
compress
dateext
@@ -7,37 +22,6 @@
notifempty
missingok
create 640 squid root
- sharedscripts
- postrotate
- /etc/init.d/squid reload
- endscript
-}
-
-/var/log/squid/access.log {
- compress
- dateext
- maxage 365
- rotate 99
- size=+4096k
- notifempty
- missingok
- create 640 squid root
- sharedscripts
- postrotate
- /etc/init.d/squid reload
- endscript
-}
-
-/var/log/squid/store.log {
- compress
- dateext
- maxage 365
- rotate 99
- size=+4096k
- notifempty
- missingok
- create 640 squid root
- sharedscripts
postrotate
/etc/init.d/squid reload
endscript
diff --git a/squid.spec b/squid.spec
index 2065f74..c20ef4a 100644
--- a/squid.spec
+++ b/squid.spec
@@ -21,10 +21,10 @@
#define snap -20131225-r13064
Name: squid
-Summary: Squid Version 3.3 WWW Proxy Server
+Summary: A fully featured HTTP/1.0 proxy
License: GPL-2.0+
Group: Productivity/Networking/Web/Proxy
-Version: 3.4.4
+Version: 3.4.6
Release: 0
Url: http://www.squid-cache.org/Versions/v3/3.4
#Source0: http://www.squid-cache.org/Versions/v3/3.3/%{name}-%{version}%{snap}.tar.bz2
@@ -65,6 +65,7 @@ Patch101: %{name}-nobuilddates.patch
Patch102: %{name}-compiled_without_RPM_OPT_FLAGS.patch
# patch fixes kerberos principalname handling (http://bugs.squid-cache.org/show_bug.cgi?id=4042)
Patch103: squid-brokenad.patch
+Patch104: %{name}-cert_tool_use_bash_not_ksh.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
PreReq: %fillup_prereq
@@ -93,7 +94,11 @@ BuildRequires: gpg-offline
BuildRequires: krb5-devel
BuildRequires: libcap-devel
BuildRequires: libexpat-devel
+%if 0%{?suse_version} <= 1140
BuildRequires: libtool
+%else
+BuildRequires: libtool >= 2.4
+%endif
BuildRequires: openldap2-devel
BuildRequires: opensp-devel
BuildRequires: openssl-devel
@@ -155,10 +160,16 @@ chmod a-x CREDITS
%patch101
%patch102
%patch103
+%patch104
%build
+#if 0%{?sles_version} == 1100
+#export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"
+#export CXXFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"
+#else
export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"
export CXXFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"
+#endif
export LDFLAGS='-Wl,-z,relro,-z,now -pie'
%configure \
--disable-strict-error-checking \
@@ -173,6 +184,9 @@ export LDFLAGS='-Wl,-z,relro,-z,now -pie'
--with-pidfile=/var/run/squid.pid \
%endif
--with-dl \
+%if 0%{?suse_version} <= 1140
+ --with-included-ltdl \
+%endif
--enable-disk-io \
--enable-storeio \
--enable-removal-policies=heap,lru \
@@ -202,7 +216,8 @@ export LDFLAGS='-Wl,-z,relro,-z,now -pie'
--enable-x-accelerator-vary \
--with-default-user=%{name} \
--disable-ident-lookups \
- --enable-follow-x-forwarded-for
+ --enable-follow-x-forwarded-for \
+ --disable-arch-native
# overwrite the number of open filedescriptors of configure to 4096
# to be backward compatible, but numbers above should not be overwritten