rpms/squid/devel squid-3.0.STABLE5-configure_netfilter.patch, 1.1, 1.2 squid.spec, 1.104, 1.105

[Jiri Skala]

Author: jskala

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

Modified Files:
	squid-3.0.STABLE5-configure_netfilter.patch squid.spec 
Log Message:
* Wed Oct 08 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-3
- fix #465052 -  FTBFS squid-3.0.STABLE7-1.fc10


squid-3.0.STABLE5-configure_netfilter.patch:

Index: squid-3.0.STABLE5-configure_netfilter.patch
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid-3.0.STABLE5-configure_netfilter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- squid-3.0.STABLE5-configure_netfilter.patch	9 May 2008 10:38:54 -0000	1.1
+++ squid-3.0.STABLE5-configure_netfilter.patch	8 Oct 2008 20:23:20 -0000	1.2
@@ -1,34 +1,28 @@
-diff -up squid-3.0.STABLE5/configure.config_netfilter squid-3.0.STABLE5/configure
---- squid-3.0.STABLE5/configure.config_netfilter	2008-03-04 09:35:36.000000000 -0300
-+++ squid-3.0.STABLE5/configure	2008-05-05 06:50:56.000000000 -0300
-@@ -24512,6 +24512,10 @@ cat >>conftest.$ac_ext <<_ACEOF
- #if HAVE_LIMITS_H
- #include <limits.h>
+diff -up squid-3.0.STABLE7/configure.configure_netfilter squid-3.0.STABLE7/configure
+--- squid-3.0.STABLE7/configure.configure_netfilter	2008-06-22 05:35:54.000000000 +0200
++++ squid-3.0.STABLE7/configure	2008-10-08 22:03:53.000000000 +0200
+@@ -24545,6 +24545,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #if HAVE_NETINET_IN_H
+ #include <netinet/in.h>
  #endif
-+#if HAVE_NETINET_IN_H
-+# include <netinet/in.h>
-+#endif
 +#include <linux/types.h>
  
  
  #include <$ac_header>
-diff -up squid-3.0.STABLE5/configure.in.config_netfilter squid-3.0.STABLE5/configure.in
---- squid-3.0.STABLE5/configure.in.config_netfilter	2008-03-04 09:35:36.000000000 -0300
-+++ squid-3.0.STABLE5/configure.in	2008-05-05 06:50:56.000000000 -0300
-@@ -1931,6 +1931,10 @@ SQUID_DEFAULT_INCLUDES
- #if HAVE_LIMITS_H
- #include <limits.h>
+diff -up squid-3.0.STABLE7/configure.in.configure_netfilter squid-3.0.STABLE7/configure.in
+--- squid-3.0.STABLE7/configure.in.configure_netfilter	2008-06-22 05:35:54.000000000 +0200
++++ squid-3.0.STABLE7/configure.in	2008-10-08 22:03:53.000000000 +0200
+@@ -1943,6 +1943,7 @@ SQUID_DEFAULT_INCLUDES
+ #if HAVE_NETINET_IN_H
+ #include <netinet/in.h>
  #endif
-+#if HAVE_NETINET_IN_H
-+# include <netinet/in.h>
-+#endif
 +#include <linux/types.h>
  )
  
- AC_CHECK_HEADERS(net/if.h \
-diff -up squid-3.0.STABLE5/src/forward.cc.config_netfilter squid-3.0.STABLE5/src/forward.cc
---- squid-3.0.STABLE5/src/forward.cc.config_netfilter	2008-02-27 07:42:23.000000000 -0300
-+++ squid-3.0.STABLE5/src/forward.cc	2008-05-05 06:54:02.000000000 -0300
+ dnl *BSD dont include the depenencies for all their net/ and netinet/ files
+diff -up squid-3.0.STABLE7/src/forward.cc.configure_netfilter squid-3.0.STABLE7/src/forward.cc
+--- squid-3.0.STABLE7/src/forward.cc.configure_netfilter	2008-06-22 05:35:53.000000000 +0200
++++ squid-3.0.STABLE7/src/forward.cc	2008-10-08 22:03:53.000000000 +0200
 @@ -50,6 +50,10 @@
  #include "Store.h"
  
@@ -40,9 +34,9 @@
  #include <linux/netfilter_ipv4/ip_tproxy.h>
  #endif
  
-diff -up squid-3.0.STABLE5/src/IPInterception.cc.config_netfilter squid-3.0.STABLE5/src/IPInterception.cc
---- squid-3.0.STABLE5/src/IPInterception.cc.config_netfilter	2007-11-07 08:20:47.000000000 -0200
-+++ squid-3.0.STABLE5/src/IPInterception.cc	2008-05-05 06:53:56.000000000 -0300
+diff -up squid-3.0.STABLE7/src/IPInterception.cc.configure_netfilter squid-3.0.STABLE7/src/IPInterception.cc
+--- squid-3.0.STABLE7/src/IPInterception.cc.configure_netfilter	2008-06-22 05:35:52.000000000 +0200
++++ squid-3.0.STABLE7/src/IPInterception.cc	2008-10-08 22:03:53.000000000 +0200
 @@ -85,6 +85,10 @@
  #endif
  


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- squid.spec	8 Oct 2008 06:45:52 -0000	1.104
+++ squid.spec	8 Oct 2008 20:23:20 -0000	1.105
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE7
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -339,6 +339,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Wed Oct 08 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-3
+- fix #465052 -  FTBFS squid-3.0.STABLE7-1.fc10
+
 * Thu Aug 14 2008 Jiri Skala <jskala at redhat.com> - 7:3.0.STABLE7-2
 - used ncsa_auth.8 from man-pages. there will be this file removed due to conflict
 - fix #458593 noisy initscript