Bump EAPI and python support; fix for format-security, bug #520590

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/net-misc/omniORB/ChangeLog b/net-misc/omniORB/ChangeLog
index 33cb8b2510bd0894785b3074020f51fca98f9861..d48d0e18a1becc563602b820c51cbb97cbf5db81 100644 (file)
--- a/net-misc/omniORB/ChangeLog
+++ b/net-misc/omniORB/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/omniORB
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.71 2012/02/05 01:53:54 floppym Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/ChangeLog,v 1.72 2015/04/08 09:25:31 jlec Exp $
+
+*omniORB-4.1.4-r2 (08 Apr 2015)
+
+  08 Apr 2015; Justin Lecher <jlec@gentoo.org>
+  +files/omniORB-4.1.4-format-security.patch, +omniORB-4.1.4-r2.ebuild,
+  metadata.xml, omniORB-4.1.4-r1.ebuild:
+  Bump EAPI and python support; fix for format-security, bug #520590
 
   05 Feb 2012; Mike Gilbert <floppym@gentoo.org> omniORB-4.1.4-r1.ebuild:
   Inherit multilib.
@@ -301,4 +308,3 @@
 
   09 Jul 2002; phoen][x <phoenix@gentoo.org> omniORB-304.ebuild :
   Added KEYWORDS, LICENSE, SLOT.
-

diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 6ba9a142a5eabf0acfb60074d2499f71d52ee743..82f3cea14e1ce0f0a47d1cc88f4585f5e40c3c5e 100644 (file)
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -1,17 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX ldflags.patch 452 RMD160 b6ae2124dbb412a61e31cc82048065ccec058258 SHA1 b7b08ab39eb90ba52d517a3d8d6ec9ebd9dd5382 SHA256 d02d4ba72a5995b07a4189e28deaba25c3733e8639b682d5cee4b36180fc9bee
-AUX omniNames 677 RMD160 7c75795fa9b4808069060728a0404d6ed1138f78 SHA1 7e5f343aaac339cd84eccb70c17b06b86604d436 SHA256 8ea4e77213e91d62dd5d46eaa883f4e235d0cc6778511c3b5ccd006703ee95ed
-AUX omniORB-4.1.4-openssl-1.patch 770 RMD160 f4842ad2b8fc3ed597fee0386f6f783fb8a00ecf SHA1 59c3fc20f08e6aa9e5db1b034a90e9fa897c2676 SHA256 0a27f1476347939ba24fce9d0f2e02461644187a8b72ff727d96b3f9a817f623
-DIST omniORB-4.1.4.tar.gz 3093814 RMD160 b84131230c59b1cef8f714ff1545e44f6779ade1 SHA1 7150d999bcef10c6c3cb24725386497c3f338aa1 SHA256 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e
-EBUILD omniORB-4.1.4-r1.ebuild 2459 RMD160 10ab2ab07697fb745d031234f52398a974c30da1 SHA1 63a2413f0f72d2f247de7df37e8c8d52fda3339d SHA256 e86386c3a5dc059839871f1be9e764b4619fd5d6e2da6b9dfaf05179515254f7
-MISC ChangeLog 11023 RMD160 0ce9a96d44882cd00ff0e854d612a87f3f93dbc0 SHA1 a247a614820efbb4c055df0c8e8f4b5c13d4b939 SHA256 3f74bdd80523559f97e3b6a75719b18e2ca2d83a26c11d12b6741f4274bbd4fa
-MISC metadata.xml 203 RMD160 f1239d4fd7323335445148f0b8568879bc5a904a SHA1 64d083561bc57c3831361cb546112b15f9333054 SHA256 096bfd654c728809e734e638166b7a1579df97a6f4589ca23a4654e56be96f9b
+AUX ldflags.patch 452 SHA256 d02d4ba72a5995b07a4189e28deaba25c3733e8639b682d5cee4b36180fc9bee SHA512 472d66b3071de94d4753773092c4781f5b4419041dc23b777bc13e8e4f4a1a40f245931479fc294c43a9e73f322e93b2055fb52a1070423d58dd32f23b0f61ca WHIRLPOOL ab8e25bab496c7c4e5408135500e1cae0366ed0a2698310040071ea27c94020df77b92e21907ea5637b6716093f6108eed594e36dc36bc6d71a99d1b7557a21a
+AUX omniNames 677 SHA256 8ea4e77213e91d62dd5d46eaa883f4e235d0cc6778511c3b5ccd006703ee95ed SHA512 54dc713333fddc85b6d05260932db72cd47b4bb932390fe8f8e3179de35fcd3f0c6c6115f6e2f0be567aa2f7a65eacf57f7afa0bf28e87030dd07b486ed2068d WHIRLPOOL 51264f264e1081929aaae6ba61fd0998e13aa5557399f4a50980931ceecadf25ff730ab9211c35801a2c1fa4fa2994dad5021ded6680261a7b65b351fbeba94a
+AUX omniORB-4.1.4-format-security.patch 557 SHA256 a3169304c555b99591c576e745ad5b4717afaf20e02643fef0336578048e000b SHA512 f2d9ca53f9dcdac7fc0224e435ee7d4eecaf5c948d406f94e81a9ae7770d192b18e846ddd245c5b74e77efb7030902b9f2817b13349f2a685caadb05633e14ee WHIRLPOOL ae7232efd23340f47d12de69ebc4249e5b7b61d7cbc6e248e6dce327b6e524393eeb7a6577d4ccada85a6e5c06ff44ff2991bb5b55c59198ead80e6876d0c670
+AUX omniORB-4.1.4-openssl-1.patch 770 SHA256 0a27f1476347939ba24fce9d0f2e02461644187a8b72ff727d96b3f9a817f623 SHA512 b43adc69ec30a3a1cf6581e050ca93927b267c67623aafdb53db0135a8d4164c779a9d54249c8672e5d8f1c761681092be3c2908cb772820d019db1e2b1ba396 WHIRLPOOL 21d0a2bbe5c8b9ac2aea24e201e7d3090211f45880d5696c61aefe8ccffb68bf2dd168cfbe0c67c7a310ab8a24b3202e112003b2bdd35bba070f2d90b8939e21
+DIST omniORB-4.1.4.tar.gz 3093814 SHA256 84fb9790c25d6e46248c9773747e393b429573190da2150850d4a49debda4e8e SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c WHIRLPOOL 16b12ade124e62b57d8401c73975a4a0861166f080b0f735e7ad363dca1a7387d807e5c8bf4ae9b90b70f41a03e9811109bcb917e78b833578e891b78c9da55f
+EBUILD omniORB-4.1.4-r1.ebuild 2472 SHA256 93652217e5cd018326cbfc9d55ba187458169b39d8f61d95713ebb6e1ba83601 SHA512 693442495b84d646eae2651e6385fd602d438a58355c1869c93b98c136b88cd3d6c856439c197c9f913d770a21c613b5569beece98b72cae7da3b2fa128c8d25 WHIRLPOOL 357fc43e695236a0f4aa0e99cf6e12be6d7daf1c5fd779ad0b42b69a19a27f3e096fe20f4c2c732cb63c974a106e0c94a117fdfbcc3f85263b09cc3462180cdc
+EBUILD omniORB-4.1.4-r2.ebuild 2247 SHA256 5ef8e2d54535110f5fbf7648fd3902e2482fa622a2c6417dfb5d25b4d731d935 SHA512 be8421817741277cbcfe6107a914492123745454573787d454224eff4bd673998fde636700db739c344153a69c613aa84d049d5f2335157611314a2703718b70 WHIRLPOOL e51839315e30a52a97162be8b9e994f5e4ccb7a917d30a800d4e6fb69f571ffeb95d45272119a83267206cb50f55789fe4d4d289d9d2e41c2dabfd98188de5e1
+MISC ChangeLog 11282 SHA256 5e5d7ce93563c0bda646d45d1002ecd1d519108f053c9507d47c1fa841a80b53 SHA512 553e19d7b7c16672856220b880beeff95188306e17ac700f82befce89b85f6c3feb95f8533526db146da62b1a03e1fe1b175905bd69294edc6811a241469e39e WHIRLPOOL 2beded2797c774eadc457484871e369bd71e705655a1fd96b4574415d3410c50c30d9cf165a82c1bbf2fa0934aff7587db4c8fba5ac7705c8375330646c31dc7
+MISC metadata.xml 207 SHA256 18888d950e65829e52ee5b469eeff81ee620812b80b8d2850ae87c776e59241a SHA512 db557ebf2598d640d7c211ae896d8a9d337e1a8f440118df9c5593cd405309faef24b0017dc9969c0c28eb047f237bacf57f59bbea008230aaf97ce7a9cadd00 WHIRLPOOL 60ac4459f2a5e88b41e326eaf17503ee5089992be6d648dc503ff52b6543f5778b1b06fd177a9e5bf907b98ab0499f549f64b05a536ecb3252c257645fda1fba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAk8t4TgACgkQC77qH+pIQ6Qq1AEAiMnTgPyu99BmDAx2SpCcwb5P
-sonhGZtiU8tGCFlDL3IBALQG2iFJRwYTxoSjQ0MbWQzBuRTE8iJFbn4XmdQBZ6zS
-=GP90
+iQJ8BAEBCgBmBQJVJPQMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/ZEQAJZYbRmoeQh3NMeg17TEkvkJ
+Ow8N3Ni/aqXwZ+Y7IsQdMrsKJS5F3/a2I7AWmE/XFv/cTc3+cfyE0ssQMKfrVU+6
+s6iRnw+7uNB6qDPzEk6GP0GJcABR+gL5Mm2r9CjPQ5zW8akcgar109OQ1ox4zKGP
+ndNy+P3L8GThLJbab9QtGM2Qg5okqK89ZaijWbpkyHGudCLGfOff6TFbrf7C1nSv
+0fn3JJOCW60KQwvke6bqeu5GQ4auQPLa2iiYx7jUS/KrlyoQ8ABfencLwJDIZCfa
+fYfWhuf+ZLNsW4rZPw1W18a8T19U3IoG8VtfrYMIQti0MZwhiznBgQnZaiNK1giM
+JruTk9RqEWTbyKhDtwrbv4p3OQdlpRaEDNZgIdW7EULdt8zgFy+lG6KGRl2V9j93
+xyiVklWy8g4WhdsknEXa9tw9+Q4ST+3EnOKF4eFaiVCtTE4fegBzvwRogJWKf+Nl
+0x7MZhkid1NZPjWjew7BlmZlhlkIp6E0GUIBm9SGdkF2lEQPDNzXt6CC9jcXr5gD
+LUplUYkp0USAzDXkwz5vkO/hyAe5PHO/KxxRq9cFlZAaJIZ2H/6miHy4vNFHT/M+
+LBAD3vL4m92hneSxVe6bAf4+FbFesyH0i8wGJgw3UwElwil/ro+iExOtPSidbgHJ
+2CRV5ZCT9+cMtOrKMbwY
+=MZQt
 -----END PGP SIGNATURE-----

diff --git a/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch b/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch
new file mode 100644 (file)
index 0000000..2af8d21
--- /dev/null
+++ b/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch
@@ -0,0 +1,16 @@
+ src/tool/omniidl/cxx/cccp/cccp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tool/omniidl/cxx/cccp/cccp.c b/src/tool/omniidl/cxx/cccp/cccp.c
+index 0198b1a..64d80ae 100644
+--- a/src/tool/omniidl/cxx/cccp/cccp.c
++++ b/src/tool/omniidl/cxx/cccp/cccp.c
+@@ -8034,7 +8034,7 @@ macroexpand (hp, op)
+       else
+       parse_error = macarg (NULL_PTR, 0);
+       if (parse_error) {
+-      error_with_line (line_for_error (start_line), parse_error);
++      error_with_line (line_for_error (start_line), "%s", parse_error);
+       break;
+       }
+       i++;

diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml
index e5cab04cd7829ae941e3b56be83e591369158034..f2e06f38585b86f252716a1fcbf9ce9afcfe4378 100644 (file)
--- a/net-misc/omniORB/metadata.xml
+++ b/net-misc/omniORB/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <maintainer>
-               <email>caster@gentoo.org</email>
-       </maintainer>
+  <maintainer>
+    <email>caster@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>

diff --git a/net-misc/omniORB/omniORB-4.1.4-r1.ebuild b/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
index 72cc101468f21d44b6864c24029f761ecb27ad49..5bd786ec292e0f36fa6a4f1a8d82409ad9a91c1b 100644 (file)
--- a/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
+++ b/net-misc/omniORB/omniORB-4.1.4-r1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild,v 1.7 2012/02/05 01:53:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r1.ebuild,v 1.8 2015/04/08 09:25:31 jlec Exp $
 
 EAPI="3"
 
 # 2.5 is problematic due to bug #261330
-PYTHON_DEPEND="2:2.6"
+PYTHON_DEPEND="2:2.7"
 
 inherit python eutils multilib
 
 DESCRIPTION="A robust, high-performance CORBA 2 ORB"
-SRC_URI="mirror://sourceforge/omniorb/${P}.tar.gz"
 HOMEPAGE="http://omniorb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/omniorb/${P}.tar.gz"
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE="doc ssl"
 
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )"
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b:0 )"
 DEPEND="${RDEPEND}"
 
 pkg_setup() {
@@ -48,12 +48,12 @@ src_configure() {
 }
 
 src_compile() {
-       cd build
+       cd build || die
        emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}" || die "emake failed"
 }
 
 src_install() {
-       cd build
+       cd build || die
        emake DESTDIR="${D}" install || die "emake install failed"
        # this looks redundant
        rm "${D}/usr/bin/omniidlrun.py" || die

diff --git a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild b/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
new file mode 100644 (file)
index 0000000..35cfa21
--- /dev/null
+++ b/net-misc/omniORB/omniORB-4.1.4-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/omniORB-4.1.4-r2.ebuild,v 1.1 2015/04/08 09:25:31 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1
+
+DESCRIPTION="A robust, high-performance CORBA 2 ORB"
+HOMEPAGE="http://omniorb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/omniorb/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ssl static-libs"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b:0= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+       # respect ldflags, bug #284191
+       epatch \
+               "${FILESDIR}"/ldflags.patch \
+               "${FILESDIR}"/${P}-openssl-1.patch \
+               "${FILESDIR}"/${P}-format-security.patch
+
+       sed \
+               -e 's/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = $(OPTCXXFLAGS)/' \
+               -e 's/^CDEBUGFLAGS.*/CDEBUGFLAGS = $(OPTCFLAGS)/' \
+               -i mk/beforeauto.mk.in mk/platforms/i586_linux_2.0*.mk || \
+               die "sed failed"
+}
+
+src_configure() {
+       mkdir build && cd build || die
+
+       local MY_CONF="--prefix=/usr --with-omniORB-config=/etc/omniorb/omniORB.cfg \
+               --with-omniNames-logdir=/var/log/omniORB --libdir=/usr/$(get_libdir)"
+
+       use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
+
+       ECONF_SOURCE=".." econf ${MY_CONF} $(use_enable static-libs static)
+}
+
+src_compile() {
+       cd build || die
+       emake OPTCFLAGS="${CFLAGS}" OPTCXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+       cd build || die
+       default
+       # this looks redundant
+       rm "${ED}/usr/bin/omniidlrun.py" || die
+
+       cd "${S}" || die
+
+       if use doc; then
+               dohtml doc/*.html
+               dohtml -r doc/omniORB
+               docinto print
+               dodoc doc/*.pdf
+       fi
+
+       cat <<- EOF > "${T}/90omniORB"
+               PATH="/usr/share/omniORB/bin/scripts"
+               OMNIORB_CONFIG="/etc/omniorb/omniORB.cfg"
+       EOF
+       doenvd "${T}/90omniORB"
+       doinitd "${FILESDIR}"/omniNames
+
+       cp "sample.cfg" "${T}/omniORB.cfg" || die
+       cat <<- EOF >> "${T}/omniORB.cfg"
+               # resolve the omniNames running on localhost
+               InitRef = NameService=corbaname::localhost
+       EOF
+       insinto /etc/omniorb
+       doins "${T}"/omniORB.cfg
+
+       keepdir /var/log/omniORB
+
+       python_optimize
+       python_fix_shebang "${ED}"/usr/bin/omniidl
+}
+
+pkg_postinst() {
+       elog "Since 4.1.2, the omniORB init script has been renamed to omniNames for clarity."
+}