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

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

5 files changed, 38 insertions, 59 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/Manifest b/net-misc/quagga/Manifest
index f835725f1601..6354ab6dad17 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -4,8 +4,7 @@ Hash: SHA1
 AUX bgpd.init 900 RMD160 1047341d9f582a946f5460d2a60450fe0fef4463 SHA1 4e7323c366c2bfe5287e132bf8e1e7f7e79b8e43 SHA256 0625c171ec51e58175dbb59892964b5958179374947755678b2c344d98222bac
 AUX ospf6d.init 919 RMD160 91c936a210daf94e3742bbbd6f77484afe4c4cb5 SHA1 6448dcb15084b9ac7663cf0e7fd95f4602430c93 SHA256 13be35acbad48120fca1e39fd9ad6e99894280f47bc516396147051329704891
 AUX ospfd.init 910 RMD160 4863d2a89ce0450efed37458b432f8d4ec8e33a5 SHA1 512cddcda3b6813f92778f44e07552ae483e78a5 SHA256 b20cf9046f5c9687aeda2be4f7160d1f1f941c63d865b767f156d1b8471d8c59
-AUX quagga-0.99.14-fix-ipremove.patch 650 RMD160 65341030d33814ae07f1f9a6e46354bb45bf5834 SHA1 19ab17ce9437453ad1a6dac63da06fa855c717c9 SHA256 ef3ef36f792169f68d5d76c6d8a78f08d11c534d4e966fed2a433e456963d346
-AUX quagga-0.99.17-libcap.patch 1935 RMD160 da2299aa1da64508e36cbf0fc104d6993fda9cb2 SHA1 bbae789c9006c1b7c23408f3c5b37d71e600c397 SHA256 3bf6204ebc25dff39961d16e908cbfba6406ce260dc801625696d82725ba2824
+AUX quagga-0.99.17-gentoo.patch 1782 RMD160 ad7b1f09bc072d2cbc4af4bfd2f1272ab3dcdf21 SHA1 c597104d65cb4a4ccec5e4641ee01cbe2602c4cc SHA256 4d4ab6b57ff2e16ea231bfbccd20848d1fbabbeac59530883e7381a2fa197ade
 AUX quagga-services.init 1189 RMD160 38979c189e97a7b278f96018bfb12de9dbff14c0 SHA1 74adb27caa9065af58f56f1ff43e8f8cc6875f28 SHA256 298f2ea5310e79ef88a5f7c512e273c5be43aee5f6fc31847c0ad10668734319
 AUX quagga.env 25 RMD160 2ea6666fbacfdcc125283dcd4a5f6bae089f5392 SHA1 42aad9b84a949f13bfb708659290ec1f0de6eff4 SHA256 12aeda71c607c4830fda6042daf19353a9187e062a8ad998e5a2bd3e52773297
 AUX quagga.pam 975 RMD160 df2433b76a16f2c8747f9569e88ed90c9c1f2bae SHA1 bfcd1bbbd4162fd70541f0d754a0e5a818025bc9 SHA256 aa68ac97d7a951324bc3c4124a1c70f6fa88a45da860f636ac01cbcbfa36db70
@@ -20,13 +19,13 @@ DIST quagga-0.98.6.tar.gz 2019992 RMD160 e15cd93b5d321660d7e29fc2717435296734287
 DIST quagga-0.99.14-realms-test2.diff 56183 RMD160 aed1425ba99ba633df7c879641cb365811e4caba SHA1 1e5ee9262ac5df1421a4f293713d7d3cb33a2d4d SHA256 20091855d46b441a3f0b39b1be06c84f846d8508de96e09504c3736bc2b6a3b6
 DIST quagga-0.99.17.tar.gz 2202151 RMD160 f00bf01930f781ae0de9fe9981c74e7bae0798b5 SHA1 31f42fa9f4d96aadf1bf97c3d9bf3308eb0d56c1 SHA256 1d77df121a334e9504b45e489ee7ce35bf478e27d33cd2793a23280b59d9efd4
 EBUILD quagga-0.98.6-r4.ebuild 5384 RMD160 b13750f47c0e0452958a57de6e8547b493ef8a7f SHA1 76504c11179ec546161a2da58ddd884a48b27628 SHA256 f156a7931080ee9d9f0ad8dd4322144e9e2db780b072ae6e2820f51eff393d2c
-EBUILD quagga-0.99.17-r1.ebuild 3488 RMD160 25583c16514b0d95e56d7684373ec13bb6892b10 SHA1 d64d10ffe428c5e6cae670fa67efd6ffd0fbd9d7 SHA256 f09f3ffbac1fcbcb8af32ab6f26edc23f26d15f455318bf20d670d6049dae578
-MISC ChangeLog 21162 RMD160 9ca181c1a56d6ea501b91ce24818fc7854f38c2b SHA1 0ca3b7d7bccffa781b2120b7573c945e65d25559 SHA256 3cb57629d1705f14c3df42de5f1831389b3ee44ff141969811e4de861199a6da
+EBUILD quagga-0.99.17-r1.ebuild 3381 RMD160 33bec333142cb0210429072152b78c1a8d6f9c36 SHA1 f3e849666a3b5bca19bdc4f14d01fbd06801b1e3 SHA256 1d93b95813da6b5885e898d5528ea4ca15553e3f999c7b0228c5612adf693ab0
+MISC ChangeLog 21434 RMD160 885f1f4f274cceca58de082558e0857dfd80692a SHA1 91465080700313d12898816346bb361668904117 SHA256 04ddf519342811d8c55b7a04f794796be4ba1b393f49ae8c943b221aaf167c98
 MISC metadata.xml 2820 RMD160 aad319b2e7733276212ffd20318b32b1f95b5d91 SHA1 ad0ab92eeab1ee38406e9586ed5d44ba30133949 SHA256 7bb2fb2fc73a50a1a8460c8e718c2b7c13537ee6cb930dc11960a156840bf937
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyEZxcACgkQAiZjviIA2XilhACff/vtmzS7Gzp4t+kB+sU18UNK
-UVcAnRt6b1bprxTAqmwh5IviVUqbCKda
-=K7Lc
+iEYEARECAAYFAkyE14cACgkQAiZjviIA2XipZgCg472CxcrfZhJfiExSfObOvPuC
+PEkAmgMVDlsm2fyyMtpv5J5mxJ3nI68W
+=d1ap
 -----END PGP SIGNATURE-----
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}"