rpms/squid/devel squid-2.5.STABLE12-libbind.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 squid.spec, 1.46, 1.47 squid-2.5.STABLE11-CACHE_HTTP_PORT.patch, 1.1, NONE squid-2.5.STABLE11-CNAME.patch, 1.1, NONE squid-2.5.STABLE11-IMS-HEAD.patch, 1.1, NONE squid-2.5.STABLE11-delaypool_3_255.patch, 1.1, NONE squid-2.5.STABLE11-delaypools_truncated.patch, 1.1, NONE squid-2.5.STABLE11-httpd_accel-internal.patch, 1.1, NONE squid-2.5.STABLE11-ldap_auth.patch, 1.1, NONE squid-2.5.STABLE11-libbind.patch, 1.1, NONE squid-2.5.STABLE11-redirect-CONNECT.patch, 1.1, NONE squid-2.5.STABLE11-rfc1738_do_escape.patch, 1.1, NONE squid-2.5.STABLE11-setcookie.patch, 1.1, NONE squid-2.5.STABLE11-tcp_outgoing_xxx.patch, 1.1, NONE squid-2.5.STABLE11.accel_single_host_pconn.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Nov 9 10:04:44 UTC 2005
Author: stransky
Update of /cvs/dist/rpms/squid/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20520
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-delaypool_3_255.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/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 23 Sep 2005 11:25:41 -0000 1.16
+++ .cvsignore 9 Nov 2005 10:04:16 -0000 1.17
@@ -1,3 +1,4 @@
squid-2.5.STABLE9.tar.bz2
squid-2.5.STABLE10.tar.bz2
squid-2.5.STABLE11.tar.bz2
+squid-2.5.STABLE12.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 23 Sep 2005 11:25:41 -0000 1.16
+++ sources 9 Nov 2005 10:04:16 -0000 1.17
@@ -1 +1 @@
-5e7f13ad95b64b60ddd6cdc2ab800d67 squid-2.5.STABLE11.tar.bz2
+7354255015b3772a1e024dfac173e48c squid-2.5.STABLE12.tar.bz2
Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/devel/squid.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- squid.spec 9 Nov 2005 09:05:14 -0000 1.46
+++ squid.spec 9 Nov 2005 10:04:16 -0000 1.47
@@ -4,8 +4,8 @@
Summary: The Squid proxy caching server.
Name: squid
-Version: 2.5.STABLE11
-Release: 7
+Version: 2.5.STABLE12
+Release: 1
Epoch: 7
License: GPL
Group: System Environment/Daemons
@@ -19,19 +19,7 @@
## Source99: filter-requires-squid.sh
# Upstream patches
-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
-Patch111: squid-2.5.STABLE11-delaypool_3_255.patch
-Patch112: squid-2.5.STABLE12-setenv.patch
+Patch100: squid-2.5.STABLE12-setenv.patch
# Local patches
# Applying upstream patches first makes it less likely that local patches
@@ -41,7 +29,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
Patch207: squid-2.5.STABLE10-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -66,18 +54,6 @@
%setup -q
%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
%patch201 -p1 -b .config
%patch202 -p1 -b .location
@@ -334,8 +310,8 @@
chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true
%changelog
-* Wed Nov 9 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-7
-- rebuild for the new openssl
+* Wed Nov 9 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE12-1
+- update to STABLE12
- setenv patch
* Mon Oct 24 2005 Martin Stransky <stransky at redhat.com> 7:2.5.STABLE11-6
--- 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-delaypool_3_255.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 ---
More information about the fedora-cvs-commits
mailing list