Wed Mar 15 14:20:59 UTC 2006

Author: stransky

Update of /cvs/dist/rpms/squid/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv1841

Modified Files:
	.cvsignore sources squid.spec 
Added Files:
	squid-2.5.STABLE12-libbind.patch 
Removed Files:
	squid-2.5.STABLE11-CACHE_HTTP_PORT.patch 
	squid-2.5.STABLE11-CNAME.patch 
	squid-2.5.STABLE11-IMS-HEAD.patch 
	squid-2.5.STABLE11-delaypools_truncated.patch 
	squid-2.5.STABLE11-httpd_accel-internal.patch 
	squid-2.5.STABLE11-ldap_auth.patch 
	squid-2.5.STABLE11-libbind.patch 
	squid-2.5.STABLE11-redirect-CONNECT.patch 
	squid-2.5.STABLE11-rfc1738_do_escape.patch 
	squid-2.5.STABLE11-setcookie.patch 
	squid-2.5.STABLE11-tcp_outgoing_xxx.patch 
	squid-2.5.STABLE11.accel_single_host_pconn.patch 
Log Message:
new upstream

squid-2.5.STABLE12-libbind.patch:
 configure |   92 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 46 insertions(+), 46 deletions(-)

--- NEW FILE squid-2.5.STABLE12-libbind.patch ---
--- squid-2.5.STABLE12/configure.old	2005-10-22 11:56:01.000000000 +0200
+++ squid-2.5.STABLE12/configure	2005-11-09 10:37:51.000000000 +0100
@@ -7089,52 +7089,52 @@
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6
-echo "configure:7094: checking for gethostbyname in -lbind" >&5
-ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lbind  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7102 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gethostbyname();
-
-int main() {
-gethostbyname()
-; return 0; }
-EOF
-if { (eval echo configure:7113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lbind $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
+#echo $ac_n "checking for gethostbyname in -lbind""... $ac_c" 1>&6
+#echo "configure:7094: checking for gethostbyname in -lbind" >&5
+#ac_lib_var=`echo bind'_'gethostbyname | sed 'y%./+-%__p_%'`
+#if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+#  echo $ac_n "(cached) $ac_c" 1>&6
+#else
+#  ac_save_LIBS="$LIBS"
+#LIBS="-lbind  $LIBS"
+#cat > conftest.$ac_ext <<EOF
+##line 7102 "configure"
+##include "confdefs.h"
+#/* Override any gcc2 internal prototype to avoid an error.  */
+#/* We use char because int might match the return type of a gcc2
+#    builtin and then its argument prototype would still apply.  */
+#char gethostbyname();
+#
+#int main() {
+#gethostbyname()
+#; return 0; }
+#EOF
+#if { (eval echo configure:7113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+#  rm -rf conftest*
+#  eval "ac_cv_lib_$ac_lib_var=yes"
+#else
+#  echo "configure: failed program was:" >&5
+#  cat conftest.$ac_ext >&5
+#  rm -rf conftest*
+#  eval "ac_cv_lib_$ac_lib_var=no"
+#fi
+#rm -f conftest*
+#LIBS="$ac_save_LIBS"
+#
+#fi
+#if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+#  echo "$ac_t""yes" 1>&6
+#    ac_tr_lib=HAVE_LIB`echo bind | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+#    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+#  cat >> confdefs.h <<EOF
+##define $ac_tr_lib 1
+#EOF
+#
+#  LIBS="-lbind $LIBS"
+#
+#else
+#  echo "$ac_t""no" 1>&6
+#fi
 
 if test $ac_cv_lib_bind_gethostbyname = "no" ; then
     case "$host" in


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	23 Sep 2005 11:54:52 -0000	1.15
+++ .cvsignore	15 Mar 2006 14:20:45 -0000	1.16
@@ -1,2 +1,3 @@
 squid-2.5.STABLE9.tar.bz2
 squid-2.5.STABLE11.tar.bz2
+squid-2.5.STABLE13.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	23 Sep 2005 11:54:52 -0000	1.15
+++ sources	15 Mar 2006 14:20:45 -0000	1.16
@@ -1 +1 @@
-5e7f13ad95b64b60ddd6cdc2ab800d67  squid-2.5.STABLE11.tar.bz2
+3e64468e123be1246d17486dab6bee87  squid-2.5.STABLE13.tar.bz2


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-4/squid.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- squid.spec	20 Oct 2005 08:44:28 -0000	1.37
+++ squid.spec	15 Mar 2006 14:20:45 -0000	1.38
@@ -4,8 +4,8 @@
 
 Summary: The Squid proxy caching server.
 Name: squid
-Version: 2.5.STABLE11
-Release: 3.FC4
+Version: 2.5.STABLE13
+Release: 1.FC4
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -18,18 +18,6 @@
 Source98: perl-requires-squid.sh
 ## Source99: filter-requires-squid.sh
 
-Patch100: squid-2.5.STABLE11-delaypools_truncated.patch
-Patch101: squid-2.5.STABLE11-tcp_outgoing_xxx.patch 
-Patch102: squid-2.5.STABLE11-ldap_auth.patch 
-Patch103: squid-2.5.STABLE11.accel_single_host_pconn.patch 
-Patch104: squid-2.5.STABLE11-CACHE_HTTP_PORT.patch 
-Patch105: squid-2.5.STABLE11-CNAME.patch 
-Patch106: squid-2.5.STABLE11-httpd_accel-internal.patch
-Patch107: squid-2.5.STABLE11-IMS-HEAD.patch
-Patch108: squid-2.5.STABLE11-redirect-CONNECT.patch
-Patch109: squid-2.5.STABLE11-setcookie.patch
-Patch110: squid-2.5.STABLE11-rfc1738_do_escape.patch
-
 # Local patches
 # Applying upstream patches first makes it less likely that local patches
 # will break upstream ones.
@@ -38,7 +26,7 @@
 Patch203: squid-2.5.STABLE7-build.patch
 Patch204: squid-2.5.STABLE4-perlpath.patch
 Patch205: squid-2.5.STABLE5-pipe.patch
-Patch206: squid-2.5.STABLE11-libbind.patch
+Patch206: squid-2.5.STABLE12-libbind.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prereq: /sbin/chkconfig logrotate shadow-utils
@@ -61,18 +49,6 @@
 %prep
 %setup -q
 
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-
 %patch201 -p1 -b .config
 %patch202 -p1 -b .location
 %patch203 -p1 -b .build
@@ -302,6 +278,9 @@
 chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
 
 %changelog
+* Wed Mar 15 2006 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE13-1.FC4
+- new upstream
+
 * Thu Oct 20 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-3.FC4
 - fix for #171213 - CVE-2005-3258 Squid crash due to malformed FTP response
 - more fixes from upstream


--- squid-2.5.STABLE11-CACHE_HTTP_PORT.patch DELETED ---


--- squid-2.5.STABLE11-CNAME.patch DELETED ---


--- squid-2.5.STABLE11-IMS-HEAD.patch DELETED ---


--- squid-2.5.STABLE11-delaypools_truncated.patch DELETED ---


--- squid-2.5.STABLE11-httpd_accel-internal.patch DELETED ---


--- squid-2.5.STABLE11-ldap_auth.patch DELETED ---


--- squid-2.5.STABLE11-libbind.patch DELETED ---


--- squid-2.5.STABLE11-redirect-CONNECT.patch DELETED ---


--- squid-2.5.STABLE11-rfc1738_do_escape.patch DELETED ---


--- squid-2.5.STABLE11-setcookie.patch DELETED ---


--- squid-2.5.STABLE11-tcp_outgoing_xxx.patch DELETED ---


--- squid-2.5.STABLE11.accel_single_host_pconn.patch DELETED ---


