From a611530317b3831c8a19604d697468b0e2a285c3 Mon Sep 17 00:00:00 2001 From: Matt Thode Date: Sun, 8 Feb 2015 02:31:26 +0000 Subject: [PATCH] bup Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x33ED3FD25AFC78BA --- sys-cluster/neutron/ChangeLog | 9 +- sys-cluster/neutron/Manifest | 36 ++- .../neutron/files/CVE-2014-8153-juno.patch | 120 ---------- ....2.1-r1.ebuild => neutron-2014.2.2.ebuild} | 91 +++---- .../neutron/neutron-2014.2.9999.ebuild | 52 ++-- sys-cluster/neutron/neutron-9999.ebuild | 225 ------------------ 6 files changed, 88 insertions(+), 445 deletions(-) delete mode 100644 sys-cluster/neutron/files/CVE-2014-8153-juno.patch rename sys-cluster/neutron/{neutron-2014.2.1-r1.ebuild => neutron-2014.2.2.ebuild} (74%) delete mode 100644 sys-cluster/neutron/neutron-9999.ebuild diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog index 4e1f760ff4cd..9f060ab3d29f 100644 --- a/sys-cluster/neutron/ChangeLog +++ b/sys-cluster/neutron/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/neutron # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.51 2015/02/01 05:54:46 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.52 2015/02/08 02:31:21 prometheanfire Exp $ + +*neutron-2014.2.2 (08 Feb 2015) + + 08 Feb 2015; Matthew Thode + +neutron-2014.2.2.ebuild, -files/CVE-2014-8153-juno.patch, + -neutron-2014.2.1-r1.ebuild, -neutron-9999.ebuild, neutron-2014.2.9999.ebuild: + bup 01 Feb 2015; Matthew Thode neutron-2014.2.9999.ebuild: diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest index ec07dc2c92aa..f2c50202fa6f 100644 --- a/sys-cluster/neutron/Manifest +++ b/sys-cluster/neutron/Manifest @@ -1,7 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX CVE-2014-8153-juno.patch 5178 SHA256 ef2ef6ecfbe5aa821903c18c1362ca3079b1e2e5239000b32d521e12e0eff846 SHA512 fed7708976aada4146fdf3d22b3ded70defeb843e88920d6a3b164a701643590fcd2738185d5935024dd9c2bcf1b260368f958f33733ed87ff8e32373beb27be WHIRLPOOL 4ac46f4c9378ab894f2dbfc02ef8d204fa840c5f6c65a1015b5b82ef8f436ebb57c510843d5aed21c018230582161d538246ff2535cdebc66c56470528055a9b AUX neutron-dhcp-agent.confd 75 SHA256 e36fe3d370ad2b4c82ccf1f4caac60882334d93e3abd7e0e6e268d23cb069d71 SHA512 94cf300c9a9d0275e4fcab4ffdb7e29ca26b73c120d6ff683b48ea0e9c21e46123289522aedd295e4d5d28307133b50084541a90a48db456802d675eed6c2d3e WHIRLPOOL 9e77fe1ef65fa8ef46f8272ddea7213a46e71c6f2884eab20f09eaddc977f5cc202c8529c1a75347132c667e4e2d39d5bdd3ab2c94812c4b1f95f398af75c38c AUX neutron-l3-agent.confd 73 SHA256 560997f3e40d90ef885483e4bd02728bf88720378238fc5e6b3b2abb2ba9dd0e SHA512 4a902c5621abc124424bdad97de8959f63f7c846b4c7b9b3ccaab5522ff3e6938acf748df269980484228d4fc13d2f1e3e3670619207e3c88ea5dd5373699e0a WHIRLPOOL 653156dbbff34606fa0694bab622eb40c2ead171b1ad0a0c934285a50f15db4d8927e40ebff8d2ffe64078a8a079d48a2834e68b049c11a68417dc3945374cb8 AUX neutron-linuxbridge-agent.confd 100 SHA256 d829f07e9062065ba1079a32f9de99b980e8ef818767ddf890c009b6b89a89e0 SHA512 3c999af9b63284218c630b3c73a047f4bb5ef36bd9eb8a2a10c08fe23e3836f276d13ad40b19f6698d49ec2ee6587e62ded9079851b2af5618456082badc1921 WHIRLPOOL dd354818597ea5e93a2cc9bb6a1e750450c4a1b6f513729d64b59c35c3074627a1ad543c5f8b20cc68afe928496633719dd503ca7b58416ca348ab1c96c27933 @@ -11,26 +10,25 @@ AUX neutron-ovs-cleanup.confd 102 SHA256 a5d5aa7ba2794f593e65c8c87888f29867a817d AUX neutron-server.confd 70 SHA256 40d09a699fc3bced40c5a9dc7394a76c40c245b579fc270909966e11485564d7 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0 WHIRLPOOL 59f9ac13d58fd76014090988c642d4cb244d51726fb5733cc30e7fbba5c22226ef955f8e8021dad04ab457df0fe5879d13af8c40a6913d03c15bffb48cf4a5ac AUX neutron.initd 792 SHA256 2170e60f05a3f41b47b80def27195fc3b67517adcdf8c6d53765cc8c552861d5 SHA512 aeaef18f5b0f29b9eddb2d76a640cd3e11af6bd211d837c2158e46f369aeebb915d5ca1deb354970fabe788478a3c6cb82f1886a85bdbdae9205c8017a89f0f4 WHIRLPOOL 77bd8b0eed45ab62314379239e19915b1368f8fbe069d22fa36ceab730780a920b6cbbb5aef85b053cfd66716775499689c874e91bcbc0c296a52140a26e7fab AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321c01cd25b5cc9dcbe SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 WHIRLPOOL bb0e35d7b7471fab424f86f181601bc87d4bba98f4fbc282cc6302a05128992613097afe1fea159e9c718cd688a03c280b53d72bfe47fc91bd24967a4b4618da -DIST neutron-2014.2.1.tar.gz 2062302 SHA256 39c9a8cd2d864b4346289cbcc4977db9a81e34d073abb4c6c0f39fadb2b9e881 SHA512 8a8fb5ae838eca5be5f167afc6c991a5aef0158cb49ec82ebaf5b87ac9ae22a3ef3c943130396ffcd6b037c40b974c3e3abbde8d7315e42c0db147dec0af420b WHIRLPOOL c04492e756fc647ce938152b8ab7c34ac443d9b9877c106d31a6581f4ef3a7cebeaaeedde75771bdef28c90ee42a5c3c7d985fb22de2acea60b0ed907a0a0081 -EBUILD neutron-2014.2.1-r1.ebuild 7684 SHA256 04e394754ede8774e29f589be742e807ee28e92149a3c2fbb9d149ebab7d9f54 SHA512 fc9bf1ce42a643cf02e35daa404aa9feadb6b8eecaf55fb8eebe499027c8b31e552d7a28ebf7f17cf6197de9c9853586bc6030e43ff610d2413354f54db5a5e3 WHIRLPOOL d8ce51c42eef6112c473bff14ea1e8d86a572526c7c7346462bf44fa64651ab92ade4692ccac07112aa0723856e502a5fa391a626619eee03a7f5feb971b7f3e -EBUILD neutron-2014.2.9999.ebuild 7307 SHA256 84d5369fcb0cc499dc39beb7ca0d60cca0a6febecbe8770f1386a64670583c4e SHA512 17790d8b7133a7f3d6eae384dd2a37edd0f9b5e636d6822f677bf79dd102c082e461939c26f1ebe68452c7974caa02d309afd54f57a9cabca59efdb7370ca823 WHIRLPOOL d77f4d5da2762bf4cfdfa2dcbaebcdc0e925c9adda5f35be8393bd97cf4293603f11327f56119b68b90c4ed215054e9accbd46b0651a67afe5f8e9543f48b03c -EBUILD neutron-9999.ebuild 7641 SHA256 07322b7181344125e6e1aaf3df227c403f547f72cec4ebadce09896e6b647276 SHA512 269780948a354c2d25e2ccb1deb60feeb19bbf3c2a0a35fb9b3a74f124a8945843d0b6d324984d0951df2e21121d6a30417907aef553b21951ec51167d4671f7 WHIRLPOOL 82a083866be4b9f83ee92ec3e37dd584ba325a558e52788ba97694bce80816c105366add92ba0486f0ecd07f8e50df379a0f7d56feabb654d4dfe823c2905e34 -MISC ChangeLog 14998 SHA256 9e1e4b752d784a95dfa89fb8e75d272a2cd4000ba65dfe42fb74882f64d13272 SHA512 d7cd379dea5168835fa4b255be72556fb75d2e463c57c5c51d2cbb4ce6e003c0a3c44f4e4019505d5c55152ce38dedae8651cb280c61a2314067fce979f3c636 WHIRLPOOL c2a3d343e22a52d88d66c418827409e405d9ca3b878df33e44e717d3637513728c41c0abc1e4798e28c9d44b5b4c26fcb5fa251ea59a3cb704e96b543f8c3579 +DIST neutron-2014.2.2.tar.gz 2071312 SHA256 6b0509f7bc12a52ef4e90e1464720cd240eb93f0db2eef7d109d51fdb836a412 SHA512 af307f67d79ca66829992b1c953028231d64dfc78fd52f1ba256aac9663769fbeb5e0d0b9fe29c65b21178e7e8c700f5cc564ec888c860844d4be64ffe0880a2 WHIRLPOOL e72374bf093f22ac8871dc89f46d4a210dec8060859309e01426b4a46f4be71ba44af97cda92448f6b7d3c4c9cd66aa25ce232740e446fa0d527f2e4467f694e +EBUILD neutron-2014.2.2.ebuild 7235 SHA256 a48216bf52fda09edabf4cb386d98671cd5c426bebeaeb71dd6467c34ec0f3bb SHA512 2bc5f9bcd241c243cdc27c5f640c030bb0a9264cf8ce4a5e60570eed94d8488df10b778f397b1b76ecc6823698b351230985bf99a6631f2cd45e9097df994d8b WHIRLPOOL ce8d9c9e93e2dee33151ebdab71648affc7bd622742c65038fd71a8f53dac8f52e5a0538a6df0e4de28eb58b1fa589d21ed548175098d152d4640029ef5423db +EBUILD neutron-2014.2.9999.ebuild 7246 SHA256 c9ff8bd044defcea0d79621e1965655f3fd4f0bdf9e812b04b93486a1836d2d1 SHA512 1e3d4ee9d961a79ea588a705edb07d9b54bb1e88097081c17939929f7b9a72ed1597d3ad8fdcb77982028b8a7cf0b798ff075de35173d9c5e7c11f8450c5e1c4 WHIRLPOOL 34d26abacdf239074ee64b7fbc13944f870875a806e2e459a6bdf84d5ef08a39883d147445305b0175ac1a20fd188d946f8b5ce7068b1d1a8826d02e46f30220 +MISC ChangeLog 15237 SHA256 f043cebf6c7c5b667157457370f981e50162d74b4a3a605391b6e22bb9977af5 SHA512 c64d4272d912d68c7b7a4d87dcdaa85158b1c9f2368bfcb22a8dc3598bf495c35962207946476b2c1bb5dff82f9808e4217ca28766860df3fcbf8535eb9504dc WHIRLPOOL 70e2c36a99947d0e9aef3084f8848abee418d89596343db97b04ea42d3f8444335b49ea504ac998ee19b48a5ae3a3ed55a7039a1ce6d3db290a2d09fc4fb033a MISC metadata.xml 1296 SHA256 7d6de6c9dc0602e7ea1147c40e8798aa61e01a891eade2b291628850d52889ab SHA512 e49d4872a6fefdb93f20665cf1a176744a1eaa3c068617dbb41e2591d084776d55334997c8046d725e84f5a7280481392f3fccf42f6cb02bbf1751d43076c49d WHIRLPOOL 0b3e08407b951bffdaa54e646d35c000e5b1df43381132386b77056e26773d6344ec7ace4b7a87ae14f29090fcdd490f05730ece3597b8e7a2d4389dfe816312 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUzb+9AAoJEGSje+quGaTovS8QAIdpmiqBoNvx5ifTIEto5QMn -ZL7O9ctTg5nR8IESPI/RSxDtLPCZXTg/AoFC8Z8FfHyyuSJPvug+hIOL1+ojIyaa -J7y6HlQIB5Rqx61QO44X1uxqNi42oGLfibTQB7HIeaQtSNzxgMnGW9CSs3LLuc+X -G5BFU7iXcNTa50SIflLrGrKD4iH5eBOpzKB/8KLwpUadJ1LwUI9AP0ekbztXbgxI -WbeGmAdz9qeCmUZKQkCDam7t0GNimZ9EdcRPjSeuBqMdLHOeE1G1zJBjldwGlXJc -GlHTVYS6aAQTDFeb1+qNsq3ov3sPpba1aoSXolTS4uxt1ZSxLs7um87TApwvIB8f -qubXClw3lrOXrmMsHFMoy1QgcQWvjsTJMg9OAfrq25vr7iEMjOX+vtJ+sV/L3BO6 -2vYZBabyC8EDS2YVP23OPKSPGUuP/K211UJ0W6l3BUzuYqel1kMDY9Zca+/Y7mBR -OdumOyupLHzVDMJnhQyWqGDEIj79FSYRBD7skQqw8N1LfL+i+Jfmkf/XevL8Lncb -gNTMrsNpm6wIVm6eLmqxZrBMtFLoq6416CxxxlShlFO+fX4XCHY7QK6vIZVzWw9N -ONopj4nI10alhTEpKvNohnO/u7nO80X+AYdobec5Sk1XdcyfEqz8g29eKuM0c98X -YGHcTLhrC+ACKUvlg9hh -=XU9F +iQIcBAEBCAAGBQJU1sqVAAoJEGSje+quGaTobpAP/i15gfennWdlTnQ+RwRYA6sd +onjJu5gpE0mUJlrOSLJ8JkTfDus64ZiNleZD3ogcIRM/mRaPVSmu/IBKOTzyB+uU +t5824OQhfD/dqLwgR4S57d/p4kV73kOW62PO0U6KSOUtuPOy6dvXjZHlLhPW2BZH +jZs+6IJxlmJQa37VkJkq8J3bCQAlrRSFPVuidB/1YQYN9t0HQ1fTlrjZNW7GGxt1 +S02nhgv6GPYjY1b9xgxygff2uY/lEOKuij1RDX1I5/QN3A/zbdT07Pm5SGdged03 +FTyD2Lp5BDPxLNt2yFl7wX5QD8gZnJtz7myLZ5KCvw6lPpxsEffxvDAdGa+d0Vkl +2aIDDIKW+inp4WOk5RorJZ+n/KPkTRgSpM2uI6bHojWFdhlk4mRzibCoYyEa7PY0 +fyQgHa+KQQAp6GdRUxSfWtUzJVvL1t3tExexwFHXM23fTQJdExaxlbw0MfYLkT8Y +1Ovwzp+R+XKc1iruFIbGyNEu1m9P9f8NAyY/JssjXJMu9uH82QTMlMnRRGNVJxFp +OJEYyG5Q0FdheXg+SQr0PZXGumFq2dyy6o3CRRf/i49otB4ijZRb75zj4Fyj3HX0 +r9HwAsbGxbB1eTHOgGCQI+ZMyn520IWnBypWcB0vX9RqzZJkwMJfad/gGYhC1Jr3 +n0xv4g59RrVsFSWv3JU1 +=cwAl -----END PGP SIGNATURE----- diff --git a/sys-cluster/neutron/files/CVE-2014-8153-juno.patch b/sys-cluster/neutron/files/CVE-2014-8153-juno.patch deleted file mode 100644 index 687eb3febca0..000000000000 --- a/sys-cluster/neutron/files/CVE-2014-8153-juno.patch +++ /dev/null @@ -1,120 +0,0 @@ -From 6c490a984af690e732f8b96a18493ac1afef892f Mon Sep 17 00:00:00 2001 -From: Ihar Hrachyshka -Date: Wed, 3 Dec 2014 12:44:57 +0100 -Subject: [PATCH] radvd: pass -m syslog to avoid thread lock for radvd 2.0+ - -Since radvd 2.0, the daemon does not use daemon_fork() function from -libdaemon, but instead calls Linux daemon() function directly. It also -passes (1, 1) arguments when logging method (-m) is either stderr (the -default) or stderr_syslog. The second argument's value = 1 means that -stderr is not closed and left there for (some) log messages. - -For neutron, it means that corresponding execute() call that spawns -radvd and expects the invoked process to close stderr does not ever get -completed. The current thread that spawned radvd is locked waiting for -radvd to exit, which does not ever occur unless the process crashes or -receives a signal. - -Since L3 agent gives exclusive access to updates queue for each router -to one of processing threads only, it means that the thread that got to -serve a radvd-powered subnet will not proceed and not update any new -ports or other changes to the router anymore. - -Passing -m syslog makes radvd 2.0+ close stderr and return to execute() -caller, proceeding with router update processing. The same arguments -should work for old (pre 2.0) versions of radvd too, so passing them -unconditionally. - -We could instead use -m logfile and pass appropriate -l -argument to radvd to make it log to a log file located in router's -namespace storage path. Though that would be not in line with what -dnsmasq processes currently do for dhcp agent, where we log all messages -to syslog, so sticking to syslog for radvd for consistency. - -Juno changes: -- tests: we need to construct RouterInfo to get router namespace name. - -Change-Id: I131db0639bc46d332ed48faa2bbe68a214264062 -Closes-Bug: #1398779 -(cherry picked from commit 72d41174765540bb7672b545c336fb7aaad075e8) ---- - neutron/agent/linux/ra.py | 8 +++++++- - neutron/tests/unit/test_l3_agent.py | 34 ++++++++++++++++++++++++++++++++++ - 2 files changed, 41 insertions(+), 1 deletion(-) - -diff --git a/neutron/agent/linux/ra.py b/neutron/agent/linux/ra.py -index 66fa012..6bdfea5 100644 ---- a/neutron/agent/linux/ra.py -+++ b/neutron/agent/linux/ra.py -@@ -82,9 +82,15 @@ def _generate_radvd_conf(router_id, router_ports, dev_name_helper): - - def _spawn_radvd(router_id, radvd_conf, router_ns, root_helper): - def callback(pid_file): -+ # we need to use -m syslog and f.e. not -m stderr (the default) -+ # or -m stderr_syslog so that radvd 2.0+ will close stderr and -+ # exit after daemonization; otherwise, the current thread will -+ # be locked waiting for result from radvd that won't ever come -+ # until the process dies - radvd_cmd = ['radvd', - '-C', '%s' % radvd_conf, -- '-p', '%s' % pid_file] -+ '-p', '%s' % pid_file, -+ '-m', 'syslog'] - return radvd_cmd - - radvd = external_process.ProcessManager(cfg.CONF, -diff --git a/neutron/tests/unit/test_l3_agent.py b/neutron/tests/unit/test_l3_agent.py -index 6fda182..f5b2ca4 100644 ---- a/neutron/tests/unit/test_l3_agent.py -+++ b/neutron/tests/unit/test_l3_agent.py -@@ -27,6 +27,7 @@ from neutron.agent.common import config as agent_config - from neutron.agent import l3_agent - from neutron.agent import l3_ha_agent - from neutron.agent.linux import interface -+from neutron.agent.linux import ra - from neutron.common import config as base_config - from neutron.common import constants as l3_constants - from neutron.common import exceptions as n_exc -@@ -2350,6 +2351,39 @@ vrrp_instance VR_1 { - self.assertFalse(nat.add_rule.called) - nat.clear_rules_by_tag.assert_called_once_with('floating_ip') - -+ def test_spawn_radvd(self): -+ router = prepare_router_data() -+ ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper, -+ self.conf.use_namespaces, router=router) -+ -+ conffile = '/fake/radvd.conf' -+ pidfile = '/fake/radvd.pid' -+ -+ # we don't want the whole process manager to be mocked to be -+ # able to catch execute() calls -+ self.external_process_p.stop() -+ self.ip_cls_p.stop() -+ -+ get_pid_file_name = ('neutron.agent.linux.external_process.' -+ 'ProcessManager.get_pid_file_name') -+ with mock.patch('neutron.agent.linux.utils.execute') as execute: -+ with mock.patch(get_pid_file_name) as get_pid: -+ get_pid.return_value = pidfile -+ ra._spawn_radvd(router['id'], -+ conffile, -+ ri.ns_name, -+ self.conf.root_helper) -+ cmd = execute.call_args[0][0] -+ -+ self.assertIn('radvd', cmd) -+ -+ _join = lambda *args: ' '.join(args) -+ -+ cmd = _join(*cmd) -+ self.assertIn(_join('-C', conffile), cmd) -+ self.assertIn(_join('-p', pidfile), cmd) -+ self.assertIn(_join('-m', 'syslog'), cmd) -+ - - class TestL3AgentEventHandler(base.BaseTestCase): - --- -2.0.5 - diff --git a/sys-cluster/neutron/neutron-2014.2.1-r1.ebuild b/sys-cluster/neutron/neutron-2014.2.2.ebuild similarity index 74% rename from sys-cluster/neutron/neutron-2014.2.1-r1.ebuild rename to sys-cluster/neutron/neutron-2014.2.2.ebuild index c54efd98b2da..4dd83f677216 100644 --- a/sys-cluster/neutron/neutron-2014.2.1-r1.ebuild +++ b/sys-cluster/neutron/neutron-2014.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.1-r1.ebuild,v 1.1 2015/01/13 03:59:07 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.2.ebuild,v 1.1 2015/02/08 02:31:21 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -17,29 +17,32 @@ KEYWORDS="~amd64 ~x86" IUSE="dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres" REQUIRED_USE="|| ( mysql postgres sqlite )" -#the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.8[${PYTHON_USEDEP}] - =dev-python/hacking-0.9.2[${PYTHON_USEDEP}] - =dev-python/cliff-1.7.0[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] - >=dev-python/mock-1.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - dev-python/ordereddict[${PYTHON_USEDEP}] - >=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - =dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/webtest-2.0[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] )" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/pbr-0.8[${PYTHON_USEDEP}] + =dev-python/hacking-0.9.2[${PYTHON_USEDEP}] + =dev-python/cliff-1.7.0[${PYTHON_USEDEP}] + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] + >=dev-python/mock-1.0[${PYTHON_USEDEP}] + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] + dev-python/ordereddict[${PYTHON_USEDEP}] + >=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] + =dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] + !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] + >=dev-python/webtest-2.0[${PYTHON_USEDEP}] + dev-python/configobj[${PYTHON_USEDEP}] + )" RDEPEND=" dev-python/paste[${PYTHON_USEDEP}] @@ -49,6 +52,7 @@ RDEPEND=" >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] >=dev-python/Babel-1.3[${PYTHON_USEDEP}] >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}] + =dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] >=dev-python/requests-1.2.1[${PYTHON_USEDEP}] @@ -61,42 +65,18 @@ RDEPEND=" >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}] sqlite? ( - || ( - ( - >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] - ) - ) + >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] ) mysql? ( dev-python/mysql-python - || ( - ( - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - ) + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] ) postgres? ( dev-python/psycopg:2 - || ( - ( - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - ) + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] ) >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}] @@ -105,8 +85,10 @@ RDEPEND=" >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}] >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}] + =dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}] !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}] + =dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}] >=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}] dev-python/pyudev[${PYTHON_USEDEP}] @@ -116,7 +98,6 @@ RDEPEND=" dhcp? ( net-dns/dnsmasq[dhcp-tools] )" PATCHES=( - "${FILESDIR}/CVE-2014-8153-juno.patch" ) pkg_setup() { diff --git a/sys-cluster/neutron/neutron-2014.2.9999.ebuild b/sys-cluster/neutron/neutron-2014.2.9999.ebuild index e386460fff4e..0d02aad09be9 100644 --- a/sys-cluster/neutron/neutron-2014.2.9999.ebuild +++ b/sys-cluster/neutron/neutron-2014.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.9999.ebuild,v 1.7 2015/02/01 05:54:46 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2014.2.9999.ebuild,v 1.8 2015/02/08 02:31:21 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -18,29 +18,32 @@ KEYWORDS="" IUSE="dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres" REQUIRED_USE="|| ( mysql postgres sqlite )" -#the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.8[${PYTHON_USEDEP}] - =dev-python/hacking-0.9.2[${PYTHON_USEDEP}] - =dev-python/cliff-1.7.0[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] - >=dev-python/mock-1.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - dev-python/ordereddict[${PYTHON_USEDEP}] - >=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - =dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/webtest-2.0[${PYTHON_USEDEP}] - )" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/pbr-0.8[${PYTHON_USEDEP}] + =dev-python/hacking-0.9.2[${PYTHON_USEDEP}] + =dev-python/cliff-1.7.0[${PYTHON_USEDEP}] + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] + >=dev-python/mock-1.0[${PYTHON_USEDEP}] + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] + dev-python/ordereddict[${PYTHON_USEDEP}] + >=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] + =dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] + !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] + >=dev-python/webtest-2.0[${PYTHON_USEDEP}] + dev-python/configobj[${PYTHON_USEDEP}] + )" RDEPEND=" dev-python/paste[${PYTHON_USEDEP}] @@ -89,7 +92,6 @@ RDEPEND=" =dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}] >=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}] - app-admin/sudo dev-python/pyudev[${PYTHON_USEDEP}] sys-apps/iproute2 net-firewall/ipset diff --git a/sys-cluster/neutron/neutron-9999.ebuild b/sys-cluster/neutron/neutron-9999.ebuild deleted file mode 100644 index 34c855963982..000000000000 --- a/sys-cluster/neutron/neutron-9999.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.15 2015/01/13 03:59:07 prometheanfire Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 git-2 linux-info user - -DESCRIPTION="A virtual network service for Openstack" -HOMEPAGE="https://launchpad.net/neutron" -EGIT_REPO_URI="https://github.com/openstack/neutron.git" -EGIT_BRANCH="master" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres" -REQUIRED_USE="|| ( mysql postgres sqlite )" - -#the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.8[${PYTHON_USEDEP}] - =dev-python/hacking-0.9.2[${PYTHON_USEDEP}] - =dev-python/cliff-1.7.0[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] - >=dev-python/mock-1.0[${PYTHON_USEDEP}] - >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - dev-python/ordereddict[${PYTHON_USEDEP}] - >=dev-python/requests-mock-0.4.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - =dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] - >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] - !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/webtest-2.0[${PYTHON_USEDEP}] - dev-python/configobj[${PYTHON_USEDEP}] )" - -RDEPEND=" - dev-python/paste[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] - !~dev-python/routes-2.0[${PYTHON_USEDEP}] - >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] - >=dev-python/Babel-1.3[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] - >=dev-python/requests-1.2.1[${PYTHON_USEDEP}] - !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] - dev-python/jsonrpclib[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] - <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}] - sqlite? ( - || ( - ( - >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] - ) - ) - ) - mysql? ( - dev-python/mysql-python - || ( - ( - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - ) - ) - postgres? ( - dev-python/psycopg:2 - || ( - ( - >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] - ) - ( - >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] - <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] - ) - ) - ) - >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}] - >=dev-python/alembic-0.6.4[${PYTHON_USEDEP}] - >=dev-python/six-1.7.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}] - !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}] - dev-python/pyudev[${PYTHON_USEDEP}] - sys-apps/iproute2 - net-firewall/ipset - openvswitch? ( net-misc/openvswitch ) - dhcp? ( net-dns/dnsmasq[dhcp-tools] )" - -PATCHES=( -) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="8021Q IP6TABLE_FILTER IP6_TABLES IPT_REJECT \ - IPTABLE_MANGLE IPT_MASQUERADE IPTABLE_NAT NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \ - NF_NAT_IPV4 NF_NAT NF_CONNTRACK IPTABLE_FILTER IP_TABLES X_TABLES" - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" - done - fi - enewgroup neutron - enewuser neutron -1 -1 /var/lib/neutron neutron -} - -pkg_config() { - fperms 0700 /var/log/neutron - fowners neutron:neutron /var/log neutron -} - -src_prepare() { - #it's /bin/ip not /sbin/ip - sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* - distutils-r1_src_prepare -} - -python_compile_all() { - use doc && make -C doc html -} - -python_test() { - # https://bugs.launchpad.net/neutron/+bug/1234857 - # https://bugs.launchpad.net/swift/+bug/1249727 - # https://bugs.launchpad.net/neutron/+bug/1251657 - # turn multiprocessing off, testr will use it --parallel - local DISTUTILS_NO_PARALLEL_BUILD=1 - # Move tests out that attempt net connection, have failures - mv $(find . -name test_ovs_tunnel.py) . || die - sed -e 's:test_app_using_ipv6_and_ssl:_&:' \ - -e 's:test_start_random_port_with_ipv6:_&:' \ - -i neutron/tests/unit/test_wsgi.py || die - testr init - testr run --parallel || die "failed testsuite under python2.7" -} - -python_install() { - distutils-r1_python_install - if use server; then - newinitd "${FILESDIR}/neutron.initd" "neutron-server" - newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" - dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini - fi - if use dhcp; then - newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" - newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" - fi - if use l3; then - newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" - newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" - fi - if use metadata; then - newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" - newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" - fi - if use openvswitch; then - newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" - newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" - fi - if use linuxbridge; then - newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" - newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" - fi - diropts -m 755 -o neutron -g neutron - dodir /var/log/neutron /var/lib/neutron - keepdir /etc/neutron - insinto /etc/neutron - insopts -m 0640 -o neutron -g neutron - - doins etc/* - # stupid renames - rm "${D}etc/neutron/quantum" - insinto /etc/neutron - doins -r "etc/neutron/plugins" - insopts -m 0640 -o root -g root - doins "etc/rootwrap.conf" - doins -r "etc/neutron/rootwrap.d" - - insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/" - doins -r "neutron/db/migration/alembic_migrations/versions" - - #add sudoers definitions for user neutron - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/neutron.sudoersd" neutron - - #remove superfluous stuff - rm -R "${D}/usr/etc/" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - distutils-r1_python_install_all -} -- 2.26.2