bup

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

4 files changed, 25 insertions, 102 deletions

diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index e7fe42ca583b..b130d71e42d7 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/neutron
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.39 2014/08/10 20:20:58 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.40 2014/08/21 20:44:22 prometheanfire Exp $
+
+*neutron-2014.1.2 (21 Aug 2014)
+
+  21 Aug 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +neutron-2014.1.2.ebuild, -files/neutron-2014.1.1-CVE-2014-3555.patch,
+  -neutron-2014.1.1.ebuild:
+  bup
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> neutron-2014.1.1.ebuild,
   neutron-2014.1.9999.ebuild, neutron-9999.ebuild:
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index e9ab1859dba1..6be78598d4d5 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,7 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX neutron-2014.1.1-CVE-2014-3555.patch 4357 SHA256 8f1c456e7cf961047f15c991dfd70b69a249a3477ad9b320f45a094724d6173d SHA512 3ed07807f3f1e04af8240731e3b101ec591c8321ff9ae6c5790ab8559538f733158175df37c2531e43383c6e1f66fb530008c5b2ba21341d2b13548fe3aa23bc WHIRLPOOL 447ac22629053b6099e2295600776925ba96d802f690bc8a44d5d56c359bde05aa1193284a35b922230127f696c28cc3129c027b7e12cdd5b0ae33c46ac18b28
 AUX neutron-confd 75 SHA256 2e03d5dee96eb235d3d2742fb59b52376914dae1d8683144396d796dd35ea9f5 SHA512 fefe7dd1924fabed3cdddae2a407b254c62f39c49abeae238486896e9d26863caebfdfea6d52c5eef34d25452b163c373105929bd069b969c2af0f7d62d6c0e6 WHIRLPOOL 1ac7ed6b2287e66bc51be8b521e355a48e888e1e57371362bfd41fb831d63cc90aab542c1668b4acc1c087cb6bacd418a480e2732a7611b8df290bf63444c902
 AUX neutron-confd-2 75 SHA256 0fce0e6f6cec493b9b0bcb96fa3211ba47a6420b9ea675ef65979fd9505121c7 SHA512 e64116f6cab81a2ee56d797f8144dbc8b214fb627bc8d6c3045488b1fec694cee8e8f3f3fbd327fb28f704cdfae40ea468d8a212c819abd45e809a1fa56b9670 WHIRLPOOL fb027c386c99448c29b265adc234abbc4d23a8be015690fd024b1f39ccc18dd64a1ab57c6cc26a054d576a0bbbed797058b19db90abf0318ae79dddc4efd2056
 AUX neutron-dhcp-agent.confd 75 SHA256 e36fe3d370ad2b4c82ccf1f4caac60882334d93e3abd7e0e6e268d23cb069d71 SHA512 94cf300c9a9d0275e4fcab4ffdb7e29ca26b73c120d6ff683b48ea0e9c21e46123289522aedd295e4d5d28307133b50084541a90a48db456802d675eed6c2d3e WHIRLPOOL 9e77fe1ef65fa8ef46f8272ddea7213a46e71c6f2884eab20f09eaddc977f5cc202c8529c1a75347132c667e4e2d39d5bdd3ab2c94812c4b1f95f398af75c38c
@@ -18,16 +17,26 @@ AUX neutron.initd 792 SHA256 2170e60f05a3f41b47b80def27195fc3b67517adcdf8c6d5376
 AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321c01cd25b5cc9dcbe SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 WHIRLPOOL bb0e35d7b7471fab424f86f181601bc87d4bba98f4fbc282cc6302a05128992613097afe1fea159e9c718cd688a03c280b53d72bfe47fc91bd24967a4b4618da
 AUX nicira.patch 5757 SHA256 62484fa9d817feee1edc0a51ea1eeca068406f8f76e34c845b85ea51664e20d6 SHA512 f160a36f78d9a1186e19cdfb4f97b17e39e1a6f3e20bcaf84e76e71c632b0a6e8af89645d507f2c6f60a9f7d09a741302d476731c2fc798dfa999aaf38f1e273 WHIRLPOOL b7b5e0618caa8c6acc65f46c315d81b427810f3d6b1e89b48fc79567717c90a2e81e091d532ea192ac68ad432374fb9debe79d7b2c0a5a82d7d8cec8ca64f50e
 AUX sphinx_mapping.patch 835 SHA256 f4745338474c9191ba386f81705cc8c9a6effb09116c65664654eb733d081252 SHA512 988236676ef0550ca96cc05e606d43280969e89b31971244ece89d63cdcbcbcfd3ac595adca03a6308996ef58ebc4f75b0dfd65a938ad7c3fb67fb785e09f8c9 WHIRLPOOL 6154ee51ecd63040d9a6c2058f369a7243c719cbda3f73484d55ea9425a5c9982d3921d91d152aa27c61c5635d74f2afa57ff1b5aaa10b1be1e7c1475ff74e5f
-DIST neutron-2014.1.1.tar.gz 6404237 SHA256 4723713b124ec7be0ae5f280d30a53b00ab5bec8a27be6165bdc630b8f22c1b5 SHA512 8a586741c035700ed8f33089830278e9eee9745a8fa58ef4ec71638ffecbd7c8689387f1597d948ca18a7f7edbad1ff67aab6d5304b61069556d5418e55738c5 WHIRLPOOL 6b7d139f1265a719edf05dbe2648fb7a056f708984da3e2b7b89f17746694137b5201bc69587e0af1a9729710205538c5841c860180ea9d7e7f5f0a17ece43dc
-EBUILD neutron-2014.1.1.ebuild 6783 SHA256 1700a056275db18491817e127f8ea19b3bb987696fb3fe86826beacfeceabd3c SHA512 a26a6cf54dcbbf0173e99fdbb865a271d9751fca9fe8f50ccd47c1b4375fa01d6a77dfa73620e6efa92c7c6e984b681822126bafb4855ddd80e643745de1006f WHIRLPOOL a30c7c3cfd51205106efc644eff69dd744f2041cfbc82610fdf41ac29bffd7c4b043b4d21338a4c25df30c504e611c39d196feda6c601102b5e3b597b47192f2
+DIST neutron-2014.1.2.tar.gz 6418129 SHA256 6ecf65fa3679d2b49180740bca66cd88effdd38ecf4cd3fdd0ad8ef0979c263e SHA512 8baba8225f1c6e06a0d41e26e40307910f0944370290e6dbf6be78eb01175aba8349d4d02bb1bca5f2dc8545f141bb176df26453c777affc1c68907c17098476 WHIRLPOOL 96de6de614b8b34538fb46de06b95fe1f2686184db471d9c8ab9566762e057408dac00a5ea22607e982b7b59463c9f7e0d18d05ecbe98c675e56d12c142f7352
+EBUILD neutron-2014.1.2.ebuild 6739 SHA256 7a175617142e5c3d93ca5218bb0c697917f9bb917c53f44c5297dd97143d96f7 SHA512 473ab3e34afb5be60885e8ec48860168a42ff99a4a819e5281325883d339511dfd9540bb920887b4663abb70c758c49c0ad83c51068a72bc794f77aada2e1428 WHIRLPOOL 0d3401b6b2e7abc6e09ddea4b7572ef677301a45b5958704f570179b466f0396a30ba1e2f46bb6a28c145e31f7dfed9f697f5048bee888f88354bafc6d361b8c
 EBUILD neutron-2014.1.9999.ebuild 5744 SHA256 c62738a65b9b9a1fe1997dd550b07216e33ea4a66359d086e0da82182add17b9 SHA512 bc689fcda6fa58cb13c45c24c2f808a3c59b820e72429aa26e4bae7d02b7dd064cdea09857113a20ec3a35fd18722883c8a43db8f49c2936c57aa401430c942b WHIRLPOOL ed2353628282dcd4d05f65577189d86edb88783d9a2bd0152154619380aa23ecb9bbc2c4b6561edfdd02581c66db29ab61fdca2db15e1f5f5a306f96fb9b0118
 EBUILD neutron-9999.ebuild 5708 SHA256 f50bbbca6ff649310d31b665b984bac6a96b4827b3fd6baf9499303c18f887f7 SHA512 0820ec933265d84921e84f9ed1cd3c4ab27af0292138e57d8f90a3e8c954bbc0d39d0fa822c210fb8957951bf71e4fe0ee9d69c600de48eedc6bd7c2950584e1 WHIRLPOOL 5699273d695853342c7cf90160996add4e1b525c8042efe2e0e16b9afbd684a6e30c988b94c3190b577f1f9edd3c63bf2f39f926aa5e60e7dc9ad3b5802a69e8
-MISC ChangeLog 12584 SHA256 ba0f0a86a8625a185cafc7a89b2d4a79379d0789758ee56ecce51c73b7fd7d41 SHA512 8fd3fc6a6333b0dd9f6dfbc3eeba1ab40f9e8a411625da3c0eeccea8708746aa6fb4f42d6249efc7a06b44708305bffccd0bc599409baed4e01ff4a37445fae3 WHIRLPOOL d85cead329dc04c405a9e2543a37c9c84bc4976e22e7fd72559e2387bedc05ec3976913714872e3c86427d26c4c6834cb86eb0d431b1c12a660a64d5ba42ee1d
+MISC ChangeLog 12790 SHA256 bac98d96b1a5eb0ade435257708fe0d1a340fffcbe9578b1ea6631002d18292f SHA512 9ff7a412fef84430a6b992d0adc02c5bc0795b0c476474adc5b91ab64cd9847a95c4a7712129a74557a04f1c8a951676ef17f01763ca03b04a45c5198649cb33 WHIRLPOOL 3d57d2fb1574d98ffd993aa5f83346fe1671f07ae22495387a27e90ad2550c9e7666847d653d4544a8667122b73f4c0befe1fac8d37cd032fee7bab76f446029
 MISC metadata.xml 1296 SHA256 7d6de6c9dc0602e7ea1147c40e8798aa61e01a891eade2b291628850d52889ab SHA512 e49d4872a6fefdb93f20665cf1a176744a1eaa3c068617dbb41e2591d084776d55334997c8046d725e84f5a7280481392f3fccf42f6cb02bbf1751d43076c49d WHIRLPOOL 0b3e08407b951bffdaa54e646d35c000e5b1df43381132386b77056e26773d6344ec7ace4b7a87ae14f29090fcdd490f05730ece3597b8e7a2d4389dfe816312
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn1CsACgkQcaHudmEf86qXPQCfdFoDZbCnwFgjXolPj/b4ItBB
-SX8AnRKuWvtoujHkjY7554Mg6+6MmaMr
-=CILM
+iQIcBAEBCAAGBQJT9lovAAoJECRx6z5ArFrDmcsP/juv/I2VfXkHJXP1wTniotlG
+YWzph2ZkewfbOLk8iR5NSMEg/m9MOo1w++L1hnxZ6hgdiogF69lPJ2YZgL0VOLm+
+1IG9VbR/I5oBgonr3a5EyRkEYUOjT49Dssy2AupeOcr7QdZvKhmDBalo063feCfm
+y+S8WrYOenMaH4QLhGT/dgVbE71uFD/FYqNJH1yU6fKCybBdJe28XUS1WLt2U3ZT
+4eXntFmeJG8jq2kCdC2c3lJzzJGEafbS2kIdFUnTwZJpaRajuPd3Go5LkDSEKmk+
+moUVd04FWRUD0Ou0qIukjIB4L3TdZZlbTKhyEt7CEWdtMJMg/50H4uX7PZcTh3/U
+7/RxN34gTtkOId6wp5QFZD76VsLiMPp708/Drt01LhrMuMTz9ahaK7OgYohd8xM5
+SAk5QY8ZUtBcpIxZ5AbIRj78xNZVv6/6Z4ZAb8zpm2MWdu3ZQCN/Y6eBehkkmdwW
+ecbpRFnQJRSWdS5ZuvPYLa0UqwTdSLdCQKv0iZVSF6GSlMCwRWka+R80roW8jGB8
+EhZjnNS9AzyW0grD5bqayIBZY/HzH4hy36vZ2eDWJ6nhIaS3MwnJF1EAjwt1mEg0
+Ubq2V+21Cs7J9H4rF95DpgoamHNNxwG8dtp4HNbFh+E12ATe8/exWuLBr63gUYD5
+datB5bdWvekPkyYarGEb
+=o/0+
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/neutron/files/neutron-2014.1.1-CVE-2014-3555.patch b/sys-cluster/neutron/files/neutron-2014.1.1-CVE-2014-3555.patch
deleted file mode 100644
index 14f05f5af75a..000000000000
--- a/sys-cluster/neutron/files/neutron-2014.1.1-CVE-2014-3555.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/neutron/extensions/allowedaddresspairs.py b/neutron/extensions/allowedaddresspairs.py
-index 96512f3..1283da4 100644
---- a/neutron/extensions/allowedaddresspairs.py
-+++ b/neutron/extensions/allowedaddresspairs.py
-@@ -16,6 +16,15 @@ import webob.exc
- 
- from neutron.api.v2 import attributes as attr
- from neutron.common import exceptions as nexception
-+from oslo.config import cfg
-+
-+allowed_address_pair_opts = [
-+    #TODO(limao): use quota framework when it support quota for attributes
-+    cfg.IntOpt('max_allowed_address_pair', default=10,
-+               help=_("Maximum number of allowed address pairs")),
-+]
-+
-+cfg.CONF.register_opts(allowed_address_pair_opts)
- 
- 
- class AllowedAddressPairsMissingIP(nexception.InvalidInput):
-@@ -36,8 +45,17 @@ class AddressPairMatchesPortFixedIPAndMac(nexception.InvalidInput):
-     message = _("Port's Fixed IP and Mac Address match an address pair entry.")
- 
- 
-+class AllowedAddressPairExhausted(nexception.BadRequest):
-+    message = _("The number of allowed address pair "
-+                "exceeds the maximum %(quota)s.")
-+
-+
- def _validate_allowed_address_pairs(address_pairs, valid_values=None):
-     unique_check = {}
-+    if len(address_pairs) > cfg.CONF.max_allowed_address_pair:
-+        raise AllowedAddressPairExhausted(
-+            quota=cfg.CONF.max_allowed_address_pair)
-+
-     for address_pair in address_pairs:
-         # mac_address is optional, if not set we use the mac on the port
-         if 'mac_address' in address_pair:
-diff --git a/neutron/tests/unit/test_extension_allowedaddresspairs.py b/neutron/tests/unit/test_extension_allowedaddresspairs.py
-index 826768f..70eb1e3 100644
---- a/neutron/tests/unit/test_extension_allowedaddresspairs.py
-+++ b/neutron/tests/unit/test_extension_allowedaddresspairs.py
-@@ -22,6 +22,7 @@ from neutron.extensions import allowedaddresspairs as addr_pair
- from neutron.extensions import portsecurity as psec
- from neutron.manager import NeutronManager
- from neutron.tests.unit import test_db_plugin
-+from oslo.config import cfg
- 
- DB_PLUGIN_KLASS = ('neutron.tests.unit.test_extension_allowedaddresspairs.'
-                    'AllowedAddressPairTestPlugin')
-@@ -163,6 +164,28 @@ class TestAllowedAddressPairs(AllowedAddressPairDBTestCase):
-                           'ip_address': '10.0.0.1'}]
-         self._create_port_with_address_pairs(address_pairs, 400)
- 
-+    def test_more_than_max_allowed_address_pair(self):
-+        cfg.CONF.set_default('max_allowed_address_pair', 3)
-+        address_pairs = [{'mac_address': '00:00:00:00:00:01',
-+                          'ip_address': '10.0.0.1'},
-+                         {'mac_address': '00:00:00:00:00:02',
-+                          'ip_address': '10.0.0.2'},
-+                         {'mac_address': '00:00:00:00:00:03',
-+                          'ip_address': '10.0.0.3'},
-+                         {'mac_address': '00:00:00:00:00:04',
-+                          'ip_address': '10.0.0.4'}]
-+        self._create_port_with_address_pairs(address_pairs, 400)
-+
-+    def test_equal_to_max_allowed_address_pair(self):
-+        cfg.CONF.set_default('max_allowed_address_pair', 3)
-+        address_pairs = [{'mac_address': '00:00:00:00:00:01',
-+                          'ip_address': '10.0.0.1'},
-+                         {'mac_address': '00:00:00:00:00:02',
-+                          'ip_address': '10.0.0.2'},
-+                         {'mac_address': '00:00:00:00:00:03',
-+                          'ip_address': '10.0.0.3'}]
-+        self._create_port_with_address_pairs(address_pairs, 201)
-+
-     def test_create_port_extra_args(self):
-         address_pairs = [{'mac_address': '00:00:00:00:00:01',
-                           'ip_address': '10.0.0.1',
-@@ -174,8 +197,10 @@ class TestAllowedAddressPairs(AllowedAddressPairDBTestCase):
-             res = self._create_port(self.fmt, net['network']['id'],
-                                     arg_list=(addr_pair.ADDRESS_PAIRS,),
-                                     allowed_address_pairs=address_pairs)
--            self.deserialize(self.fmt, res)
-+            port = self.deserialize(self.fmt, res)
-             self.assertEqual(res.status_int, ret_code)
-+            if ret_code == 201:
-+                self._delete('ports', port['port']['id'])
- 
-     def test_update_add_address_pairs(self):
-         with self.network() as net:
-
diff --git a/sys-cluster/neutron/neutron-2014.1.1.ebuild b/sys-cluster/neutron/neutron-2014.1.2.ebuild
index dec507c0726c..bf80d358d097 100644
--- a/sys-cluster/neutron/neutron-2014.1.1.ebuild
+++ b/sys-cluster/neutron/neutron-2014.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.1.ebuild,v 1.6 2014/08/10 20:20:58 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.1.2.ebuild,v 1.1 2014/08/21 20:44:22 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -85,7 +85,6 @@ RDEPEND="dev-python/paste[${PYTHON_USEDEP}]
 
 PATCHES=(
 	"${FILESDIR}/sphinx_mapping.patch"
-	"${FILESDIR}/neutron-2014.1.1-CVE-2014-3555.patch"
 )
 
 pkg_setup() {