Hello community, here is the log from the commit of package squid3 for openSUSE:Factory checked in at Fri Jul 23 22:17:14 CEST 2010. -------- --- squid3/squid3.changes 2010-03-16 23:29:13.000000000 +0100 +++ squid3/squid3.changes 2010-06-09 13:52:24.000000000 +0200 @@ -1,0 +2,43 @@ +Wed Jun 9 11:51:33 UTC 2010 - chris@computersalat.de + +- fix build for SLE_10 + o added bootstrap patch + o fix permissions.secure for pam_auth +- spec mods + o build with --mandir + o add BuildReq libcap-devel (TPROXY) + +------------------------------------------------------------------- +Tue Jun 8 20:54:20 UTC 2010 - chris@computersalat.de + +- new version 3.1.4 + - Bug 2933: Verification of the max. port number for WCCP2 dynamic service + - Bug 2924: RADIUS helper compile issues + - Bug 2922: Fix assertion failed: HttpHeader.cc: "Headers[id].stat.aliveCount" + - Bug 2919: tcp_outgoing_address ACLs not obeying acl_uses_indirect_client + - Bug 2896: Fix assertion failed: comm.cc:2063: "!fd_table[fd].closing()" + - Bug 2879: pt2: 3.0 regression in headers end finding + - Bug 2877: pt2: only output zero-size warning on reverse-proxy requests + - Bug 2876: FD_SETSIZE override not working on all linux distributions + - Bug 2810: common log format generates 2 lines of syslog + - Bug 2789: Optimize unlimited memory pools, and correctly handle limits over 2GB + - Bug 2753: Fall back on IPv4 if IPv6 is not present + - Bug 2697: Adaptation leaks and extra requests after reconfiguration + - Bug 2633: Fix Ecap::HeaderRep::value(name) fails when there is no named header field + - Change LDAP helpers to default to LDAP version 3 if available + - Add Joomla and Salted Hash support to squid_db_auth helper + - Fixed IpAddress port printing for ports higher than 9999 + - Disable chunked memory pooling by default. + - ... and several build errors. +- reworked config patch with fuzz=0 +- removed libxml2 patch +- added swapdir patch +- reworked ldap patch +- adopt build_option storeio: (build all) + o --enable-storeio=aufs,diskd,null,ufs -> --enable-storeio +- adopt build_option ntlm-auth-helpers: SMB -> smb_lm + o ntlm_auth -> ntlm_smb_lm_auth +- enable parallel build +- fix permissions file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- squid-3.0.STABLE25-RELEASENOTES.html squid-3.0.STABLE25.tar.bz2 squid-beta-3.0-libmxl2.patch squid-beta-3.0-openldap.patch squid3-3.0.STABLE1-config.patch New: ---- RELEASENOTES.html squid-3.1.4-config.patch squid-3.1.4-openldap.patch squid-3.1.4-swapdir.patch squid-3.1.4.tar.bz2 squid-bootstrap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid3.spec ++++++ --- /var/tmp/diff_new_pack.3uG5DN/_old 2010-07-23 22:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.3uG5DN/_new 2010-07-23 22:13:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package squid3 (Version 3.0.STABLE25) +# spec file for package squid3 (Version 3.1.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,10 @@ %define squidlibdir %{_libdir}/squid %define squidconfdir /etc/squid -#Distribution: %dist -#Packager: %packager -#Vendor: %vendor Name: squid3 Summary: Squid Version 3 WWW Proxy Server -Version: 3.0.STABLE25 +Version: 3.1.4 Release: 1 License: GPLv2+ Url: http://www.squid-cache.org/Versions/v3 @@ -40,14 +37,13 @@ #%define squid_ldapauth_version 1.3 #Source1: squid_ldapauth-%{squid_ldapauth_version}.tar.bz2 Source2: rc.squid -Source3: squid-%{version}-RELEASENOTES.html +Source3: RELEASENOTES.html Source5: pam.squid Source6: unsquid.pl Source7: squid.logrotate Source9: squid.permissions Source10: squid.sysconfig Source11: README.kerberos -Patch0: squid3-3.0.STABLE1-config.patch # # the following patches are downloaded directly from the webserver # don't change the names for easier identification @@ -55,37 +51,25 @@ # please read every file if there is interest about what the patch changes # or just visit: http://www.squid-cache.org/Versions/v3/3.0/changesets/ # -#Patch1: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9107.patch -#Patch2: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9108.patch -#Patch3: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9109.patch -#Patch4: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9110.patch -#Patch5: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9111.patch -#Patch6: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9112.patch -#Patch7: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9113.patch -#Patch8: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9114.patch -#Patch9: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9115.patch -#Patch10: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9116.patch -#Patch11: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9117.patch -#Patch12: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9118.patch -#Patch13: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9119.patch -#Patch14: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9120.patch -#Patch15: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9121.patch -#Patch16: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9122.patch -#Patch17: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9123.patch -#Patch18: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9124.patch +#Patch0: http://www.squid-cache.org/Versions/v3/3.0/changesets/squid-3.0-9107.patch # -Patch101: squid-beta-3.0-libmxl2.patch +Patch100: squid-3.1.4-config.patch +Patch101: squid-3.1.4-swapdir.patch Patch102: squid-beta-3.0-ia64.patch -Patch103: squid-beta-3.0-openldap.patch +Patch103: squid-3.1.4-openldap.patch Patch104: squid-beta-3.0-mem_node_64bit.patch +# only for SLE_10 +Patch110: squid-bootstrap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +# needed by bootstrap.sh +BuildRequires: ed BuildRequires: db-devel expat gcc-c++ %if 0%{?sles_version} == 9 BuildRequires: heimdal-devel %else BuildRequires: krb5-devel %endif -BuildRequires: libexpat-devel libxml2-devel +BuildRequires: libcap-devel libexpat-devel libxml2-devel BuildRequires: openldap2-devel opensp-devel pam-devel sharutils %if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8 BuildRequires: fdupes @@ -121,44 +105,29 @@ %prep %setup -q -n squid-%{version} %{__cp} %{S:11} . -%patch0 -p1 # upstream patches after RELEASE -#%patch1 -p0 -#%patch2 -p0 -#%patch3 -p0 -#%patch4 -p0 -#%patch5 -p0 -#%patch6 -p0 -#%patch7 -p0 -#%patch8 -p0 -#%patch9 -p0 -#%patch10 -p0 -#%patch11 -p0 -#%patch12 -p0 -#%patch13 -p0 -#%patch14 -p0 -#%patch15 -p0 -#%patch16 -p0 -#%patch17 -p0 -#%patch18 -p0 +#%patch0 -p0 # other patches +%patch100 -p1 %patch101 -p1 -perl -p -i -e 's|SAMBAPREFIX=/usr/local/samba|SAMBAPREFIX=/usr|' helpers/basic_auth/SMB/Makefile.in -perl -p -i -e 's|SAMBAPREFIX=/usr/local/samba|SAMBAPREFIX=/usr|' helpers/ntlm_auth/SMB/Makefile.in -perl -p -i -e 's|/usr/local/bin/perl|/usr/bin/perl|' `find -name "*.pl"` %ifarch ia64 %patch102 -p1 %endif %patch103 -p1 %patch104 -p1 # +%if 0%{?sles_version} == 10 +%patch110 -p1 +%endif +perl -p -i -e 's|/usr/local/bin/perl|/usr/bin/perl|' `find -name "*.pl"` chmod a-x CREDITS %build export CFLAGS="$RPM_OPT_FLAGS -fPIE -fPIC -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" export LDFLAGS='-pie' -autoreconf -fi +./bootstrap.sh +autoreconf -fiv ./configure --prefix=/usr \ --sysconfdir=%{squidconfdir} \ --bindir=/usr/sbin \ @@ -166,10 +135,14 @@ --localstatedir=/var \ --libexecdir=/usr/sbin \ --datadir=/usr/share/squid \ + --mandir=%{_mandir} \ --libdir=%{_libdir} \ - --with-dl \ --sharedstatedir=/var/squid \ - --enable-storeio=aufs,diskd,null,ufs \ + --with-logdir=/var/log/squid \ + --with-swapdir=/var/cache/squid \ + --with-pidfile=/var/run/squid.pid \ + --with-dl \ + --enable-storeio \ --enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads \ --enable-removal-policies=heap,lru \ --enable-icmp \ @@ -188,7 +161,7 @@ --enable-underscores \ --enable-auth=basic,digest,ntlm,negotiate \ --enable-basic-auth-helpers=DB,LDAP,MSNT,NCSA,PAM,POP3,SASL,SMB,YP,getpwnam,multi-domain-NTLM,squid_radius_auth \ - --enable-ntlm-auth-helpers=SMB,no_check,fakeauth \ + --enable-ntlm-auth-helpers=fakeauth,no_check,smb_lm \ --enable-negotiate-auth-helpers=squid_kerb_auth \ --enable-digest-auth-helpers=eDirectory,ldap,password \ --enable-external-acl-helpers=ip_user,ldap_group,session,unix_group,wbinfo_group \ @@ -214,10 +187,11 @@ set -x perl -pi -e 's;(\#define SQUID_MAXFD) [0-9]+;$1 4096;' include/autoconf.h fi -make DEFAULT_LOG_PREFIX=/var/log/squid \ - DEFAULT_SWAP_DIR=/var/cache/squid \ - DEFAULT_PID_FILE=/var/run/squid.pid \ - SAMBAPREFIX=/usr +%{__make} SAMBAPREFIX=/usr %{?_smp_mflags} +#make DEFAULT_LOG_PREFIX=/var/log/squid \ +# DEFAULT_SWAP_DIR=/var/cache/squid \ +# DEFAULT_PID_FILE=/var/run/squid.pid \ +# SAMBAPREFIX=/usr %install /usr/sbin/useradd -r -o -g nogroup -u 31 -s /bin/false -c "WWW-proxy squid" \ @@ -255,7 +229,7 @@ install -D -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/squid #chown squid:shadow $RPM_BUILD_ROOT/usr/sbin/pam_auth chmod g+s $RPM_BUILD_ROOT/usr/sbin/pam_auth -rm %{buildroot}/usr/sbin/Run* +#rm %{buildroot}/usr/sbin/Run* rm -rf %{buildroot}%{squidconfdir}/errors for i in errors/*; do if [ -d $i ]; then @@ -263,7 +237,7 @@ install -m 644 $i/* %{buildroot}/usr/share/squid/$i fi done -ln -fs /usr/share/squid/errors/English %{buildroot}%{squidconfdir}/errors +ln -fs /usr/share/squid/errors/de %{buildroot}%{squidconfdir}/errors install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.squid # remove unpackaged files @@ -293,6 +267,9 @@ fi %post +%if 0%{?sles_version} == 10 +%{__sed} -i -e "s,\(^%{_sbindir}/pam_auth.*\)\(2755\),\14755," /etc/permissions.secure +%endif %run_permissions # update mode? if [ "$1" > "1" ]; then @@ -320,15 +297,18 @@ %attr(750,squid,root) %dir /var/cache/squid/ %attr(750,squid,root) %dir /var/log/squid/ %dir %{squidconfdir} -%config(noreplace) %{squidconfdir}/squid.conf %config(noreplace) %{squidconfdir}/cachemgr.conf +%config(noreplace) %{squidconfdir}/errorpage.css %config(noreplace) %{squidconfdir}/errors %config(noreplace) /etc/logrotate.d/squid %config(noreplace) %{squidconfdir}/mime.conf %config(noreplace) %{squidconfdir}/msntauth.conf +%config(noreplace) %{squidconfdir}/squid.conf %config %{squidconfdir}/cachemgr.conf.default +%config %{squidconfdir}/errorpage.css.default %config %{squidconfdir}/msntauth.conf.default %config %{squidconfdir}/squid.conf.default +%config %{squidconfdir}/squid.conf.documented %config /etc/pam.d/squid %config /etc/init.d/squid %config /etc/permissions.d/squid @@ -345,8 +325,10 @@ %_sbindir/ip_user_check %_sbindir/msnt_auth %_sbindir/ncsa_auth +%_sbindir/negotiate_kerb_auth +%_sbindir/negotiate_kerb_auth_test %_sbindir/no_check.pl -%_sbindir/ntlm_auth +%_sbindir/ntlm_smb_lm_auth %verify(not mode) %attr(4755,root,shadow) %_sbindir/pam_auth %_sbindir/pinger %_sbindir/pop3.pl @@ -358,6 +340,7 @@ %_sbindir/squid %_sbindir/squid_db_auth %_sbindir/squid_kerb_auth +%_sbindir/squid_kerb_auth_test %_sbindir/squid_ldap_auth %_sbindir/squid_ldap_group %_sbindir/squid_radius_auth @@ -372,7 +355,7 @@ /var/adm/fillup-templates/sysconfig.squid %dir %{_libdir}/squid %{_libdir}/squid/cachemgr.cgi -%doc %{_mandir}/man*/* +%doc %{_mandir}/man?/* %doc CONTRIBUTORS COPYING COPYRIGHT CREDITS ChangeLog %doc QUICKSTART README RELEASENOTES.html SPONSORS %doc README.kerberos ++++++ RELEASENOTES.html ++++++ ++++ 1954 lines (skipped) ++++++ squid-3.1.4-config.patch ++++++ 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 @@ http_access allow localnet 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 NOCOMMENT_END @@ -2720,7 +2723,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 ++++++ squid-beta-3.0-openldap.patch -> squid-3.1.4-openldap.patch ++++++ --- squid3/squid-beta-3.0-openldap.patch 2007-11-29 13:53:20.000000000 +0100 +++ squid3/squid-3.1.4-openldap.patch 2010-06-08 22:55:17.000000000 +0200 @@ -1,21 +1,28 @@ ---- squid-3.0-PRE3-20051030/helpers/basic_auth/LDAP/Makefile.am.orig 2005-03-19 16:24:07.000000000 +0100 -+++ squid-3.0-PRE3-20051030/helpers/basic_auth/LDAP/Makefile.am 2005-11-24 10:24:30.000000000 +0100 -@@ -13,3 +13,4 @@ +diff -ruN squid-3.1.4-orig/helpers/basic_auth/LDAP/Makefile.am squid-3.1.4/helpers/basic_auth/LDAP/Makefile.am +--- squid-3.1.4-orig/helpers/basic_auth/LDAP/Makefile.am 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/helpers/basic_auth/LDAP/Makefile.am 2010-06-08 15:14:01.000000000 +0200 +@@ -22,3 +22,5 @@ - LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) $(XTRA_LIBS) - INCLUDES = -I$(top_srcdir)/include -+CFLAGS += -DLDAP_DEPRECATED ---- squid-3.0-PRE3-20051030/helpers/external_acl/ldap_group/Makefile.am.orig 2005-11-24 10:44:43.000000000 +0100 -+++ squid-3.0-PRE3-20051030/helpers/external_acl/ldap_group/Makefile.am 2005-11-24 10:45:12.000000000 +0100 -@@ -13,3 +13,4 @@ + ## we need our local files too (but avoid -I. at all costs) + INCLUDES += -I$(srcdir) ++ ++AM_CFLAGS += -DLDAP_DEPRECATED +diff -ruN squid-3.1.4-orig/helpers/digest_auth/password/Makefile.am squid-3.1.4/helpers/digest_auth/password/Makefile.am +--- squid-3.1.4-orig/helpers/digest_auth/password/Makefile.am 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/helpers/digest_auth/password/Makefile.am 2010-06-08 15:15:12.000000000 +0200 +@@ -25,4 +25,6 @@ + $(XTRA_LIBS) \ + $(SSLLIB) - LDADD = -L$(top_builddir)/lib -lmiscutil $(LIB_LDAP) $(LIB_LBER) @XTRA_LIBS@ - INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include -+CFLAGS += -DLDAP_DEPRECATED ---- squid-3.0-PRE3-20060116/helpers/digest_auth/password/Makefile.am.orig 2005-12-31 00:21:46.000000000 +0100 -+++ squid-3.0-PRE3-20060116/helpers/digest_auth/password/Makefile.am 2006-01-16 16:05:29.000000000 +0100 -@@ -15,3 +15,4 @@ - -I$(top_srcdir)/src/ - - LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) -+CFLAGS += -DLDAP_DEPRECATED ++AM_CFLAGS += -DLDAP_DEPRECATED ++ + EXTRA_DIST = config.test +diff -ruN squid-3.1.4-orig/helpers/external_acl/ldap_group/Makefile.am squid-3.1.4/helpers/external_acl/ldap_group/Makefile.am +--- squid-3.1.4-orig/helpers/external_acl/ldap_group/Makefile.am 2010-05-30 15:21:11.000000000 +0200 ++++ squid-3.1.4/helpers/external_acl/ldap_group/Makefile.am 2010-06-08 15:14:33.000000000 +0200 +@@ -15,3 +15,5 @@ + $(LIB_LDAP) \ + $(LIB_LBER) \ + $(XTRA_LIBS) ++ ++AM_CFLAGS += -DLDAP_DEPRECATED ++++++ squid-3.1.4-swapdir.patch ++++++ diff -ruN squid-3.1.4-orig/configure.in squid-3.1.4/configure.in --- squid-3.1.4-orig/configure.in 2010-05-30 15:21:49.000000000 +0200 +++ squid-3.1.4/configure.in 2010-06-08 22:07:19.000000000 +0200 @@ -187,6 +187,21 @@ ) AC_SUBST(DEFAULT_LOG_DIR) +DEFAULT_SWAPDIR="$localstatedir/cache" +AC_ARG_WITH(swapdir, + AS_HELP_STRING([--with-swapdir=PATH],[Default location for squid SWAP files. default: $DEFAULT_SWAPDIR]), + [ case $withval in + yes|no) + AC_MSG_ERROR( --with-swapdir requires a directory PATH. --with-swapdir=PATH ) + ;; + *) + DEFAULT_SWAPDIR="$withval" + ;; + esac + ] +) +AC_SUBST(DEFAULT_SWAPDIR) + DEFAULT_PIDFILE="$localstatedir/run/squid.pid" AC_ARG_WITH(pidfile, AS_HELP_STRING([--with-pidfile=PATH],[Default location for squid PID file. default: PREFIX/var/run/squid.pid]), diff -ruN squid-3.1.4-orig/src/Makefile.am squid-3.1.4/src/Makefile.am --- squid-3.1.4-orig/src/Makefile.am 2010-05-30 15:21:11.000000000 +0200 +++ squid-3.1.4/src/Makefile.am 2010-06-08 21:55:16.000000000 +0200 @@ -719,7 +719,7 @@ DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state -DEFAULT_SWAP_DIR = $(localstatedir)/cache +DEFAULT_SWAP_DIR = $(DEFAULT_SWAPDIR) DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` diff -ruN squid-3.1.4-orig/src/Makefile.in squid-3.1.4/src/Makefile.in --- squid-3.1.4-orig/src/Makefile.in 2010-05-30 15:21:32.000000000 +0200 +++ squid-3.1.4/src/Makefile.in 2010-06-08 21:55:36.000000000 +0200 @@ -1956,7 +1956,7 @@ DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log DEFAULT_PID_FILE = $(DEFAULT_PIDFILE) DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state -DEFAULT_SWAP_DIR = $(localstatedir)/cache +DEFAULT_SWAP_DIR = $(DEFAULT_SWAPDIR) DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` ++++++ squid-3.0.STABLE25.tar.bz2 -> squid-3.1.4.tar.bz2 ++++++ ++++ 391311 lines of diff (skipped) ++++++ squid-bootstrap.patch ++++++ diff -ruN squid-3.1.4-orig/acinclude.m4 squid-3.1.4/acinclude.m4 --- squid-3.1.4-orig/acinclude.m4 2010-05-30 15:21:11.000000000 +0200 +++ squid-3.1.4/acinclude.m4 2010-06-09 10:18:51.000000000 +0200 @@ -134,7 +134,7 @@ dnl and this notice are preserved. dnl AC_DEFUN([AX_WITH_PROG],[ - AC_PREREQ([2.61]) + AC_PREREQ([2.59]) pushdef([VARIABLE],$1) pushdef([EXECUTABLE],$2) diff -ruN squid-3.1.4-orig/bootstrap.sh squid-3.1.4/bootstrap.sh --- squid-3.1.4-orig/bootstrap.sh 2010-05-30 15:21:11.000000000 +0200 +++ squid-3.1.4/bootstrap.sh 2010-06-09 10:19:07.000000000 +0200 @@ -7,7 +7,7 @@ # Autotool versions preferred. To override either edit the script # to match the versions you want to use, or set the variables on # the command line like "env acver=.. amver=... ./bootstrap.sh" -acversions="${acver:-2.63 2.62 2.61}" +acversions="${acver:-2.63 2.62 2.61 2.60 2.59}" amversions="${amver:-1.11 1.10 1.9}" ltversions="${ltver:-2.2 1.5 1.4}" diff -ruN squid-3.1.4-orig/configure.in squid-3.1.4/configure.in --- squid-3.1.4-orig/configure.in 2010-05-30 15:21:49.000000000 +0200 +++ squid-3.1.4/configure.in 2010-06-09 10:19:55.000000000 +0200 @@ -3,7 +3,7 @@ dnl $Id$ dnl AC_INIT([Squid Web Proxy],[3.1.4],[http://www.squid-cache.org/bugs/],[squid]) -AC_PREREQ(2.61) +AC_PREREQ(2.59) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) AC_CONFIG_SRCDIR([src/main.cc]) ++++++ squid.permissions ++++++ --- /var/tmp/diff_new_pack.3uG5DN/_old 2010-07-23 22:13:46.000000000 +0200 +++ /var/tmp/diff_new_pack.3uG5DN/_new 2010-07-23 22:13:46.000000000 +0200 @@ -1,2 +1,2 @@ -/var/cache/squid squid:root 750 -/var/log/squid squid:root 750 +/var/cache/squid/ squid:root 750 +/var/log/squid/ squid:root 750 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org