Hello community, here is the log from the commit of package squid3 for openSUSE:Factory checked in at Thu Apr 14 09:36:39 CEST 2011.
-------- --- squid3/squid3.changes 2011-04-06 16:40:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/squid3/squid3.changes 2011-04-12 15:12:05.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Apr 12 13:11:40 UTC 2011 - [email protected] + +- rework config patch + o 3.1.4 -> 3.1.12 +- add some comments for patches +- sort header TAGS + +------------------------------------------------------------------- +Mon Apr 11 03:03:01 UTC 2011 - [email protected] + +- Allow compile without SSLv2 + o no-sslv2 patch +- Supress build dates in binaries. + o nobuilddates patch +- Default cache storage type should be "aufs" in Linux + o update config patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- squid-3.1.4-config.patch New: ---- squid-3.1.12-config.patch squid-3.1.12-no-sslv2.patch squid-3.1.12-nobuilddates.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid3.spec ++++++ --- /var/tmp/diff_new_pack.oHviKQ/_old 2011-04-14 09:35:29.000000000 +0200 +++ /var/tmp/diff_new_pack.oHviKQ/_new 2011-04-14 09:35:29.000000000 +0200 @@ -22,16 +22,11 @@ Name: squid3 Summary: Squid Version 3 WWW Proxy Server Version: 3.1.12 -Release: 1 +Release: 3 License: GPLv2+ -Url: http://www.squid-cache.org/Versions/v3 Group: Productivity/Networking/Web/Proxy -PreReq: permissions -Conflicts: squid squid2 squid23 squid-beta -Obsoletes: squid-beta squid2 AutoReqProv: on -PreReq: %insserv_prereq %fillup_prereq -PreReq: pwdutils /usr/bin/getent +Url: http://www.squid-cache.org/Versions/v3 Source0: http://www.squid-cache.org/Versions/v3/3.0/squid-%{version}.tar.bz2 #%define squid_ldapauth_version 1.3 #Source1: squid_ldapauth-%{squid_ldapauth_version}.tar.bz2 @@ -52,9 +47,18 @@ # #Patch0: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9107.patch # -Patch100: squid-3.1.4-config.patch +# some useful defaults for squid +Patch100: squid-3.1.12-config.patch +# FIX SWAPDIR - make it a configure option Patch101: squid-3.1.10-swapdir.patch +# FIX for insecure SSLv2 - allow build without SSLv2 +Patch102: squid-3.1.12-no-sslv2.patch +# make build compare happy - remove build dates +Patch103: squid-3.1.12-nobuilddates.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: %insserv_prereq %fillup_prereq +PreReq: permissions +PreReq: pwdutils /usr/bin/getent # needed by bootstrap.sh BuildRequires: ed BuildRequires: db-devel expat gcc-c++ @@ -70,6 +74,8 @@ %endif Requires: logrotate Provides: http_proxy +Conflicts: squid squid2 squid23 squid-beta +Obsoletes: squid-beta squid2 %description Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and @@ -108,6 +114,8 @@ %endif perl -p -i -e 's|/usr/local/bin/perl|/usr/bin/perl|' `find -name "*.pl"` chmod a-x CREDITS +%patch102 +%patch103 %build %if 0%{suse_version} > 1010 ++++++ squid-3.1.4-config.patch -> squid-3.1.12-config.patch ++++++ --- squid3/squid-3.1.4-config.patch 2010-06-08 22:55:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/squid3/squid-3.1.12-config.patch 2011-04-12 15:12:05.000000000 +0200 @@ -1,17 +1,36 @@ -diff -ruN squid-3.1.4-orig/src/cf.data.pre squid-3.1.4/src/cf.data.pre ---- squid-3.1.4-orig/src/cf.data.pre 2010-05-30 15:21:11.000000000 +0200 -+++ squid-3.1.4/src/cf.data.pre 2010-06-08 21:11:17.000000000 +0200 -@@ -866,6 +866,9 @@ +diff -ruN squid-3.1.12-orig/src/cf.data.pre squid-3.1.12/src/cf.data.pre +--- squid-3.1.12-orig/src/cf.data.pre 2011-04-04 03:24:06.000000000 +0200 ++++ squid-3.1.12/src/cf.data.pre 2011-04-12 15:03:41.000000000 +0200 +@@ -915,6 +915,8 @@ + # Adapt localnet in the ACL section to list your (internal) IP networks + # from where browsing should be allowed http_access allow localnet ++ ++# Allow localhost always proxy functionality http_access allow localhost -+# allow localhost always proxy functionality -+http_access allow localhost -+ # And finally deny all other access to this proxy - http_access deny all +@@ -2290,6 +2292,10 @@ + Instead, if you want Squid to use the entire disk drive, + subtract 20% and use that value. + ++ Note on 'Mbytes': You need to consider the available RAM on the ++ machine versus the approx. 10MB RAM per 1GB of files which the ++ cache_dir index will consume. ++ + 'L1' is the number of first-level subdirectories which + will be created under the 'Directory'. The default is 16. + +@@ -2365,7 +2371,7 @@ + NOCOMMENT_START + + # Uncomment and adjust the following to add a disk cache directory. +-#cache_dir ufs @DEFAULT_SWAP_DIR@ 100 16 256 ++#cache_dir aufs @DEFAULT_SWAP_DIR@ 100 16 256 NOCOMMENT_END -@@ -2720,7 +2723,7 @@ + DOC_END + +@@ -2774,7 +2780,7 @@ NAME: logfile_rotate TYPE: int ++++++ squid-3.1.12-no-sslv2.patch ++++++ --- src/ssl_support.cc.orig +++ src/ssl_support.cc @@ -686,7 +686,12 @@ sslCreateServerContext(const char *certf case 2: debugs(83, 5, "Using SSLv2."); +#ifdef OPENSSL_NO_SSL2 + method = NULL; + fatalf("SSLv2 is insecure and no longer supported\n"); +#else method = SSLv2_server_method(); +#endif break; case 3: @@ -884,7 +889,12 @@ sslCreateClientContext(const char *certf case 2: debugs(83, 5, "Using SSLv2."); +#ifdef OPENSSL_NO_SSL2 + method = NULL; + fatalf("SSLv2 is no longer supported\n"); +#else method = SSLv2_client_method(); +#endif break; case 3: ++++++ squid-3.1.12-nobuilddates.patch ++++++ --- helpers/external_acl/mswin_ad_group/mswin_check_ad_group.c.orig +++ helpers/external_acl/mswin_ad_group/mswin_check_ad_group.c @@ -430,8 +430,7 @@ main(int argc, char *argv[]) if (!DefaultDomain) DefaultDomain = xstrdup(machinedomain); } - debug("External ACL win32 group helper build " __DATE__ ", " __TIME__ - " starting up...\n"); + debug("External ACL win32 group helper starting up...\n"); if (use_global) debug("Domain Global group mode enabled using '%s' as default domain.\n", DefaultDomain); if (use_case_insensitive_compare) --- helpers/external_acl/mswin_lm_group/win32_check_group.c.orig +++ helpers/external_acl/mswin_lm_group/win32_check_group.c @@ -546,8 +546,7 @@ main(int argc, char *argv[]) if (!DefaultDomain) DefaultDomain = xstrdup(machinedomain); } - debug("External ACL win32 group helper build " __DATE__ ", " __TIME__ - " starting up...\n"); + debug("External ACL win32 group helper starting up...\n"); if (use_global) debug("Domain Global group mode enabled using '%s' as default domain.\n", DefaultDomain); if (use_case_insensitive_compare) --- helpers/ntlm_auth/mswin_sspi/ntlm_auth.c.orig +++ helpers/ntlm_auth/mswin_sspi/ntlm_auth.c @@ -381,7 +381,7 @@ main(int argc, char *argv[]) process_options(argc, argv); - debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name); + debug("%s starting up...\n", my_program_name); if (LoadSecurityDll(SSP_NTLM, NTLM_PACKAGE_NAME) == NULL) { fprintf(stderr, "FATAL, can't initialize SSPI, exiting.\n"); --- helpers/ntlm_auth/fakeauth/fakeauth_auth.c.orig +++ helpers/ntlm_auth/fakeauth/fakeauth_auth.c @@ -389,7 +389,7 @@ main(int argc, char *argv[]) process_options(argc, argv); - debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name); + debug("%s starting up...\n", my_program_name); while (fgets(buf, BUFFER_SIZE, stdin) != NULL) { user[0] = '\0'; /*no usercode */ --- helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c.orig +++ helpers/ntlm_auth/smb_lm/ntlm_smb_lm_auth.c @@ -461,7 +461,7 @@ manage_request() int main(int argc, char *argv[]) { - debug("ntlm_auth build " __DATE__ ", " __TIME__ " starting up...\n"); + debug("ntlm_auth starting up...\n"); #ifdef DEBUG debug("changing dir to /tmp\n"); if (chdir("/tmp") != 0) { --- helpers/negotiate_auth/mswin_sspi/negotiate_auth.c.orig +++ helpers/negotiate_auth/mswin_sspi/negotiate_auth.c @@ -299,7 +299,7 @@ main(int argc, char *argv[]) process_options(argc, argv); - debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name); + debug("%s starting up...\n", my_program_name); if (LoadSecurityDll(SSP_NTLM, NEGOTIATE_PACKAGE_NAME) == NULL) { fprintf(stderr, "FATAL, can't initialize SSPI, exiting.\n"); --- helpers/basic_auth/mswin_sspi/mswin_auth.c.orig +++ helpers/basic_auth/mswin_sspi/mswin_auth.c @@ -118,7 +118,7 @@ main(int argc, char **argv) my_program_name = argv[0]; process_options(argc, argv); - debug("%s build " __DATE__ ", " __TIME__ " starting up...\n", my_program_name); + debug("%s starting up...\n", my_program_name); if (LoadSecurityDll(SSP_BASIC, NTLM_PACKAGE_NAME) == NULL) { fprintf(stderr, "FATAL, can't initialize SSPI, exiting.\n"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
