Mailinglist Archive: opensuse-commit (705 mails)

< Previous Next >
commit squid
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 13 Jul 2006 18:06:01 +0200 (CEST)
  • Message-id: <20060713160601.A986194DC8@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package squid
checked in at Thu Jul 13 18:06:01 CEST 2006.

--------
--- squid/squid.changes 2006-06-17 10:25:44.000000000 +0200
+++ squid/squid.changes 2006-07-13 16:50:03.000000000 +0200
@@ -1,0 +2,44 @@
+Thu Jul 13 16:45:27 CEST 2006 - kssingvo@xxxxxxx
+
+- upgrade to version 2.6.STABLE1:
+o bug fixes
+o Major improvements to the way that Squid handles web proxy,
+ accelerated and transparent proxy requests to make it easier to
+ configure transparent and acceleration functionality
+o WCCPv2 support multiple cache engines registering with multiple
+ WCCP routers and switches.
+o TPROXY totally transparent proxy support under Linux, which to
+ allow Squid to appear totally invisible to both client and server
+ systems when transparently caching requests.
+o Support for Etag and Vary HTTP headers.
+o Collapsed forwarding, which gives Squid the ability to
+ intelligently merge client requests for objects into one request
+ to the server.
+o Support for epoll under Linux, which gives Squid the ability to
+ handle many many more concurrent requests with lower CPU
+ overhead.
+o SSL assisted hardware encryption making use of OpenSSL
+ functionality within Squid.
+o Logging enhancements to allow even greater customization of the
+ way Squid logs requests in the access-log or to syslog if
+ required
+o Authentication enhancements including Negotiate/Kerberos support,
+ extra workarounds for NTLM clients and others using Microsoft
+ Integrated Login.
+o Additional external_acl parameters to support SSL and even more
+ client side parameters.
+o ACL changes in conjunction with SSL changes which have been
+ merged, to allow matching based on SSL certificate parameters.
+o New authentication helpers:
+ - Digest LDAP helper
+ - Native Windows basic, NTLM and negotiate helpers
+ - External acl helpers for session monitoring and native Windows
+ group membership check
+o HTCP significantly cleaned up and added support for the CLR
+ operation to purge contents from the cache
+o Support for parsing X-Forwarded-For headers allowing access
+ controls to be based on the real client IP even if behind secondary
+ proxies
+- adapted SUSE patches
+
+-------------------------------------------------------------------

Old:
----
squid-2.5.STABLE1-configure.patch
squid-2.5.STABLE10.patch
squid-2.5.STABLE12-Azerbaijani.patch
squid-2.5.STABLE12-RELEASENOTES.html
squid-2.5.STABLE12-REPORT.patch
squid-2.5.STABLE12-SMB_BadFetch.patch
squid-2.5.STABLE12-asyncio_counters.patch
squid-2.5.STABLE12-connstate_leak.patch
squid-2.5.STABLE12-delay_pool_reconfigure.patch
squid-2.5.STABLE12-devnull.patch
squid-2.5.STABLE12-empty_proxy_auth_acl.patch
squid-2.5.STABLE12-fc5.patch
squid-2.5.STABLE12-ftp_upload.patch
squid-2.5.STABLE12-ftpdates.patch
squid-2.5.STABLE12-ftpsymlink.patch
squid-2.5.STABLE12-ident_acl.patch
squid-2.5.STABLE12-irix_timezone.patch
squid-2.5.STABLE12-ldflags.patch
squid-2.5.STABLE12-log_206-4.patch
squid-2.5.STABLE12-longhostnames.patch
squid-2.5.STABLE12-max_user_ip_log-2.patch
squid-2.5.STABLE12-ntlm_nonpersistent.patch
squid-2.5.STABLE12-peer_dns_error.patch
squid-2.5.STABLE12-persistent_connection_after_error.patch
squid-2.5.STABLE12-prctl_args.patch
squid-2.5.STABLE12-range2GB-2.patch
squid-2.5.STABLE12-setenv.patch
squid-2.5.STABLE12-statefulhelpers_statistics.patch
squid-2.5.STABLE12-wbinfo_group.patch
squid-2.5.STABLE12.tar.bz2
squid-2.5.STABLE2-samba.patch
squid-2.5.STABLE4-samba3.patch

New:
----
squid-2.6.STABLE1-RELEASENOTES.html
squid-2.6.STABLE1-config.patch
squid-2.6.STABLE1-ldflags.patch
squid-2.6.STABLE1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ squid.spec ++++++
--- /var/tmp/diff_new_pack.jcby2F/_old 2006-07-13 18:05:19.000000000 +0200
+++ /var/tmp/diff_new_pack.jcby2F/_new 2006-07-13 18:05:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package squid (Version 2.5.STABLE12)
+# spec file for package squid (Version 2.6.STABLE1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,10 +11,10 @@
# norootforbuild

Name: squid
-BuildRequires: openldap2 openldap2-devel opensp-devel pam-devel samba sgmltool sharutils
+BuildRequires: db-devel openldap2 openldap2-devel opensp-devel pam-devel samba sgmltool sharutils valgrind
Summary: Squid WWW proxy server
-Version: 2.5.STABLE12
-Release: 19
+Version: 2.6.STABLE1
+Release: 1
License: GPL
URL: http://www.squid-cache.org
Group: Productivity/Networking/Web/Proxy
@@ -41,32 +41,32 @@
Source11: squid_ie_blocker.txt
Source12: http://www.squid-cache.org/WCCP-support/Linux/ip_wccp.c
Source13: squid.sysconfig
-Patch: squid-2.5.STABLE10.patch
-Patch1: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-setenv.patch
-Patch2: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-SMB_BadFetch.patch
-Patch3: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-wbinfo_group.patch
-Patch4: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-asyncio_counters.patch
-Patch5: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-prctl_args.patch
-Patch6: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-irix_timezone.patch
-Patch7: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-persistent_connection_after_error.patch
-Patch8: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-ftpsymlink.patch
-Patch9: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-ftpdates.patch
-Patch10: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-fc5.patch
-Patch11: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-devnull.patch
-Patch12: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-delay_pool_reconfigure.patch
-Patch13: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-range2GB-2.patch
-Patch14: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-ntlm_nonpersistent.patch
-Patch15: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-ident_acl.patch
-Patch16: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-ftp_upload.patch
-Patch17: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-empty_proxy_auth_acl.patch
-Patch18: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-log_206-4.patch
-Patch19: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-REPORT.patch
-Patch20: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-statefulhelpers_statistics.patch
-Patch21: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-peer_dns_error.patch
-Patch22: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-max_user_ip_log-2.patch
-Patch23: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-longhostnames.patch
-Patch24: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-connstate_leak.patch
-Patch25: http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE12-Azerbaijani.patch
+Patch0: squid-2.6.STABLE1-config.patch
+# Patch1: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch2: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch3: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch4: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch5: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch6: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch7: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch8: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch9: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch10: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch11: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch12: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch13: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch14: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch15: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch16: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch17: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch18: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch19: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch20: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch21: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch22: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch23: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch24: http://www.squid-cache.org/Versions/v2/2.5/bugs/
+# Patch25: http://www.squid-cache.org/Versions/v2/2.5/bugs/
# Patch26: http://www.squid-cache.org/Versions/v2/2.5/bugs/
# Patch27: http://www.squid-cache.org/Versions/v2/2.5/bugs/
# Patch28: http://www.squid-cache.org/Versions/v2/2.5/bugs/
@@ -103,12 +103,8 @@
# Patch59: http://www.squid-cache.org/Versions/v2/2.5/bugs/
# Patch99: http://www.squid-cache.org/~wessels/patch/libntlmssp.c.patch
Patch100: squid_ldapauth-%{squid_ldapauth_version}.dif
-Patch101: %{name}-2.5.STABLE1-configure.patch
-Patch102: squid-2.5.STABLE10-64bit.patch
-Patch103: %{name}-2.5.STABLE2-samba.patch
-Patch104: %{name}-2.5.STABLE4-samba3.patch
-# Patch105: squid-2.5.STABLE10-vprintf.patch
-Patch106: squid-2.5.STABLE12-ldflags.patch
+Patch101: %{name}-2.5.STABLE10-64bit.patch
+Patch102: %{name}-2.6.STABLE1-ldflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define squidconfdir /etc/squid

@@ -131,31 +127,31 @@
#mv msntauth-v2.0.3-squid.1 MSNT
#)
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
+# %patch1 -p1
+# %patch2 -p1
+# %patch3 -p1
+# %patch4 -p1
+# %patch5 -p1
+# %patch6 -p1
+# %patch7 -p1
+# %patch8 -p1
+# %patch9 -p1
+# %patch10 -p1
+# %patch11 -p1
+# %patch12 -p1
+# %patch13 -p1
+# %patch14 -p1
+# %patch15 -p1
+# %patch16 -p1
+# %patch17 -p1
+# %patch18 -p1
+# %patch19 -p1
+# %patch20 -p1
+# %patch21 -p1
+# %patch22 -p1
+# %patch23 -p1
+# %patch24 -p1
+# %patch25 -p1
# %patch26 -p1
# %patch27 -p1
# %patch28 -p1
@@ -197,21 +193,17 @@
)
%patch101 -p1
%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-# %patch105 -p1
-%patch106

%build
%{?suse_update_config:%{suse_update_config}}
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE -DLDAP_DEPRECATED -fno-strict-aliasing"
+export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIE -fpie -DLDAP_DEPRECATED -fno-strict-aliasing"
export CFLAGS="$RPM_OPT_FLAGS"
export LDFLAGS="-pie"
-touch NEWS AUTHORS
aclocal
+touch NEWS AUTHORS
automake
autoconf
-EGREP='/bin/egrep' ./configure --prefix=/usr \
+./configure --prefix=/usr \
--sysconfdir=%{squidconfdir} \
--bindir=/usr/sbin \
--sbindir=/usr/sbin \
@@ -221,14 +213,15 @@
--mandir=%{_mandir} \
--with-dl \
--with-maxfd=4096 \
+ --with-valgrind-debug \
--enable-snmp \
--enable-carp \
--enable-useragent-log \
- --enable-auth="basic digest ntlm" \
+ --enable-auth="basic digest negotiate ntlm" \
--enable-basic-auth-helpers="LDAP MSNT NCSA PAM SMB YP getpwnam multi-domain-NTLM" \
- --enable-ntlm-auth-helpers="SMB no_check" \
- --enable-digest-auth-helpers="password" \
- --enable-external-acl-helpers="ip_user ldap_group unix_group wbinfo_group" \
+ --enable-ntlm-auth-helpers="SMB fakeauth no_check" \
+ --enable-digest-auth-helpers="ldap password" \
+ --enable-external-acl-helpers="ip_user ldap_group session unix_group wbinfo_group" \
--enable-ntlm-fail-open \
--enable-referer-log \
--enable-arp-acl \
@@ -236,22 +229,25 @@
--enable-underscores \
--enable-stacktraces \
--enable-delay-pools \
+ --enable-useragent-log \
+ --enable-referer-log \
+ --enable-forward-log \
+ --enable-multicast-miss \
--enable-ssl \
--enable-cache-digests \
- --enable-storeio="aufs,ufs,diskd,null" \
+ --enable-auth-on-acceleration \
+ --enable-storeio="aufs,coss,diskd,null,ufs" \
--enable-linux-netfilter \
--enable-removal-policies="heap,lru" \
+ --enable-icmp \
--with-samba-sources=/usr/include/samba \
- --enable-x-accelerator-vary
+ --enable-large-cache-files \
+ --enable-x-accelerator-vary \
+ --enable-follow-x-forwarded-for
make DEFAULT_SWAP_DIR=/var/cache/squid \
DEFAULT_LOG_PREFIX=/var/log/squid \
- SAMBAPREFIX=/usr \
DEFAULT_PID_FILE=/var/run/squid.pid
make -C squid_ldapauth-%{squid_ldapauth_version}
-#make -C auth_modules/PAM
-#make -C auth_modules/NCSA
-#make -C auth_modules/YP
-##make -C doc/Programming-Guide
mkdir FAQ
cd FAQ
cp -p %{SOURCE10} .
@@ -265,10 +261,7 @@
%install
mkdir -p $RPM_BUILD_ROOT/var/{cache,log}/squid
mkdir -p $RPM_BUILD_ROOT/usr/sbin
-make install DESTDIR=$RPM_BUILD_ROOT SAMBAPREFIX=/usr
-#make install DESTDIR=$RPM_BUILD_ROOT -C auth_modules/PAM
-#make install DESTDIR=$RPM_BUILD_ROOT -C auth_modules/NCSA
-#make install DESTDIR=$RPM_BUILD_ROOT MAKE="make DESTDIR=$RPM_BUILD_ROOT" -C auth_modules/YP
+make install DESTDIR=$RPM_BUILD_ROOT
mv $RPM_BUILD_ROOT{/etc/squid/,/usr/share/squid/}mime.conf.default
mv $RPM_BUILD_ROOT{/etc/squid/,/usr/share/squid/}msntauth.conf.default
cp $RPM_BUILD_ROOT{/etc/squid/,/usr/share/squid/}msntauth.conf
@@ -284,8 +277,6 @@
install -m 644 helpers/basic_auth/PAM/pam_auth.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
install -m 644 helpers/external_acl/ldap_group/squid_ldap_group.8 $RPM_BUILD_ROOT/%{_mandir}/man8/
gzip -9 $RPM_BUILD_ROOT/%{_mandir}/man8/*.8
-#chown squid:root -R $RPM_BUILD_ROOT/var/{cache,log}/squid
-#chmod 750 $RPM_BUILD_ROOT/var/{cache,log}/squid
install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/squid
ln -sf /etc/init.d/squid $RPM_BUILD_ROOT/usr/sbin/rcsquid
install -d -m 755 doc/scripts
@@ -300,8 +291,6 @@
install -m 644 %{SOURCE11} doc/contrib
install -m 644 %{SOURCE12} doc/contrib
install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid
-#chown root:shadow $RPM_BUILD_ROOT/usr/sbin/pam_auth
-#chmod g+s $RPM_BUILD_ROOT/usr/sbin/pam_auth
pushd squid_ldapauth-%{squid_ldapauth_version}
install -m 750 squid_ldapauth $RPM_BUILD_ROOT/usr/sbin/
cp README ../README.squid_ldapauth
@@ -309,7 +298,6 @@
cp squid_ldapauth.conf ..
popd
cp -a helpers/external_acl/ip_user/README README.ip_user
-cp -a helpers/external_acl/winbind_group/readme.txt README.winbind_group
rm %{buildroot}/usr/sbin/Run*
rm -rf %{buildroot}%{squidconfdir}/errors
for i in errors/*; do
@@ -366,7 +354,9 @@
/usr/share/squid/mime.conf.default
/usr/share/squid/msntauth.conf
/usr/share/squid/msntauth.conf.default
-/usr/sbin/diskd
+/usr/sbin/digest_ldap_auth
+/usr/sbin/diskd-daemon
+/usr/sbin/fakeauth_auth
/usr/sbin/ip_user_check
/usr/sbin/squid_ldap_group
/usr/sbin/squid_unix_group
@@ -378,6 +368,7 @@
/usr/sbin/no_check.pl
/usr/sbin/ntlm_auth
%attr(2755,root,shadow)/usr/sbin/pam_auth
+/usr/sbin/pinger
/usr/sbin/rcsquid
/usr/sbin/smb_auth
/usr/sbin/smb_auth.pl
@@ -385,6 +376,7 @@
/usr/sbin/squid
/usr/sbin/squid_ldap_auth
%attr(750,squid,root) /usr/sbin/squid_ldapauth
+/usr/sbin/squid_session
/usr/sbin/squidclient
/usr/sbin/unlinkd
/usr/sbin/yp_auth
@@ -398,9 +390,50 @@
%doc doc/debug-sections.txt src/squid.conf.default
%doc README.squid_ldapauth CREDITS.squid_ldapauth
%doc squid_ldapauth.conf doc/%{name}-%{version}-RELEASENOTES.html
-%doc README.ip_user README.winbind_group
+%doc README.ip_user

%changelog -n squid
+* Thu Jul 13 2006 - kssingvo@xxxxxxx
+- upgrade to version 2.6.STABLE1:
+ o bug fixes
+ o Major improvements to the way that Squid handles web proxy,
+ accelerated and transparent proxy requests to make it easier to
+ configure transparent and acceleration functionality
+ o WCCPv2 support multiple cache engines registering with multiple
+ WCCP routers and switches.
+ o TPROXY totally transparent proxy support under Linux, which to
+ allow Squid to appear totally invisible to both client and server
+ systems when transparently caching requests.
+ o Support for Etag and Vary HTTP headers.
+ o Collapsed forwarding, which gives Squid the ability to
+ intelligently merge client requests for objects into one request
+ to the server.
+ o Support for epoll under Linux, which gives Squid the ability to
+ handle many many more concurrent requests with lower CPU
+ overhead.
+ o SSL assisted hardware encryption making use of OpenSSL
+ functionality within Squid.
+ o Logging enhancements to allow even greater customization of the
+ way Squid logs requests in the access-log or to syslog if
+ required
+ o Authentication enhancements including Negotiate/Kerberos support,
+ extra workarounds for NTLM clients and others using Microsoft
+ Integrated Login.
+ o Additional external_acl parameters to support SSL and even more
+ client side parameters.
+ o ACL changes in conjunction with SSL changes which have been
+ merged, to allow matching based on SSL certificate parameters.
+ o New authentication helpers:
+- Digest LDAP helper
+- Native Windows basic, NTLM and negotiate helpers
+- External acl helpers for session monitoring and native Windows
+ group membership check
+ o HTCP significantly cleaned up and added support for the CLR
+ operation to purge contents from the cache
+ o Support for parsing X-Forwarded-For headers allowing access
+ controls to be based on the real client IP even if behind secondary
+ proxies
+- adapted SUSE patches
* Sat Jun 17 2006 - schwab@xxxxxxx
- Fix typo.
* Fri Jun 16 2006 - schwab@xxxxxxx





++++++ squid-2.5.STABLE1-configure.patch -> squid-2.6.STABLE1-config.patch ++++++
--- squid/squid-2.5.STABLE1-configure.patch 2006-01-20 17:35:32.000000000 +0100
+++ squid/squid-2.6.STABLE1-config.patch 2006-07-12 16:39:29.000000000 +0200
@@ -1,11 +1,59 @@
---- squid-2.5.STABLE1/configure.in.orig 2003-02-03 16:05:48.000000000 +0000
-+++ squid-2.5.STABLE1/configure.in 2003-02-03 16:06:36.000000000 +0000
-@@ -2078,7 +2079,7 @@
- else
- AC_MSG_RESULT("no")
- echo "Will use our own inet_ntoa()."
-- LIBOBJS="$LIBOBJS inet_ntoa.o"
-+ AC_LIBOBJ([inet_ntoa])
- # echo "WARNING: This looks bad, and probably prevents Squid from working."
- # echo " If you're on IRIX and using GCC 2.8, you probably need"
- # echo " to use the IRIX C compiler instead."
+--- squid-2.6.STABLE1/src/Makefile.in.orig 2006-06-12 08:10:08.000000000 +0200
++++ squid-2.6.STABLE1/src/Makefile.in 2006-07-12 16:38:38.000000000 +0200
+@@ -584,7 +584,7 @@
+ DEFAULT_ICP_PORT = @CACHE_ICP_PORT@
+ DEFAULT_PREFIX = $(prefix)
+ DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
+-DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
++DEFAULT_MIME_TABLE = $(datadir)/mime.conf
+ DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_LOG_PREFIX = $(localstatedir)/logs
+ DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
+--- squid-2.6.STABLE1/src/cf.data.pre.orig 2006-06-30 23:23:05.000000000 +0200
++++ squid-2.6.STABLE1/src/cf.data.pre 2006-07-12 16:37:51.000000000 +0200
+@@ -320,7 +320,7 @@
+ NAME: htcp_port
+ IFDEF: USE_HTCP
+ TYPE: ushort
+-DEFAULT: 4827
++DEFAULT: 0
+ LOC: Config.Port.htcp
+ DOC_START
+ The port number where Squid sends and receives HTCP queries to
+@@ -2898,6 +2898,7 @@
+ # be allowed
+ #acl our_networks src 192.168.1.0/24 192.168.2.0/24
+ #http_access allow our_networks
++http_access allow localhost
+
+ # And finally deny all other access to this proxy
+ http_access deny all
+@@ -3230,7 +3231,7 @@
+
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: squid
+ LOC: Config.effectiveUser
+ DOC_START
+ If you start Squid as root, it will change its effective/real
+@@ -3421,7 +3422,7 @@
+
+ NAME: logfile_rotate
+ TYPE: int
+-DEFAULT: 10
++DEFAULT: 0
+ LOC: Config.Log.rotateNumber
+ DOC_START
+ Specifies the number of logfile rotations to make when you
+@@ -3437,6 +3438,10 @@
+ purposes, so -k rotate uses another signal. It is best to get
+ in the habit of using 'squid -k rotate' instead of 'kill -USR1
+ <pid>'.
++
++ SUSE LINUX is using the logrotate mechanism and therefore the
++ rotation is done externaly, which means a default of 0 is
++ required and therefore set. Modify /etc/logrotate.d/squid instead.
+ DOC_END
+
+

++++++ squid-2.5.STABLE12-ldflags.patch -> squid-2.6.STABLE1-ldflags.patch ++++++
--- squid/squid-2.5.STABLE12-ldflags.patch 2006-06-17 00:10:02.000000000 +0200
+++ squid/squid-2.6.STABLE1-ldflags.patch 2006-07-13 16:33:11.000000000 +0200
@@ -1,14 +1,23 @@
---- configure.in
-+++ configure.in
-@@ -2164,6 +2164,7 @@
+--- squid-2.6.STABLE1/configure.in.orig 2006-07-01 20:42:47.000000000 +0200
++++ squid-2.6.STABLE1/configure.in 2006-07-13 16:24:23.000000000 +0200
+@@ -1416,7 +1416,7 @@
+ echo "Enabling automatic stack backtraces on fatal errors"
+ AC_DEFINE(PRINT_STACK_TRACE, 1, [Print stacktraces on fatal errors])
+ if test "$GCC" = "yes"; then
+- LDFLAGS="$CFLAGS -rdynamic"
++ LDFLAGS="$LDFLAGS -rdynamic"
+ fi
+ fi
+ ])
+@@ -2672,6 +2672,7 @@
SQUID_MAXFD=256,
SQUID_MAXFD=256)
AC_MSG_RESULT($SQUID_MAXFD)
-+LDFLAGS="$TLDFLAGS"
++LDFLAGS="$TLDFLAGS $PRESET_LDFLAGS"
fi # --with-maxfd SQUID_MAXFD
- AC_DEFINE_UNQUOTED(SQUID_MAXFD, $SQUID_MAXFD)
+ AC_DEFINE_UNQUOTED(SQUID_MAXFD, $SQUID_MAXFD, [Maximum number of open filedescriptors])
if test "$SQUID_MAXFD" -lt 512 ; then
-@@ -2173,7 +2174,6 @@
+@@ -2681,7 +2682,6 @@
echo " on how to increase your filedescriptor limit"
sleep 10
fi

++++++ squid-2.5.STABLE12.tar.bz2 -> squid-2.6.STABLE1.tar.bz2 ++++++
++++ 115075 lines of diff (skipped)






++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx

< Previous Next >
This Thread