From 3829ad9d214e1c0005e92d92f3ad4a38a48bafd1 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 3 Sep 2005 10:26:09 +0000 Subject: [PATCH] Cleanup patches. * debian/patches-debian/net-sockglue-cap.patch: Remove, fixed in 2.6.12. * debian/patches-debian/series/2.6.12+2.6.13-rc6-1: Remove. * debian/patches-debian/series/2.6.13-1: Remove drivers-s390-net-klist.patch. svn path=/dists/trunk/linux-2.6/; revision=4126 --- debian/patches-debian/net-sockglue-cap.patch | 39 ---------------- .../patches-debian/series/2.6.12+2.6.13-rc6-1 | 46 ------------------- debian/patches-debian/series/2.6.13-1 | 1 - 3 files changed, 86 deletions(-) delete mode 100644 debian/patches-debian/net-sockglue-cap.patch delete mode 100644 debian/patches-debian/series/2.6.12+2.6.13-rc6-1 diff --git a/debian/patches-debian/net-sockglue-cap.patch b/debian/patches-debian/net-sockglue-cap.patch deleted file mode 100644 index a37e9a8cb..000000000 --- a/debian/patches-debian/net-sockglue-cap.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Herbert Xu -Date: Sat, 6 Aug 2005 13:33:15 +0000 (-0700) -Subject: [IPSEC]: Restrict socket policy loading to CAP_NET_ADMIN. -X-Git-Tag: v2.6.13-rc6 -X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=6fc0b4a7a73a81e74d0004732df358f4f9975be2 - - [IPSEC]: Restrict socket policy loading to CAP_NET_ADMIN. - - The interface needs much redesigning if we wish to allow - normal users to do this in some way. - - Signed-off-by: Herbert Xu - Signed-off-by: David S. Miller ---- - ---- a/net/ipv4/ip_sockglue.c -+++ b/net/ipv4/ip_sockglue.c -@@ -848,6 +848,9 @@ mc_msf_out: - - case IP_IPSEC_POLICY: - case IP_XFRM_POLICY: -+ err = -EPERM; -+ if (!capable(CAP_NET_ADMIN)) -+ break; - err = xfrm_user_policy(sk, optname, optval, optlen); - break; - ---- a/net/ipv6/ipv6_sockglue.c -+++ b/net/ipv6/ipv6_sockglue.c -@@ -504,6 +504,9 @@ done: - break; - case IPV6_IPSEC_POLICY: - case IPV6_XFRM_POLICY: -+ retv = -EPERM; -+ if (!capable(CAP_NET_ADMIN)) -+ break; - retv = xfrm_user_policy(sk, optname, optval, optlen); - break; - diff --git a/debian/patches-debian/series/2.6.12+2.6.13-rc6-1 b/debian/patches-debian/series/2.6.12+2.6.13-rc6-1 deleted file mode 100644 index a097ca305..000000000 --- a/debian/patches-debian/series/2.6.12+2.6.13-rc6-1 +++ /dev/null @@ -1,46 +0,0 @@ ->>>> YOUR VERSION debian/patches-debian/series/2.6.12+2.6.13-rc6-1 112531404483769 -+ amd64-int3-fix.patch -+ drivers-ide-dma-blacklist-toshiba.patch -+ drivers-scsi-megaraid_splitup.patch -+ drivers-s390-net-klist.patch -+ fbdev-radeon-noaccel.patch -+ fs-asfs-2.patch -+ ia64-irq-affinity-upfix.patch -+ modular-ide.patch -+ modular-ide-pnp.patch -+ powerpc-calibrate-tau.patch -+ powerpc-fix-power3-ftbfs.patch -+ powerpc-g3-750cxe.patch -+ powerpc-g4-l2-flush-errata.patch -+ powerpc-mkvmlinuz-support.patch -+ powerpc-pmac-cache-power34-fix.patch -+ powerpc-ppc64-vio-data.patch -+ powerpc-serial.patch -+ qla2xxx-removed.patch -+ remove-references-to-removed-drivers.patch -+ sparc64-hme-lockup.patch -+ tty-locking-fixes9.patch -+ net-sockglue-cap.patch -==== ORIGINAL VERSION debian/patches-debian/series/2.6.12+2.6.13-rc6-1 112531404483769 -+ amd64-int3-fix.patch -+ drivers-ide-dma-blacklist-toshiba.patch -+ drivers-scsi-megaraid_splitup.patch -+ drivers-s390-net-klist.patch -+ fbdev-radeon-noaccel.patch -+ fs-asfs-2.patch -+ ia64-irq-affinity-upfix.patch -+ modular-ide.patch -+ modular-ide-pnp.patch -+ powerpc-calibrate-tau.patch -+ powerpc-fix-power3-ftbfs.patch -+ powerpc-g3-750cxe.patch -+ powerpc-g4-l2-flush-errata.patch -+ powerpc-mkvmlinuz-support.patch -+ powerpc-pmac-cache-power34-fix.patch -+ powerpc-ppc64-vio-data.patch -+ powerpc-serial.patch -+ qla2xxx-removed.patch -+ remove-references-to-removed-drivers.patch -+ sparc64-hme-lockup.patch -+ tty-locking-fixes9.patch -==== THEIR VERSION debian/patches-debian/series/2.6.12+2.6.13-rc6-1 112531404483769 diff --git a/debian/patches-debian/series/2.6.13-1 b/debian/patches-debian/series/2.6.13-1 index 7bd2f9443..a7ac1110b 100644 --- a/debian/patches-debian/series/2.6.13-1 +++ b/debian/patches-debian/series/2.6.13-1 @@ -1,7 +1,6 @@ + amd64-int3-fix.patch + drivers-ide-dma-blacklist-toshiba.patch + drivers-scsi-megaraid_splitup.patch -+ drivers-s390-net-klist.patch + fbdev-radeon-noaccel.patch + fs-asfs-2.patch + ia64-irq-affinity-upfix.patch