rpms/kernel/devel linux-2.6-secmark-export.patch, NONE, 1.1 kernel-2.6.spec, 1.2645, 1.2646

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4087

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-secmark-export.patch 
Log Message:
export secmark headers (#205612)

linux-2.6-secmark-export.patch:
 Kbuild |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE linux-2.6-secmark-export.patch ---
This patch includes xt_SECMARK.h and xt_CONNSECMARK.h to the kernel 
headers which are exported via 'make headers_install'.  This is needed to 
allow userland code to be built correctly with these features.

Please apply, and consider for inclusion with 2.6.18 as a bugfix.

Signed-off-by: James Morris <jmorris at redhat.com>

---

 include/linux/netfilter/Kbuild |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -purN -X dontdiff linux-2.6.18-rc6.o/include/linux/netfilter/Kbuild linux-2.6.18-rc6.w/include/linux/netfilter/Kbuild
--- linux-2.6.18-rc6.o/include/linux/netfilter/Kbuild	2006-09-12 18:34:44.000000000 -0400
+++ linux-2.6.18-rc6.w/include/linux/netfilter/Kbuild	2006-09-12 18:41:39.000000000 -0400
@@ -5,7 +5,7 @@ header-y := nf_conntrack_sctp.h nf_connt
 	    xt_helper.h xt_length.h xt_limit.h xt_mac.h xt_mark.h	\
 	    xt_MARK.h xt_multiport.h xt_NFQUEUE.h xt_pkttype.h		\
 	    xt_policy.h xt_realm.h xt_sctp.h xt_state.h xt_string.h	\
-	    xt_tcpmss.h xt_tcpudp.h
+	    xt_tcpmss.h xt_tcpudp.h xt_SECMARK.h xt_CONNSECMARK.h
 
 unifdef-y := nf_conntrack_common.h nf_conntrack_ftp.h		\
 	nf_conntrack_tcp.h nfnetlink.h x_tables.h xt_physdev.h

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2645
retrieving revision 1.2646
diff -u -r1.2645 -r1.2646
--- kernel-2.6.spec	12 Sep 2006 22:00:11 -0000	1.2645
+++ kernel-2.6.spec	12 Sep 2006 22:59:55 -0000	1.2646
@@ -411,6 +411,7 @@
 # core networking changes.
 Patch1300: linux-2.6-net-ipsec-labelling.patch
 Patch1301: linux-2.6-net-netlabel-cipso.patch
+Patch1302: linux-2.6-secmark-export.patch
 
 # Filesystem stuff.
 # Squashfs
@@ -961,6 +962,7 @@
 # core networking changes.
 %patch1300 -p1
 %patch1301 -p1
+%patch1302 -p1
 
 # Filesystem patches.
 # Squashfs
@@ -1838,6 +1840,9 @@
 %endif
 
 %changelog
+* Tue Sep 12 2006 David Woodhouse <dwmw2 at redhat.com>
+- Export <linux/netfilter/xt_{CONN,}SECMARK.h> (#205612)
+
 * Tue Sep 12 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc6-git4
 - Enable IFB driver. (#204552)