From 589a4b4c4f6bdf7fdef130cc79102d2a5d00f2f9 Mon Sep 17 00:00:00 2001 From: Alexys Jacob Date: Wed, 12 Nov 2014 10:22:42 +0000 Subject: [PATCH] revision bump fix #526114 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB658FA13 --- dev-db/mongodb/ChangeLog | 9 ++++++++- dev-db/mongodb/Manifest | 12 ++++++------ ...mongodb-2.6.4.ebuild => mongodb-2.6.4-r1.ebuild} | 7 +++++-- ...mongodb-2.6.5.ebuild => mongodb-2.6.5-r1.ebuild} | 13 ++++++++++--- 4 files changed, 29 insertions(+), 12 deletions(-) rename dev-db/mongodb/{mongodb-2.6.4.ebuild => mongodb-2.6.4-r1.ebuild} (93%) rename dev-db/mongodb/{mongodb-2.6.5.ebuild => mongodb-2.6.5-r1.ebuild} (91%) diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog index 47e2721f4ae1..5f23900519d9 100644 --- a/dev-db/mongodb/ChangeLog +++ b/dev-db/mongodb/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mongodb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.100 2014/10/17 11:57:29 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.101 2014/11/12 10:22:35 ultrabug Exp $ + +*mongodb-2.6.5-r1 (12 Nov 2014) +*mongodb-2.6.4-r1 (12 Nov 2014) + + 12 Nov 2014; Ultrabug -mongodb-2.6.4.ebuild, + +mongodb-2.6.4-r1.ebuild, -mongodb-2.6.5.ebuild, +mongodb-2.6.5-r1.ebuild: + add PaX marking on 2.6 ebuilds wrt #526114 *mongodb-2.4.12 (17 Oct 2014) diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 966b30cb9c7b..685235992fea 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -36,14 +36,14 @@ DIST mongodb-src-r2.6.5.tar.gz 14513441 SHA256 55d6cb624fe83935564a5e9cd38f2f94b EBUILD mongodb-2.4.11.ebuild 3878 SHA256 587f12a32e986d06644aa48faca03954994ba88eb44f75b3d6a4d0dce0ddc555 SHA512 2f438b41f5853e3fbeb151d509e6dbe5c1c1b0f1d6b4d71df73bfceef88c3bf0e14000a00f57d576e8bf73d118da346984dcaa963dc544ba0b97768f42de3655 WHIRLPOOL 328583765dfc73fec3f6dbce67b4dbd652d6cb976aebf1b8a0b0b1c24b04cd60c2b933f2db5476db7a91667d61a8cb825796d257e89fa3114e1736f9c8befb1e EBUILD mongodb-2.4.12.ebuild 3878 SHA256 b91ad26c9eaef2c89009f9ca2974df1d5481b37d6cf9241e84b51e8cbd458be6 SHA512 56691ceb4aa5642a6c4c2f9095cc02ca1925e7d26b09650422587680878743a5e47094cde98468eadadc574619512286283a3d1dbdc7d846b91fd96a0b12e2c8 WHIRLPOOL 69506e21eeab662204fe45fa2a3d6f8e86fa6cad6fc47685fcc32054b6a075c4b0740fa1f52786a5d39771d9ba72cace4f013d9a1fd0ebf1a291e103525b0419 EBUILD mongodb-2.4.6-r2.ebuild 3733 SHA256 b7cdc682f6ae451dc252827a05a8b0a69ae1c78b48520512d698a61faf034c59 SHA512 07c32f6dfef084956ba6592555b13e53188718eecf55ba929e0ec5d4fd36e5d844e6cea30e1467b58d5318f668d86128a2e06019032e4f767b4cab7d535fe98c WHIRLPOOL 1a15f756fbb9a4d76e3d88e5f3a54876f93d8a963fcea4413adc25f1ff795e8c27892ee68865bdb9b747f91354a926cc609088630ab0a71c6ef67b600f0b4f14 -EBUILD mongodb-2.6.4.ebuild 4426 SHA256 dcc6d8735f4b60815d0de427ff214d4622bbd029aca4cc28f676861de9a7371d SHA512 a8ceadc5d7c62193f66dc6c9ec1e4294c55f37049003537a29fea41211566de052586204e5e54608c91d5533280f5a291d667f10bc7f10db70fa45fddec564a4 WHIRLPOOL 6fa6f2a0216a06851d7500f883f937d65ecdefb944201a820244691c762621023a4811dab5ce53094ac48c0ac66285e7eac7bd3bf02ce220111a0e1201223871 -EBUILD mongodb-2.6.5.ebuild 4426 SHA256 8268b5b209388e6a7f92e037eaeaf3e927aa35b5ff5f5103de632e342dd3b525 SHA512 85584f692009d6263a88668c77834b737f95abf69bd74aea907aee2002cd578ce90ef4b3e57d4ffdadcbff7c1b8ce4fe514e0c2832ee9988e5736ef89c242bc9 WHIRLPOOL c05fdb11c3bfb44ad52906cb1df57e592eb2976189548935170a22f3b387c54da31b10d54832bc49219ee5a6c78a5bad1b6790e3e2d5f11024a3f3e7677e29e6 -MISC ChangeLog 21680 SHA256 84bf0b7cc25a6969ea28e1d694750110d846bf39418ede13f817eade8204f51d SHA512 a53d50843bc07651720e0cf3d9a9fabc381e95703ff8a036b8843cc130623379066868053055f227c73365fdf6681a1adb511f447a7b0a1f3ecd5706aa4399ab WHIRLPOOL 6dc6e49e88cea0215479e1d256ba60fb7aad2276ee6f9884e6763235e5919bcb26b8a8a64bf93ce81e103cd5dad8118536956d12dfec5ed1d0e32407e3180025 +EBUILD mongodb-2.6.4-r1.ebuild 4511 SHA256 6612fc9c704d76e7fac3c8133152417db869526d19aa6dffd7d73492e5e21bdd SHA512 e2b5819e42ac2be5b671bf94d763a255310b7c176dc269ee148f01745859638c480767bde53c72c3f99f32e00e52a85dd4aee7065dbb17da014be4068766d822 WHIRLPOOL 2bad8378baef514c53b5b7e18f99e5cdf65e7130b8fb76c9f4aaed669cd4d62c304f4b32fdf8f24e6cb635b26defd48af81896925b533dd5f107a2dd0d2e14ad +EBUILD mongodb-2.6.5-r1.ebuild 4568 SHA256 7523d42ecd996313a461d1db93df4a0d00bd3f9aedfff068682fbc737d727115 SHA512 263c81674b96fb7750baf381e29da27947b7125aea6dffdc4472bdc0977cfc0bd1a5e1c5df81fb5bffc4a86c4ce4e76158dbd8122f2ff37aaf0047b5628923dc WHIRLPOOL 7e68f79d4d6f3a08f2f605b4a4ac49a412a8f25c9aabc1b4c4d7445fbbabea1d8277d98f722531544292d03eea94cda76bcbdbb66ad0896914ff224177f7918f +MISC ChangeLog 21937 SHA256 991dea3db3e3ba6e1b0e592c6d3ea37cef9629d39c9dd14ec58c0e69ea3ec569 SHA512 50cf3b9d7049900fdf7d302c36a563c5ca5667f89810f18a15f5ad04a1d0416ba749dbdfe3a0a7b1a83183d72818256ddd6041d7b78b38ed2f073ae679191c1e WHIRLPOOL 6aff615c2fc85c26dba3088291d564a3ca6c91f654eaaf57028e18d1a7a588563dfb587c2fbbd1fd7a9726aa848e5d39a537eb84bd3c8c12fd9f4472cbb5a10f MISC metadata.xml 1090 SHA256 bb0066679f4a7ee9f21238becfdf1cb6e38489c1a9d46e0671d4098455f886ea SHA512 b4e4fec0815ac98c85b437f2155f4620b91fe24e81f559b92901038f68534e07dc91ae77ac609311e9febbe64b8ef0ad5ad164346cdb466e28bf1732ed18048a WHIRLPOOL b5305d0cbc7398d66d9e26b14adeaccfeeee8d0d24fad8bb957517273b97f94b0feb1afc1bdefaa01ea06502c570376e8e7a0ce68dca76c8ae5dbbf686d6458a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRBBC4ACgkQKiQSS7ZY+hN6lwEAuTkk3Kp2DC5fzJcxZ/RVlklq -6wAnQInX/1YpwoxlahsA/i9pH/ZKWdP3o53TwCyd49CmyR5VNsMgbhpiic7EjmUt -=cf7u +iF4EAREIAAYFAlRjNPAACgkQKiQSS7ZY+hP5kAD/d7QWj5Hk/LAy9JVWSo3v8bla +3q0KbsDbh/z7o89/dZ8A/R3hLLCxfLa7HjvzfDLzaNORQTTRpXlNgy72P2hHWnps +=i8tC -----END PGP SIGNATURE----- diff --git a/dev-db/mongodb/mongodb-2.6.4.ebuild b/dev-db/mongodb/mongodb-2.6.4-r1.ebuild similarity index 93% rename from dev-db/mongodb/mongodb-2.6.4.ebuild rename to dev-db/mongodb/mongodb-2.6.4-r1.ebuild index 920f5b04d5ff..3fc046acabb0 100644 --- a/dev-db/mongodb/mongodb-2.6.4.ebuild +++ b/dev-db/mongodb/mongodb-2.6.4-r1.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/dev-db/mongodb/mongodb-2.6.4.ebuild,v 1.1 2014/08/12 05:54:08 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.4-r1.ebuild,v 1.1 2014/11/12 10:22:35 ultrabug Exp $ EAPI=5 SCONS_MIN_VERSION="1.2.0" @@ -8,7 +8,7 @@ CHECKREQS_DISK_BUILD="2400M" CHECKREQS_DISK_USR="512M" CHECKREQS_MEMORY="1024M" -inherit eutils flag-o-matic multilib scons-utils systemd user versionator check-reqs +inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs MY_P=${PN}-src-r${PV/_rc/-rc} @@ -112,6 +112,9 @@ src_install() { insinto /etc/logrotate.d/ newins "${FILESDIR}/${PN}.logrotate" ${PN} + # see bug #526114 + pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} + if use mms-agent; then local MY_PN="mms-agent" local MY_D="/opt/${MY_PN}" diff --git a/dev-db/mongodb/mongodb-2.6.5.ebuild b/dev-db/mongodb/mongodb-2.6.5-r1.ebuild similarity index 91% rename from dev-db/mongodb/mongodb-2.6.5.ebuild rename to dev-db/mongodb/mongodb-2.6.5-r1.ebuild index 48fae75ac3f4..332b9ac4f302 100644 --- a/dev-db/mongodb/mongodb-2.6.5.ebuild +++ b/dev-db/mongodb/mongodb-2.6.5-r1.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/dev-db/mongodb/mongodb-2.6.5.ebuild,v 1.1 2014/10/13 14:32:31 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.5-r1.ebuild,v 1.1 2014/11/12 10:22:35 ultrabug Exp $ EAPI=5 SCONS_MIN_VERSION="1.2.0" @@ -8,7 +8,7 @@ CHECKREQS_DISK_BUILD="2400M" CHECKREQS_DISK_USR="512M" CHECKREQS_MEMORY="1024M" -inherit eutils flag-o-matic multilib scons-utils systemd user versionator check-reqs +inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs MY_P=${PN}-src-r${PV/_rc/-rc} @@ -20,7 +20,7 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz LICENSE="AGPL-3 Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="kerberos mms-agent ssl static-libs" +IUSE="debug kerberos mms-agent ssl static-libs" PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )" RDEPEND=" @@ -53,6 +53,10 @@ pkg_setup() { scons_opts+=" --use-system-yaml" scons_opts+=" --usev8" + if use debug; then + scons_opts+=" --dbg=on" + fi + if use prefix; then scons_opts+=" --cpppath=${EPREFIX}/usr/include" scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)" @@ -112,6 +116,9 @@ src_install() { insinto /etc/logrotate.d/ newins "${FILESDIR}/${PN}.logrotate" ${PN} + # see bug #526114 + pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} + if use mms-agent; then local MY_PN="mms-agent" local MY_D="/opt/${MY_PN}" -- 2.26.2