rpms/squid/F-9 squid-3.0.STABLE2-configure_netfilter.patch, NONE, 1.1 squid.spec, 1.96, 1.97

[Martin Nagy (mnagy)]

Author: mnagy

Update of /cvs/extras/rpms/squid/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10636

Modified Files:
	squid.spec 
Added Files:
	squid-3.0.STABLE2-configure_netfilter.patch 
Log Message:
* Fri May 09 2008 Alexandre Oliva <aoliva at redhat.com> - 7:3.0.STABLE2-3
- fix configure detection of netfilter kernel headers (#435499)


squid-3.0.STABLE2-configure_netfilter.patch:

--- NEW FILE squid-3.0.STABLE2-configure_netfilter.patch ---
diff -up squid-3.0.STABLE2/configure.config_netfilter squid-3.0.STABLE2/configure
--- squid-3.0.STABLE2/configure.config_netfilter	2008-03-04 09:35:36.000000000 -0300
+++ squid-3.0.STABLE2/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>
 #endif
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#include <linux/types.h>
 
 
 #include <$ac_header>
diff -up squid-3.0.STABLE2/configure.in.config_netfilter squid-3.0.STABLE2/configure.in
--- squid-3.0.STABLE2/configure.in.config_netfilter	2008-03-04 09:35:36.000000000 -0300
+++ squid-3.0.STABLE2/configure.in	2008-05-05 06:50:56.000000000 -0300
@@ -1931,6 +1931,10 @@ SQUID_DEFAULT_INCLUDES
 #if HAVE_LIMITS_H
 #include <limits.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.STABLE2/src/forward.cc.config_netfilter squid-3.0.STABLE2/src/forward.cc
--- squid-3.0.STABLE2/src/forward.cc.config_netfilter	2008-02-27 07:42:23.000000000 -0300
+++ squid-3.0.STABLE2/src/forward.cc	2008-05-05 06:54:02.000000000 -0300
@@ -50,6 +50,10 @@
 #include "Store.h"
 
 #if LINUX_TPROXY
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#include <linux/types.h>
 #include <linux/netfilter_ipv4/ip_tproxy.h>
 #endif
 
diff -up squid-3.0.STABLE2/src/IPInterception.cc.config_netfilter squid-3.0.STABLE2/src/IPInterception.cc
--- squid-3.0.STABLE2/src/IPInterception.cc.config_netfilter	2007-11-07 08:20:47.000000000 -0200
+++ squid-3.0.STABLE2/src/IPInterception.cc	2008-05-05 06:53:56.000000000 -0300
@@ -85,6 +85,10 @@
 #endif
 
 #if LINUX_NETFILTER
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#include <linux/types.h>
 #include <linux/netfilter_ipv4.h>
 #endif
 


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/F-9/squid.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- squid.spec	3 Apr 2008 11:20:02 -0000	1.96
+++ squid.spec	9 May 2008 10:38:21 -0000	1.97
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE2
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -32,6 +32,7 @@
 Patch204: squid-3.0.STABLE1-perlpath.patch
 Patch205: squid-3.0.STABLE1-smb-path.patch
 Patch206: squid-3.0.STABLE2-fix_warnings.patch
+Patch207: squid-3.0.STABLE2-configure_netfilter.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -63,6 +64,7 @@
 %patch204 -p1 -b .perlpath
 %patch205 -p1 -b .smb-path
 %patch206 -p1 -b .fix_warnings
+%patch207 -p1 -b .config_netfilter
 
 %build
 export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
@@ -333,6 +335,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Fri May 09 2008 Alexandre Oliva <aoliva at redhat.com> - 7:3.0.STABLE2-3
+- fix configure detection of netfilter kernel headers (#435499)
+
 * Thu Apr 03 2008 Martin Nagy <mnagy at redhat.com> - 7:3.0.STABLE2-2
 - add %%{optflags} to make
 - remove warnings about unused return values