r4126 - in dists/trunk/linux-2.6/debian/patches-debian: . series

[Bastian Blank]

Author: waldi
Date: 2005-09-03 10:26:09 +0000 (Sat, 03 Sep 2005)
New Revision: 4126

Removed:
   dists/trunk/linux-2.6/debian/patches-debian/net-sockglue-cap.patch
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1
Modified:
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13-1
Log:
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.


Deleted: dists/trunk/linux-2.6/debian/patches-debian/net-sockglue-cap.patch
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/net-sockglue-cap.patch	2005-09-03 10:12:52 UTC (rev 4125)
+++ dists/trunk/linux-2.6/debian/patches-debian/net-sockglue-cap.patch	2005-09-03 10:26:09 UTC (rev 4126)
@@ -1,39 +0,0 @@
-From: Herbert Xu <herbert at gondor.apana.org.au>
-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 <herbert at gondor.apana.org.au>
-  Signed-off-by: David S. Miller <davem at davemloft.net>
----
-
---- 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;
- 

Deleted: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1	2005-09-03 10:12:52 UTC (rev 4125)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.12+2.6.13-rc6-1	2005-09-03 10:26:09 UTC (rev 4126)
@@ -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

Modified: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13-1
===================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13-1	2005-09-03 10:12:52 UTC (rev 4125)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.13-1	2005-09-03 10:26:09 UTC (rev 4126)
@@ -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