Hello community, here is the log from the commit of package squid-beta for openSUSE:Factory checked in at Wed Apr 21 01:57:50 CEST 2010. -------- --- squid-beta/squid-beta.changes 2009-11-03 20:22:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/squid-beta/squid-beta.changes 2010-04-20 17:40:20.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 20 17:39:24 CEST 2010 - meissner@suse.de + +- fixed build with openssl 1.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- squid-beta-fix-build.patch squid-beta-fix-openssl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid-beta.spec ++++++ --- /var/tmp/diff_new_pack.hW5MSR/_old 2010-04-21 01:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hW5MSR/_new 2010-04-21 01:57:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package squid-beta (Version 3.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: openldap2-devel opensp-devel pam-devel sharutils Summary: Squid V3.0 WWW Proxy Server (new version) Version: 3.0 -Release: 448 +Release: 449 License: GPLv2+ %define ver PRE6 Url: http://www.squid-cache.org @@ -136,6 +136,8 @@ Patch110: squid3-3.0.STABLE1-icap_memset.patch Patch111: squid3-3.0.STABLE1-snmp_strncat.patch Patch112: squid-beta-3.0-strchr.patch +Patch113: squid-beta-fix-openssl.patch +Patch114: squid-beta-fix-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define squidlibdir %{_libdir}/squid %define squidconfdir /etc/squid @@ -269,6 +271,8 @@ %patch110 -p1 %patch111 -p1 %patch112 +%patch113 -p1 +%patch114 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fPIE -fPIC -fno-strict-aliasing" ++++++ squid-beta-fix-build.patch ++++++ Index: squid-3.0.PRE6/src/wccp2.cc =================================================================== --- squid-3.0.PRE6.orig/src/wccp2.cc +++ squid-3.0.PRE6/src/wccp2.cc @@ -1142,6 +1142,7 @@ wccp2HandleUdp(int sock, void *not_used) int num_caches; debugs(80, 6, "wccp2HandleUdp: Called."); + memset (&cache_address, 0, sizeof(cache_address)); commSetSelect(sock, COMM_SELECT_READ, wccp2HandleUdp, NULL, 0); ++++++ squid-beta-fix-openssl.patch ++++++ Index: squid-3.0.PRE6/src/ssl_support.cc =================================================================== --- squid-3.0.PRE6.orig/src/ssl_support.cc +++ squid-3.0.PRE6/src/ssl_support.cc @@ -529,7 +529,7 @@ SSL_CTX * sslCreateServerContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *clientCA, const char *CAfile, const char *CApath, const char *CRLfile, const char *dhfile, const char *context) { int ssl_error; - SSL_METHOD *method; + const SSL_METHOD *method; SSL_CTX *sslContext; long fl = ssl_parse_flags(flags); @@ -726,7 +726,7 @@ SSL_CTX * sslCreateClientContext(const char *certfile, const char *keyfile, int version, const char *cipher, const char *options, const char *flags, const char *CAfile, const char *CApath, const char *CRLfile) { int ssl_error; - SSL_METHOD *method; + const SSL_METHOD *method; SSL_CTX *sslContext; long fl = ssl_parse_flags(flags); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org