Reduce overhead by merging the two patches in a single gentoo patch.

(Portage version: 2.2_rc75/cvs/Linux x86_64)

4 files changed, 32 insertions, 52 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index df1333e2ca65..10a0781bf01c 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Copyright 2003-2004 DataCore GmbH
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.88 2010/09/06 03:59:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.89 2010/09/06 11:58:52 flameeyes Exp $
+
+  06 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/quagga-0.99.14-fix-ipremove.patch, quagga-0.99.17-r1.ebuild,
+  +files/quagga-0.99.17-gentoo.patch, -files/quagga-0.99.17-libcap.patch:
+  Reduce overhead by merging the two patches in a single gentoo patch.
 
   06 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   quagga-0.99.17-r1.ebuild, metadata.xml:
diff --git a/net-misc/quagga/files/quagga-0.99.14-fix-ipremove.patch b/net-misc/quagga/files/quagga-0.99.14-fix-ipremove.patch
deleted file mode 100644
index 9f2dd01c6605..000000000000
--- a/net-misc/quagga/files/quagga-0.99.14-fix-ipremove.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur quagga-0.99.14/zebra/interface.c quagga-0.99.14-fix-ipremove/zebra/interface.c
---- quagga-0.99.14/zebra/interface.c	2009-07-21 13:11:21.000000000 +0100
-+++ quagga-0.99.14-fix-ipremove/zebra/interface.c	2009-08-12 17:04:14.000000000 +0100
-@@ -1293,17 +1293,17 @@
-       return CMD_WARNING;
-     }
- 
--#if 0
-   /* Redistribute this information. */
-   zebra_interface_address_delete_update (ifp, ifc);
- 
-   /* Remove connected route. */
-   connected_down_ipv4 (ifp, ifc);
- 
-+  if_subnet_delete(ifp, ifc);
-+
-   /* Free address information. */
-   listnode_delete (ifp->connected, ifc);
-   connected_free (ifc);
--#endif
- 
-   return CMD_SUCCESS;
- }
diff --git a/net-misc/quagga/files/quagga-0.99.17-libcap.patch b/net-misc/quagga/files/quagga-0.99.17-gentoo.patch
index 789197cd3585..aff34d7bce0d 100644
--- a/net-misc/quagga/files/quagga-0.99.17-libcap.patch
+++ b/net-misc/quagga/files/quagga-0.99.17-gentoo.patch
@@ -1,23 +1,3 @@
-From 63e97633d01908da6d3776ac61e4033e6fa91e5c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Sun, 5 Sep 2010 18:19:09 +0200
-Subject: [PATCH] build: fix linking position for libcap
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- * lib/Makefile.am: link libzebra to libcap, since it uses symbols
-   from there.
- * zebra/Makefile.am: no need to link libcap here now, since it's not
-   used directly (libtool with apply transitive dependencies for
-   static linking).
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
----
- lib/Makefile.am   |    2 +-
- zebra/Makefile.am |    5 ++---
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
 diff --git a/lib/Makefile.am b/lib/Makefile.am
 index 315e919..6e69993 100644
 --- a/lib/Makefile.am
@@ -55,6 +35,27 @@ index 542f36f..d09a209 100644
  
  zebra_DEPENDENCIES = $(otherobj)
  
--- 
-1.7.2.2
-
+diff --git a/zebra/interface.c b/zebra/interface.c
+index 03e7ff7..182caa5 100644
+--- a/zebra/interface.c
++++ b/zebra/interface.c
+@@ -1284,17 +1284,17 @@ ip_address_uninstall (struct vty *vty, struct interface *ifp,
+       return CMD_WARNING;
+     }
+ 
+-#if 0
+   /* Redistribute this information. */
+   zebra_interface_address_delete_update (ifp, ifc);
+ 
+   /* Remove connected route. */
+   connected_down_ipv4 (ifp, ifc);
+ 
++  if_subnet_delete(ifp, ifc);
++
+   /* Free address information. */
+   listnode_delete (ifp->connected, ifc);
+   connected_free (ifc);
+-#endif
+ 
+   return CMD_SUCCESS;
+ }
diff --git a/net-misc/quagga/quagga-0.99.17-r1.ebuild b/net-misc/quagga/quagga-0.99.17-r1.ebuild
index 245c26cff43d..ade57a895aa9 100644
--- a/net-misc/quagga/quagga-0.99.17-r1.ebuild
+++ b/net-misc/quagga/quagga-0.99.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild,v 1.2 2010/09/06 03:59:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.99.17-r1.ebuild,v 1.3 2010/09/06 11:58:53 flameeyes Exp $
 
 EAPI="2"
 
@@ -39,10 +39,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# https://bugzilla.quagga.net/show_bug.cgi?id=486
-	epatch "${FILESDIR}/${PN}-0.99.14-fix-ipremove.patch"
-
-	epatch "${FILESDIR}/${P}-libcap.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 
 	# Classless prefixes for BGP - http://hasso.linux.ee/doku.php/english:network:quagga
 	use bgpclassless && epatch "${DISTDIR}/${CLASSLESS_BGP_PATCH}"