From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46373138359 for ; Sat, 19 Sep 2020 11:28:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B584CE0814; Sat, 19 Sep 2020 11:28:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8894CE0814 for ; Sat, 19 Sep 2020 11:28:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E56373410BF for ; Sat, 19 Sep 2020 11:28:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA2BA386 for ; Sat, 19 Sep 2020 11:28:20 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1600514891.2841293e77e83cf467a8fde86ab47b1795c31d81.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/omniORB/files/, net-misc/omniORB/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/omniORB/Manifest net-misc/omniORB/files/ldflags.patch net-misc/omniORB/files/omniORB-4.1.4-format-security.patch net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch net-misc/omniORB/omniORB-4.1.4-r2.ebuild X-VCS-Directories: net-misc/omniORB/files/ net-misc/omniORB/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2841293e77e83cf467a8fde86ab47b1795c31d81 X-VCS-Branch: master Date: Sat, 19 Sep 2020 11:28:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b8181894-2a11-4e61-84b1-5da2474afb5f X-Archives-Hash: 689c37b16db9d24e35068cbd93ea023e commit: 2841293e77e83cf467a8fde86ab47b1795c31d81 Author: Michał Górny gentoo org> AuthorDate: Sat Sep 19 11:22:30 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Sep 19 11:28:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2841293e net-misc/omniORB: Remove old Signed-off-by: Michał Górny gentoo.org> net-misc/omniORB/Manifest | 1 - net-misc/omniORB/files/ldflags.patch | 11 --- .../files/omniORB-4.1.4-format-security.patch | 16 ---- .../omniORB/files/omniORB-4.1.4-openssl-1.patch | 31 -------- net-misc/omniORB/omniORB-4.1.4-r2.ebuild | 92 ---------------------- 5 files changed, 151 deletions(-) diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest index 1dc9821c065..ffb88261a7f 100644 --- a/net-misc/omniORB/Manifest +++ b/net-misc/omniORB/Manifest @@ -1,2 +1 @@ -DIST omniORB-4.1.4.tar.gz 3093814 BLAKE2B 6f85ff31f55533eac779554a165346fa693c41e261650f22c5d1889de731a5ca3b09d178945dee89b80553a81e7a9db3286efd465b4aafcb7c19e5dc5de5d105 SHA512 0ed989dd9a8c024a575ebbe1def137d11c4e52297727883d26cb1fdc87d2965e6d0152ee4b7b90097f2d97eb22501bb968eff0d070e88f80a9fef6b7439e1a1c DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11943a54c20d53987d9775f04833d5d2dbeb99e5bdcc59d56f116cfb14b9ae92399323e3980a44d9cef47a012c24f SHA512 3fe6c05d0e7f19455c4cd6702887f91b7d14cdc248008cbc456c103072a37251387877bd64d59a271c6e92703a70bbbb9713f9fa2e45d094628e42564cffd0ad diff --git a/net-misc/omniORB/files/ldflags.patch b/net-misc/omniORB/files/ldflags.patch deleted file mode 100644 index 471df27ae7f..00000000000 --- a/net-misc/omniORB/files/ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mk/beforeauto.mk.in.orig 2010-04-24 21:13:17.000000000 +0200 -+++ mk/beforeauto.mk.in 2010-04-24 21:14:24.000000000 +0200 -@@ -541,7 +541,7 @@ - SharedLibraryLibNameTemplate = lib$$1$$2.$(SHAREDLIB_SUFFIX) - SharedLibraryImplibNameTemplate = lib$$1$$2.a - --SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname -+SharedLibraryPlatformLinkFlagsTemplate = -shared -Wl,-soname,$$soname @LDFLAGS@ - - define SharedLibraryFullName - fn() { \ 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 deleted file mode 100644 index 2af8d21d308..00000000000 --- a/net-misc/omniORB/files/omniORB-4.1.4-format-security.patch +++ /dev/null @@ -1,16 +0,0 @@ - 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/files/omniORB-4.1.4-openssl-1.patch b/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch deleted file mode 100644 index 968013a2578..00000000000 --- a/net-misc/omniORB/files/omniORB-4.1.4-openssl-1.patch +++ /dev/null @@ -1,31 +0,0 @@ -http://bugs.gentoo.org/326791 - ---- include/omniORB4/sslContext.h -+++ include/omniORB4/sslContext.h -@@ -111,7 +111,11 @@ - virtual ~sslContext(); - - protected: -- virtual SSL_METHOD* set_method(); -+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ virtual const SSL_METHOD* set_method(); -+ #else -+ virtual SSL_METHOD* set_method(); -+ #endif - // Default to return SSLv23_method(). - - virtual void set_supported_versions(); ---- src/lib/omniORB/orbcore/ssl/sslContext.cc -+++ src/lib/omniORB/orbcore/ssl/sslContext.cc -@@ -197,7 +197,11 @@ - } - - ///////////////////////////////////////////////////////////////////////// -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+const SSL_METHOD* -+#else - SSL_METHOD* -+#endif - sslContext::set_method() { - return SSLv23_method(); - } diff --git a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild b/net-misc/omniORB/omniORB-4.1.4-r2.ebuild deleted file mode 100644 index 183a5713a85..00000000000 --- a/net-misc/omniORB/omniORB-4.1.4-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - 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." -}