1 Missing header for routes patch, caused vs2.3 route.h mixing
2 --- a/net/ipv4/netfilter/nf_nat_core.c~ 2008-01-24 23:58:37.000000000 +0100
3 +++ a/net/ipv4/netfilter/nf_nat_core.c 2008-03-30 21:00:19.349593833 +0200
5 #include <net/checksum.h>
8 +#include <net/route.h>
9 #include <net/tcp.h> /* For tcp_prot in getorigdst */
10 #include <linux/icmp.h>
11 #include <linux/udp.h>
12 diff -upr linux-2.6.25/security/selinux/include/av_perm_to_string.h linux-2.6.25/security/selinux/include/av_perm_to_string.h
13 --- linux-2.6.25/security/selinux/include/av_perm_to_string.h 2008-04-17 02:49:44.000000000 +0000
14 +++ linux-2.6.25/security/selinux/include/av_perm_to_string.h 2008-05-21 08:48:33.061933886 +0000
16 S_(SECCLASS_CAPABILITY, CAPABILITY__SETFCAP, "setfcap")
17 S_(SECCLASS_CAPABILITY2, CAPABILITY2__MAC_OVERRIDE, "mac_override")
18 S_(SECCLASS_CAPABILITY2, CAPABILITY2__MAC_ADMIN, "mac_admin")
19 + S_(SECCLASS_CAPABILITY2, CAPABILITY2__CONTEXT, "context")
20 S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_READ, "nlmsg_read")
21 S_(SECCLASS_NETLINK_ROUTE_SOCKET, NETLINK_ROUTE_SOCKET__NLMSG_WRITE, "nlmsg_write")
22 S_(SECCLASS_NETLINK_FIREWALL_SOCKET, NETLINK_FIREWALL_SOCKET__NLMSG_READ, "nlmsg_read")
23 diff -upr linux-2.6.25/security/selinux/include/av_permissions.h linux-2.6.25/security/selinux/include/av_permissions.h
24 --- linux-2.6.25/security/selinux/include/av_permissions.h 2008-04-17 02:49:44.000000000 +0000
25 +++ linux-2.6.25/security/selinux/include/av_permissions.h 2008-05-21 08:49:07.059597304 +0000
27 #define CAPABILITY__SETFCAP 0x80000000UL
28 #define CAPABILITY2__MAC_OVERRIDE 0x00000001UL
29 #define CAPABILITY2__MAC_ADMIN 0x00000002UL
30 +#define CAPABILITY2__CONTEXT 0x00000004UL
31 #define NETLINK_ROUTE_SOCKET__IOCTL 0x00000001UL
32 #define NETLINK_ROUTE_SOCKET__READ 0x00000002UL
33 #define NETLINK_ROUTE_SOCKET__WRITE 0x00000004UL
34 --- linux-2.6.27/arch/powerpc/include/asm/unistd.h.org 2008-11-02 22:23:47.000000000 +0000
35 +++ linux-2.6.27/arch/powerpc/include/asm/unistd.h 2008-11-02 22:24:37.000000000 +0000
39 #define __NR_sys_debug_setcontext 256
40 -/* Number 257 is reserved for vserver */
41 +#define __NR_vserver 257
42 #define __NR_migrate_pages 258
43 #define __NR_mbind 259
44 #define __NR_get_mempolicy 260