rpms/squid/devel .cvsignore, 1.47, 1.48 sources, 1.50, 1.51 squid.init, 1.13, 1.14 squid.spec, 1.137, 1.138 squid.sysconfig, 1.2, 1.3 FAQ.sgml, 1.6, NONE import.log, 1.1, NONE squid-3.0.STABLE1-build.patch, 1.4, NONE squid-3.0.STABLE1-config.patch, 1.3, NONE squid-3.0.STABLE1-location.patch, 1.2, NONE squid-3.0.STABLE15-smb-path.patch, 1.1, NONE squid.spec-3.1, 1.9, NONE

Henrik Nordström hno at fedoraproject.org
Fri Sep 4 03:39:43 UTC 2009 

Author: hno

Update of /cvs/pkgs/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19301

Modified Files:
	.cvsignore sources squid.init squid.spec squid.sysconfig 
Removed Files:
	FAQ.sgml import.log squid-3.0.STABLE1-build.patch 
	squid-3.0.STABLE1-config.patch 
	squid-3.0.STABLE1-location.patch 
	squid-3.0.STABLE15-smb-path.patch squid.spec-3.1 
Log Message:
Update to Squid-3.1

  - IPv6 support
  - NTLM passthru
  - Follow X-Forwarded-For
  - and more



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore	4 Aug 2009 19:56:19 -0000	1.47
+++ .cvsignore	4 Sep 2009 03:39:42 -0000	1.48
@@ -1 +1,3 @@
-squid-3.0.STABLE18.tar.bz2
+squid-3.1.0.13.tar.bz2
+squid-3.1.0.13.tar.bz2.asc
+b9694.patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- sources	4 Aug 2009 19:56:19 -0000	1.50
+++ sources	4 Sep 2009 03:39:42 -0000	1.51
@@ -1 +1,3 @@
-ad1e0bbb424c2f69195ae68b9baa99d6  squid-3.0.STABLE18.tar.bz2
+a7e3f6c35853a8ad200ba448004417da  squid-3.1.0.13.tar.bz2
+56e2fc1fc8bc3c24d77daf4d5bb8c768  squid-3.1.0.13.tar.bz2.asc
+c764a5ffa0171ffadf61011dc8dd4cad  b9694.patch


Index: squid.init
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- squid.init	28 Apr 2009 09:11:55 -0000	1.13
+++ squid.init	4 Sep 2009 03:39:42 -0000	1.14
@@ -29,7 +29,7 @@ fi
 
 # don't raise an error if the config file is incomplete
 # set defaults instead:
-SQUID_OPTS=${SQUID_OPTS:-"-D"}
+SQUID_OPTS=${SQUID_OPTS:-""}
 SQUID_PIDFILE_TIMEOUT=${SQUID_PIDFILE_TIMEOUT:-20}
 SQUID_SHUTDOWN_TIMEOUT=${SQUID_SHUTDOWN_TIMEOUT:-100}
 SQUID_CONF=${SQUID_CONF:-"/etc/squid/squid.conf"}
@@ -42,7 +42,6 @@ prog="$SQUID"
 # determine which one is the cache_swap directory
 CACHE_SWAP=`sed -e 's/#.*//g' $SQUID_CONF | \
 	grep cache_dir | awk '{ print $3 }'`
-[ -z "$CACHE_SWAP" ] && CACHE_SWAP=/var/spool/squid
 
 RETVAL=0
 
@@ -71,7 +70,7 @@ start() {
 	for adir in $CACHE_SWAP; do
 		if [ ! -d $adir/00 ]; then
 			echo -n "init_cache_dir $adir... "
-			$SQUID -z -F -D >> /var/log/squid/squid.out 2>&1
+			$SQUID -z -F >> /var/log/squid/squid.out 2>&1
 		fi
 	done
 	echo -n $"Starting $prog: "


Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- squid.spec	4 Sep 2009 02:57:32 -0000	1.137
+++ squid.spec	4 Sep 2009 03:39:42 -0000	1.138
@@ -3,15 +3,15 @@
 ## % define __find_requires %{SOURCE99}
 
 Name:     squid
-Version:  3.0.STABLE18
-Release:  3%{?dist}
+Version:  3.1.0.13
+Release:  1%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
 Group:    System Environment/Daemons
 URL:      http://www.squid-cache.org
-Source:   http://www.squid-cache.org/Squid/Versions/v3/3.0/squid-%{version}.tar.bz2
-Source1:  FAQ.sgml
+Source:   http://www.squid-cache.org/Squid/Versions/v3/3.1/squid-%{version}.tar.bz2
+Source1:  http://www.squid-cache.org/Squid/Versions/v3/3.1/squid-%{version}.tar.bz2.asc
 Source2:  squid.init
 Source3:  squid.logrotate
 Source4:  squid.sysconfig
@@ -21,19 +21,24 @@ Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
 # Upstream patches
-#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
-
+#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/bXXXX.patch
+Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9694.patch
+# Upstream fix, but have not reached 3.1 yet
+Patch002: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9696.patch
+Patch003: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9704.patch
+Patch004: http://www.squid-cache.org/Versions/v3/3.1/changesets/b9707.patch
+Patch005: squid-3.1.0.13-alias-link.patch
 
 # External patches
 
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
-Patch201: squid-3.0.STABLE1-config.patch
-Patch202: squid-3.0.STABLE1-location.patch
-Patch203: squid-3.0.STABLE1-build.patch
+Patch201: squid-3.1.0.9-config.patch
+Patch202: squid-3.1.0.9-location.patch
+Patch203: squid-3.1.0.13-build.patch
 Patch204: squid-3.0.STABLE1-perlpath.patch
-Patch205: squid-3.0.STABLE15-smb-path.patch
+Patch205: squid-3.1.0.13-smb-path.patch
 Patch208: squid-3.0.STABLE7-from_manpg.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,7 +47,7 @@ Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service /sbin/chkconfig
 Requires(postun): /sbin/service
-BuildRequires: openjade linuxdoc-tools openldap-devel pam-devel openssl-devel
+BuildRequires: openldap-devel pam-devel openssl-devel krb5-devel
 Obsoletes: squid-novm
 
 %description
@@ -60,6 +65,11 @@ lookup program (dnsserver), a program fo
 %prep
 %setup -q
 
+%patch001 -p0 -b .b9694
+%patch002 -p0 -b .b9696
+%patch003 -p0 -b .b9704
+%patch004 -p0 -b .b9707
+%patch005 -p0 -b .alias-link
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -71,34 +81,35 @@ lookup program (dnsserver), a program fo
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
 %configure \
    --exec_prefix=/usr \
-   --bindir=%{_sbindir} \
    --libexecdir=%{_libdir}/squid \
    --localstatedir=/var \
    --datadir=%{_datadir} \
    --sysconfdir=/etc/squid \
+   --with-logdir='$(localstatedir)/log/squid' \
+   --with-pidfile='$(localstatedir)/run/squid.pid' \
    --disable-dependency-tracking \
    --enable-arp-acl \
+   --enable-follow-x-forwarded-for \
    --enable-auth="basic,digest,ntlm,negotiate" \
-   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
-   --enable-negotiate-auth-helpers="squid_kerb_auth" \
+   --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL,DB,POP3,squid_radius_auth" \
+   --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
+   --enable-digest-auth-helpers="password,ldap,eDirectory" \
+   --enable-external-acl-helpers="ip_user,ldap_group,session,unix_group,wbinfo_group" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
    --enable-delay-pools \
-   --enable-digest-auth-helpers="password" \
    --enable-epoll \
-   --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group" \
    --enable-icap-client \
    --enable-ident-lookups \
    %ifnarch ppc64 ia64 x86_64 s390x
    --with-large-files \
    %endif
    --enable-linux-netfilter \
-   --enable-ntlm-auth-helpers="SMB,fakeauth" \
    --enable-referer-log \
    --enable-removal-policies="heap,lru" \
    --enable-snmp \
    --enable-ssl \
-   --enable-storeio="aufs,diskd,null,ufs" \
+   --enable-storeio="aufs,diskd,ufs" \
    --enable-useragent-log \
    --enable-wccpv2 \
    --with-aio \
@@ -108,27 +119,17 @@ export CXXFLAGS="-fPIE %{optflags}" ; ex
    --with-openssl=/usr/kerberos \
    --with-pthreads
 
-# following options are no longer supported
-#   --with-winbind-auth-challenge \
-#   --enable-follow-x-forwarded-for \
-#   --enable-fd-config \
-#   --with-maxfd=16384 \
-#   --enable-underscores \
+# following options should be enabled but fails building
+#   --enable-negotiate-auth-helpers="squid_kerb_auth"
 
 export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 make %{?_smp_mflags}
 
-mkdir faq
-cp %{SOURCE1} faq
-cd faq
-sgml2html FAQ.sgml
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall  \
         sysconfdir=$RPM_BUILD_ROOT/etc/squid \
         localstatedir=$RPM_BUILD_ROOT/var \
-        bindir=$RPM_BUILD_ROOT/%{_sbindir} \
         libexecdir=$RPM_BUILD_ROOT/%{_libdir}/squid
 echo "
 #
@@ -146,9 +147,6 @@ ScriptAlias /Squid/cgi-bin/cachemgr.cgi 
 </Location>" > $RPM_BUILD_ROOT/squid.httpd.tmp
 
 
-ln -s ../../%{_datadir}/squid/errors/English $RPM_BUILD_ROOT/etc/squid/errors
-ln -s ../../%{_datadir}/squid/icons $RPM_BUILD_ROOT/etc/squid/icons
-
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
@@ -167,8 +165,11 @@ chmod 644 contrib/url-normalizer.pl cont
 iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
 mv -f ChangeLog.tmp ChangeLog
 
+# squid.conf.documented is documentation. We ship that in doc/
+rm -f $RPM_BUILD_ROOT/etc/squid/squid.conf.documented
+
 # remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_sbindir}/{RunAccel,RunCache}
+rm -f $RPM_BUILD_ROOT%{_bindir}/{RunAccel,RunCache}
 rm -f $RPM_BUILD_ROOT/squid.httpd.tmp
 
 %clean
@@ -176,41 +177,40 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc faq/*\.html README ChangeLog QUICKSTART
+%doc README ChangeLog QUICKSTART src/squid.conf.documented
 %doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
 
 %attr(755,root,root) %dir /etc/squid
 %attr(755,root,root) %dir %{_libdir}/squid
 %attr(750,squid,squid) %dir /var/log/squid
 %attr(750,squid,squid) %dir /var/spool/squid
-%attr(4750,root,squid) %{_libdir}/squid/ncsa_auth
-%attr(4750,root,squid) %{_libdir}/squid/pam_auth
 
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/squid.conf
 %config(noreplace) %attr(640,root,squid) /etc/squid/squid.conf
 %config(noreplace) %attr(644,root,squid) /etc/squid/cachemgr.conf
 %config(noreplace) /etc/squid/mime.conf
+%config(noreplace) /etc/squid/errorpage.css
 %config(noreplace) /etc/sysconfig/squid
 %config(noreplace) /etc/squid/msntauth.conf
-%config(noreplace) /etc/squid/mib.txt
 # These are not noreplace because they are just sample config files
 %config /etc/squid/msntauth.conf.default
 %config /etc/squid/squid.conf.default
 %config /etc/squid/mime.conf.default
+%config /etc/squid/errorpage.css.default
 %config /etc/squid/cachemgr.conf.default
 %config(noreplace) /etc/pam.d/squid
 %config(noreplace) /etc/logrotate.d/squid
 
-%config(noreplace) /etc/squid/errors
 %dir %{_datadir}/squid
 %attr(-,root,root) %{_datadir}/squid/errors
-%attr(-,root,root) /etc/squid/icons
 %attr(755,root,root) /etc/rc.d/init.d/squid
 %attr(755,root,root) /etc/NetworkManager/dispatcher.d/20-squid
 %{_datadir}/squid/icons
+%{_datadir}/squid/mib.txt
 %{_sbindir}/squid
-%{_sbindir}/squidclient
+%{_bindir}/squidclient
 %{_mandir}/man8/*
+%{_mandir}/man1/*
 %{_libdir}/squid/*
 
 %pre
@@ -234,95 +234,6 @@ exit 0
 
 %post
 /sbin/chkconfig --add squid
-if [ $1 = 0 ]; then
- case "$LANG" in
-  bg*)
-     DIR=Bulgarian
-     ;;
-  ca*)
-     DIR=Catalan
-     ;;
-  cs*)
-     DIR=Czech
-     ;;
-  da*)
-     DIR=Danish
-     ;;
-  nl*)
-     DIR=Dutch
-     ;;
-  en*)
-     DIR=English
-     ;;
-  ea*)
-     DIR=Estonian
-     ;;
-  fi*)
-     DIR=Finnish
-     ;;
-  fr*)
-     DIR=French
-     ;;
-  de*)
-     DIR=German
-     ;;
-  he*)
-     DIR=Hebrew
-     ;;
-  hu*)
-     DIR=Hungarian
-     ;;
-  it*)
-     DIR=Italian
-     ;;
-  ja*)
-     DIR=Japanese
-     ;;
-  kr*)
-     DIR=Korean
-     ;;
-  pl*)
-     DIR=Polish
-     ;;
-  pt*)
-     DIR=Portuguese
-     ;;
-  ro*)
-     DIR=Romanian
-     ;;
-  ru*)
-     DIR=Russian-koi8-r
-     ;;
-  sr*)
-     DIR=Serbian
-     ;;
-  sk*)
-     DIR=Slovak
-     ;;
-  es*)
-     DIR=Spanish
-     ;;
-  sv*)
-     DIR=Swedish
-     ;;
-  zh_TW*)
-     DIR=Traditional_Chinese
-     ;;
-  zh_CN*)
-     DIR=Simplify_Chinese
-     ;;
-  tr*)
-     DIR=Turkish
-     ;;
-  greek)
-     DIR=Greek
-     ;;
-  *)
-     DIR=English
-     ;;
- esac
- ln -snf %{_datadir}/squid/errors/$DIR /etc/squid/errors
-fi
 
 %preun
 if [ $1 = 0 ] ; then
@@ -341,6 +252,15 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri Sep 04 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-1
+- Upgrade to next upstream release 3.1.0.13 with many new features
+  * IPv6 support
+  * NTLM-passthru
+  * Kerberos/Negotiate authentication scheme support
+  * Localized error pages based on browser language preferences
+  * Follow X-Forwarded-For capability
+  * and more..
+
 * Mon Aug 31 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE18-3
 - Bug #520445 silence logrotate when Squid is not running
 


Index: squid.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- squid.sysconfig	8 Oct 2008 06:45:52 -0000	1.2
+++ squid.sysconfig	4 Sep 2009 03:39:43 -0000	1.3
@@ -1,7 +1,5 @@
 # default squid options
-# -D disables initial dns checks. If you most likely will not to have an
-#    internet connection when you start squid, uncomment this
-SQUID_OPTS="-D"
+SQUID_OPTS=""
 
 # Time to wait for Squid to shut down when asked. Should not be necessary
 # most of the time.


--- FAQ.sgml DELETED ---


--- import.log DELETED ---


--- squid-3.0.STABLE1-build.patch DELETED ---


--- squid-3.0.STABLE1-config.patch DELETED ---


--- squid-3.0.STABLE1-location.patch DELETED ---


--- squid-3.0.STABLE15-smb-path.patch DELETED ---


--- squid.spec-3.1 DELETED ---

More information about the scm-commits mailing list