Accepting request 197900 from server:proxy:Test

update to 3.3.8

OBS-URL: https://build.opensuse.org/request/show/197900
OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=43

squid-3.2.13.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:92144b72088ac93de7a0d387266172238bfd4e36ed90996af676e406c0c64e35
-size 2898293

squid-3.2.13.tar.bz2.asc

@@ -1,20 +0,0 @@
-File: squid-3.2.13.tar.bz2
-Date: Sat Jul 13 13:49:04 UTC 2013
-Size: 2898293
-MD5 : 367e59c9c25da7ebbfbf7cbc36d2444e
-SHA1: f253df4981981c297cc7e719908e07b046506952
-Key : 0xFF5CF463 <squid3@treenet.co.nz>
-      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.4.12 (GNU/Linux)
-
-iQEcBAABAgAGBQJR4VuSAAoJELJo5wb/XPRjDMsH+gN9MyL0RAegBfeJtScW7dOU
-E7ZPl8BjUqYTOoLPxXX95MTm6gJzzZ69S6ss8+db4fYd6kbGgkX/G05R0E5PBQJG
-2OnJU1LUUzBcqTedai1SCuL90gVgy7oqzke6qlT43SSzuKPzmvlrtnBOrXK1guy0
-xCFNFRtuZKIUVAyERlgE6tP0iPn5DZqSqGwGOx/lkNB20bgx83Amy7uav1F/d9Ps
-sillN9btek4azrPqyqDXoSv+Tqh0u3Ni+zSQJrbVJ59QGFA38OLdW3i3MphgNg5N
-/HkAGnfsCzJHQlxoM5kKz11U4caIv57gy9ZXIJ8peIIldOiLrfG1zcL/awyQVJc=
-=hNXf
------END PGP SIGNATURE-----

squid-3.3.8.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6411f344510e780f9e579851151278e1d02d8fe06a56abb1d97b1c53c61326a1
+size 2992708

squid-3.3.8.tar.bz2.asc

@@ -0,0 +1,20 @@
+File: squid-3.3.8.tar.bz2
+Date: Sat Jul 13 13:52:06 UTC 2013
+Size: 2992708
+MD5 : ec1654d28e29bdd2ee342ffb655ecc72
+SHA1: 127c8252577bce25b62cb0d05b0fef7f3f379c23
+Key : 0xFF5CF463 <squid3@treenet.co.nz>
+      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.4.12 (GNU/Linux)
+
+iQEcBAABAgAGBQJR4V5xAAoJELJo5wb/XPRjMh4H/jpt78U0JMJFXGFZskB82MIJ
+XGJrDlXyfop9guKKhRZHI7bJ67rx89Qox39kS2PaAapyBTGyJoQ8J14fuqdIFsJq
+TFk0HdZQZnvS+KLDH5QeDoJOj75dxh8aLRMJoQFnRemWHfDKaUzHqzTdKu6qYmoK
+0bv6esXV1tcTrpkFTTccMTYIjeGZNjRXQaEEx7iq7sVyIdzREzTHZgzXXevjCPKf
+kGv4IREJglpRPL6rVNZXFM0fZwxy99gcRN9RaEFXUk2s74XYAM0wonYJr/BOm3tB
+8Oc3Iwj6Z3Zb90MB2lQ5jCOaTSn7JeW16YMsm9+HOyRtjkPF8bgeswtIn4lhRcQ=
+=dmPd
+-----END PGP SIGNATURE-----

squid-compiled_without_RPM_OPT_FLAGS.patch

@@ -2,10 +2,10 @@ Index: src/Makefile.am
 ===================================================================
 --- src/Makefile.am.orig
 +++ src/Makefile.am
-@@ -917,7 +917,7 @@ cache_cf.o: cf_parser.cci
+@@ -975,7 +975,7 @@ cache_cf.o: cf_parser.cci
  
  # cf_gen builds the configuration files.
- cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
 -	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
 +	$(HOSTCXX) $(CXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
  
@@ -15,10 +15,10 @@ Index: src/Makefile.in
 ===================================================================
 --- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -6573,7 +6573,7 @@ cache_cf.o: cf_parser.cci
+@@ -7295,7 +7295,7 @@ cache_cf.o: cf_parser.cci
  
  # cf_gen builds the configuration files.
- cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
 -	$(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
 +	$(HOSTCXX) $(CXXFLAGS) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
  

squid-config.patch

@@ -2,7 +2,7 @@ Index: src/cf.data.pre
 ===================================================================
 --- src/cf.data.pre.orig
 +++ src/cf.data.pre
-@@ -1081,6 +1081,8 @@ http_access deny CONNECT !SSL_ports
+@@ -1195,6 +1195,8 @@ http_access deny manager
  # Adapt localnet in the ACL section to list your (internal) IP networks
  # from where browsing should be allowed
  http_access allow localnet
@@ -11,7 +11,7 @@ Index: src/cf.data.pre
  http_access allow localhost
  
  # And finally deny all other access to this proxy
-@@ -2782,6 +2784,10 @@ DOC_START
+@@ -3143,6 +3145,10 @@ DOC_START
  	Instead, if you want Squid to use the entire disk drive,
  	subtract 20% and use that value.
  
@@ -22,7 +22,7 @@ Index: src/cf.data.pre
  	'L1' is the number of first-level subdirectories which
  	will be created under the 'Directory'.  The default is 16.
  
-@@ -2896,7 +2902,7 @@ DOC_START
+@@ -3276,7 +3282,7 @@ DOC_START
  NOCOMMENT_START
  
  # Uncomment and adjust the following to add a disk cache directory.
@@ -31,7 +31,7 @@ Index: src/cf.data.pre
  NOCOMMENT_END
  DOC_END
  
-@@ -3407,7 +3413,7 @@ DOC_END
+@@ -3889,7 +3895,7 @@ DOC_END
  
  NAME: logfile_rotate
  TYPE: int

squid-fix-pod2man-check.patch

@@ -1,11 +1,24 @@
-diff -urN squid-3.2.11.old/helpers/basic_auth/DB/config.test squid-3.2.11/helpers/basic_auth/DB/config.test
+Index: helpers/basic_auth/DB/config.test
---- squid-3.2.11.old/helpers/basic_auth/DB/config.test	2013-07-25 12:15:59.645954336 +0200
+===================================================================
-+++ squid-3.2.11/helpers/basic_auth/DB/config.test	2013-07-25 12:16:26.881955259 +0200
+--- helpers/basic_auth/DB/config.test.orig
++++ helpers/basic_auth/DB/config.test
 @@ -2,6 +2,6 @@
  
  ## Test: do we have perl to build the helper scripts?
  ## Test: do we have pod2man to build the manual?
 -perl --version >/dev/null && echo | pod2man >/dev/null
-+perl --version >/dev/null && echo =encoding US-ASCII | pod2man >/dev/null
++perl --version >/dev/null && pod2man --help >/dev/null
+ 
+ exit $?
+Index: helpers/log_daemon/DB/config.test
+===================================================================
+--- helpers/log_daemon/DB/config.test.orig
++++ helpers/log_daemon/DB/config.test
+@@ -2,6 +2,6 @@
+ 
+ ## Test: do we have perl to build the helper scripts?
+ ## Test: do we have pod2man to build the manual?
+-perl --version >/dev/null && echo | pod2man >/dev/null
++perl --version >/dev/null && pod2man --help >/dev/null
  
  exit $?

squid-nobuilddates.patch

@@ -23,7 +23,7 @@ Index: helpers/external_acl/AD_group/ext_ad_group_acl.cc
 ===================================================================
 --- helpers/external_acl/AD_group/ext_ad_group_acl.cc.orig
 +++ helpers/external_acl/AD_group/ext_ad_group_acl.cc
-@@ -815,8 +815,7 @@ main(int argc, char *argv[])
+@@ -800,8 +800,7 @@ main(int argc, char *argv[])
          if (!DefaultDomain)
              DefaultDomain = xstrdup(machinedomain);
      }
@@ -37,7 +37,7 @@ Index: helpers/external_acl/LM_group/ext_lm_group_acl.cc
 ===================================================================
 --- helpers/external_acl/LM_group/ext_lm_group_acl.cc.orig
 +++ helpers/external_acl/LM_group/ext_lm_group_acl.cc
-@@ -546,8 +546,7 @@ main(int argc, char *argv[])
+@@ -539,8 +539,7 @@ main(int argc, char *argv[])
          if (!DefaultDomain)
              DefaultDomain = xstrdup(machinedomain);
      }
@@ -64,7 +64,7 @@ Index: helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
 ===================================================================
 --- helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc.orig
 +++ helpers/ntlm_auth/SSPI/ntlm_sspi_auth.cc
-@@ -612,7 +612,7 @@ main(int argc, char *argv[])
+@@ -609,7 +609,7 @@ main(int argc, char *argv[])
  
      process_options(argc, argv);
  
@@ -77,7 +77,7 @@ Index: helpers/ntlm_auth/fake/ntlm_fake_auth.cc
 ===================================================================
 --- helpers/ntlm_auth/fake/ntlm_fake_auth.cc.orig
 +++ helpers/ntlm_auth/fake/ntlm_fake_auth.cc
-@@ -175,7 +175,7 @@ main(int argc, char *argv[])
+@@ -173,7 +173,7 @@ main(int argc, char *argv[])
  
      process_options(argc, argv);
  
@@ -90,7 +90,7 @@ Index: helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc
 ===================================================================
 --- helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc.orig
 +++ helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.cc
-@@ -683,7 +683,7 @@ manage_request()
+@@ -632,7 +632,7 @@ manage_request()
  int
  main(int argc, char *argv[])
  {

squid.changes

@@ -1,3 +1,88 @@
+-------------------------------------------------------------------
+Thu Sep  5 11:43:22 UTC 2013 - chris@computersalat.de
+
+- fix build for Factory
+  * rework fix-pod2man-check
+
+-------------------------------------------------------------------
+Mon Sep  2 21:58:38 UTC 2013 - chris@computersalat.de
+
+- fix build for 1110 (SLES_11)
+  * add configure --disable-strict-error-checking
+
+-------------------------------------------------------------------
+Sun Sep  1 12:25:46 UTC 2013 - chris@computersalat.de
+
+- Changes to squid-3.3.8 (13 Jul 2013):
+  * Bug 3869: assertion failed: MemBuf.cc:272: size < capacity
+  * Improved handling of port values in Host: header validation
+- Changes to squid-3.3.7 (11 Jul 2013):
+  * Bug 3297: Fix openSSL related build failures
+  * Fix build on FreeBSD 9.x platform with clang
+  * Protect against buffer overrun in DNS query generation
+- Changes to squid-3.3.6 (01 Jul 2013):
+  * Bug 3854: pt1: compile errors on AIX
+  * Bug 3802: Fix wrong check inside Format::Format::assemble
+  * Bug 3762: remove bogus WARNING in cache.log
+  * Bug 3717: assertion failed with dstdom_regex with IP based URL
+  * Bug 1991: kqueue causes SSL to hang
+  * Ask for SSL key password when started with -N but without sslpassword_program
+  * Make sure %<tt includes all [failed] connection attempts
+  * Support HTTP reply ACLs in icap_log and log_icap
+  * Fix incorrect external_acl_type codes
+  * Fix ICAP logging request headers and segmentation faults
+  * ... and some documentation polish
+- Changes to squid-3.3.5 (20 May 2013):
+  * Bug 3851: Delay Pool class 5 tag:levels displayed incorrectly in cache manager
+  * Bug 3845: http_port tcpkeepalive= option fails parsing
+  * Bug 3840: assertion failed 'sde' in UFS cache loading
+  * Bug 3836: make check failures with automake-1.13
+  * Bug 3827: Remove AccessLogEntry::cache.authuser
+  * Bug 3816 pt2: SSL_get_certificate call inside Ssl::verifySslCertificate crashes
+  * Bug 3780: cachemgr.cgi: output problem in HTTP Header Statistics
+  * Bug 3759: OpenSSL compilation error on stock Fedora17, RHEL, CentOS 6 systems
+  * Bug 3744: squid terminated: FATAL: Bungled (null) line 3: sslproxy_cert_sign
+    signTrusted all
+  * Port from 2.6: external acl %ACL and %DATA tags
+  * Update copyright on SN.png
+  * ... and several minor memory leaks
+  * ... and some documentation polish
+- Changes to squid-3.3.4 (27 Apr 2013):
+  * Bug 3831: basic_ncsa_auth Blowfish and SHA support
+  * Bug 3816: SSL_get_certificate call inside Ssl::verifySslCertificate crashes
+  * Bug 3794: MacOS: workaround compiler errors and case-insensitivity
+  * Bug 3781: Proxy Authentication not sent to cache_peer
+  * Bug 3720 pt1: SourceLayout: shuffle fd_table definition into fde.h
+  * Bug 3720 pt2: Add missing include in /dev/poll I/O module
+  * Bug 3674: Improve compiler detection, better support warnings-as-errors on clang
+  * Add support for TPROXY on BSD
+  * Fix SSL Bump bypass for intercepted traffic
+  * Fix memory leaks in ConnStateData pinning
+  * Fix external_acl.cc "inBackground" assertion on queue overloads
+  * CacheMgr: fix missing column separator in helper stats
+  * OpenBSD: libpthreads requires OpenBSD 5.2 or later
+  * ... and lots of documentation updates
+  * ... and all changes from squid 3.2.10
+- Changes to squid-3.3.3 (12 Mar 2013):
+  * Bug 3720: Add missing include in /dev/poll I/O module (pt2)
+  * ... and all changes from squid 3.2.9
+- Changes to squid-3.3.2 (02 Mar 2013):
+  * Bug 3781: Proxy Authentication not sent to cache_peer
+  * Bug 3794: MacOS: workaround compiler errors
+  * Bug 3720: Compile error in Solaris /OpenIndiana
+  * ... and all changes from squid 3.2.8
+- Changes to squid-3.3.1 (09 Feb 2013):
+  * Bug 3726: build errors with --disable-ssl
+  * Propigate pinned connection persistency and closures to the client.
+  * Mimic SSL certificate Key Usage and Basic Constraints
+  * Fix segmentation fault on missing squid.conf values
+  * ext_sql_session_acl: Fix hex decoding on UID
+  * ... and some code polish
+  * ... and a lot of documentation polish
+  * ... and all changes from squid 3.2.7
+- rebase patches
+  * config, nobuilddates, compiled_without_RPM_OPT_FLAGS
+
 -------------------------------------------------------------------
 Sun Jul 28 12:44:37 UTC 2013 - bruno@ioda-net.ch
 

squid.spec

@@ -18,16 +18,15 @@
 
 %define		squidlibdir %{_libdir}/squid
 %define		squidconfdir /etc/squid
-%define		version_published	"2013-07-24"
 
 Name:           squid
-Summary:        Squid Version 3.2 WWW Proxy Server
+Summary:        Squid Version 3.3 WWW Proxy Server
 License:        GPL-2.0+
 Group:          Productivity/Networking/Web/Proxy
-Version:        3.2.13
+Version:        3.3.8
 Release:        0
-Url:            http://www.squid-cache.org/Versions/v3/3.2
+Url:            http://www.squid-cache.org/Versions/v3/3.3
-Source0:        http://www.squid-cache.org/Versions/v3/3.2/%{name}-%{version}.tar.bz2
+Source0:        http://www.squid-cache.org/Versions/v3/3.3/%{name}-%{version}.tar.bz2
 Source1:        %{name}-%{version}.tar.bz2.asc
 Source2:        RELEASENOTES.html
 Source3:        squid.init
@@ -118,26 +117,19 @@ Obsoletes:      %{name}3 < %{version}
 %description
 Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. It reduces bandwidth and improves response times by caching and reusing frequently-requested web pages. Squid has extensive access controls and makes a great server accelerator.
 
-Squid 3.2 represents a new feature release above 3.1.
+Squid 3.3 represents a new feature release above 3.2.
 
 The most important of these new features are:
 
- * CVE-2009-0801 : NAT interception vulnerability to malicious clients.
+  * SQL Database logging helper
- * NCSA helper DES algorithm password limits
+  * Time-Quota session helper
- * SMP scalability
+  * SSL-Bump Server First
- * Helper Multiplexer and On-Demand
+  * Server Certificate Mimic
- * Helper Name Changes
+  * Custom HTTP request headers
- * Multi-Lingual manuals
- * Solaris 10 pthreads Support
- * Surrogate/1.0 protocol extensions to HTTP
- * Logging Infrastructure Updated
- * Client Bandwidth Limits
- * Better eCAP support
- * Cache Manager access changes
 
-  First STABLE release Date: 02 Aug 2010
+Most user-facing changes are reflected in squid.conf (see below).
-  Latest Release: %{version}
+
-  Latest Release Date: %{version_published}
+  First STABLE release Date: 20 Oct 2012
 
 %prep
 %gpg_verify %{S:1}
@@ -151,13 +143,17 @@ perl -p -i -e 's|/usr/local/bin/perl|/usr/bin/perl|' `find -name "*.pl"`
 chmod a-x CREDITS
 %patch101
 %patch102
-%patch103 -p1
+%patch103
 
 %build
 export CFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"
 export CXXFLAGS="%{optflags} -fPIE -fPIC -DOPENSSL_LOAD_CONF"
 export LDFLAGS='-Wl,-z,relro,-z,now -pie'
-./configure --prefix=/usr \
+./configure \
+%if 0%{?suse_version} == 1110
+	--disable-strict-error-checking \
+%endif
+	--prefix=/usr \
 	--sysconfdir=%{squidconfdir} \
 	--bindir=/usr/sbin \
 	--sbindir=/usr/sbin \
@@ -384,6 +380,7 @@ rm -rf %{buildroot}
 %{_sbindir}/ext_unix_group_acl
 %{_sbindir}/ext_wbinfo_group_acl
 %{_sbindir}/helper-mux.pl
+%{_sbindir}/log_db_daemon
 %{_sbindir}/log_file_daemon
 %{_sbindir}/negotiate_kerberos_auth
 %{_sbindir}/negotiate_kerberos_auth_test