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 49FAE13835B for ; Sun, 25 Apr 2021 18:06:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E529E086B; Sun, 25 Apr 2021 18:06:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 05C28E086B for ; Sun, 25 Apr 2021 18:06:06 +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 7D1A93412F4 for ; Sun, 25 Apr 2021 18:06:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B799729 for ; Sun, 25 Apr 2021 18:06:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1619373872.bfad81224e37f1881b6e787b6d546497e781a891.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/opendnssec/files/, net-dns/opendnssec/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/opendnssec/Manifest net-dns/opendnssec/files/opendnssec-drop-privileges.patch net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch net-dns/opendnssec/files/opendnssec-fix-run-dir.patch net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild X-VCS-Directories: net-dns/opendnssec/files/ net-dns/opendnssec/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: bfad81224e37f1881b6e787b6d546497e781a891 X-VCS-Branch: master Date: Sun, 25 Apr 2021 18:06:03 +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: 02e8a3c5-3d8d-4b0f-a9d0-6e944693788d X-Archives-Hash: 20087f5089489fe5791dd170cba8cb68 commit: bfad81224e37f1881b6e787b6d546497e781a891 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 18 10:21:29 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 25 18:04:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfad8122 net-dns/opendnssec: Drop 1.4.12-r1 and 2.0.1-r1, EAPI5-- Overshadowed by 2.0.3-r1. Closes: https://bugs.gentoo.org/757156 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> net-dns/opendnssec/Manifest | 2 - .../files/opendnssec-drop-privileges.patch | 28 --- .../files/opendnssec-fix-localstatedir.patch | 32 --- .../opendnssec/files/opendnssec-fix-run-dir.patch | 26 --- net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild | 208 ------------------ net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild | 240 --------------------- 6 files changed, 536 deletions(-) diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest index b771c89f713..b7655458e11 100644 --- a/net-dns/opendnssec/Manifest +++ b/net-dns/opendnssec/Manifest @@ -1,3 +1 @@ -DIST opendnssec-1.4.12.tar.gz 1036392 BLAKE2B 3bfbcfe91d7da7c2e4b1c5439f7d55e15612ab6ace6af25fcb9c9eb7ddb2e1055e70684c2bd6bbae57a0c2eb78098b448f7dca198e0d6f9e2e812945a1f06cc2 SHA512 b72b76ab4aec8cc63cc9c020bef9a24b000fd00172a07cf43d57b3a33041bef9e107b71eb7271bb13c3566510599c6a1913cf986a724e169c42dc8bdac8d2e51 -DIST opendnssec-2.0.1.tar.gz 1101523 BLAKE2B 0446efd04e73e00d204c53164c3c6aaecb9f37014a110ee85d7e7b1728d225aafcf9e6ef31a7dd29cdf2e875e7b653ab6e8178cece65c47a1c5b027facc16130 SHA512 aa12818f92688e087acaff8a6771d2a7da733e04d9e821967d313c7ff880a1056f470b11988eba1e7aad606418c3a4587f654163d74f68e3f61943c74d86d052 DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424 diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges.patch deleted file mode 100644 index c1972bbc3d1..00000000000 --- a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- conf/conf.xml.in.orig 2013-05-12 22:36:47.530988182 +0200 -+++ conf/conf.xml.in 2013-05-12 22:37:56.459817918 +0200 -@@ -38,12 +38,10 @@ - - - -- - - - - @OPENDNSSEC_STATE_DIR@/tmp - 4 diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch deleted file mode 100644 index 3958c6c70cc..00000000000 --- a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -urN opendnssec-1.3.0rc2.old/Makefile.am opendnssec-1.3.0rc2/Makefile.am ---- opendnssec-1.3.0rc2.old/Makefile.am 2011-06-02 13:48:56.000000000 +0200 -+++ opendnssec-1.3.0rc2/Makefile.am 2011-06-02 13:49:19.000000000 +0200 -@@ -31,11 +31,11 @@ - - install-data-hook: - $(INSTALL) -d $(DESTDIR)$(localstatedir) -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/tmp -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/tmp -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned -+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed - $(INSTALL) -d $(DESTDIR)$(localstatedir)/run - $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec - -diff -urN opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4 opendnssec-1.3.0rc2/m4/opendnssec_common.m4 ---- opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4 2011-06-02 13:48:56.000000000 +0200 -+++ opendnssec-1.3.0rc2/m4/opendnssec_common.m4 2011-06-02 13:49:36.000000000 +0200 -@@ -18,7 +18,7 @@ - OPENDNSSEC_LIBEXEC_DIR=$full_libexecdir/opendnssec - OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec - OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec --OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec" -+OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec" - OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec" - - AC_SUBST([OPENDNSSEC_BIN_DIR]) diff --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch deleted file mode 100644 index fe5b504344c..00000000000 --- a/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur opendnssec-1.3.12.orig/m4/opendnssec_common.m4 opendnssec-1.3.12/m4/opendnssec_common.m4 ---- opendnssec-1.3.12.orig/m4/opendnssec_common.m4 2013-01-31 13:46:01.122201232 +0100 -+++ opendnssec-1.3.12/m4/opendnssec_common.m4 2013-01-31 13:54:47.648861211 +0100 -@@ -19,7 +19,7 @@ - OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec - OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec - OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec" --OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec" -+OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec" - - AC_SUBST([OPENDNSSEC_BIN_DIR]) - AC_SUBST([OPENDNSSEC_SBIN_DIR]) -diff -ur opendnssec-1.3.12.orig/Makefile.am opendnssec-1.3.12/Makefile.am ---- opendnssec-1.3.12.orig/Makefile.am 2013-01-31 13:46:01.122201232 +0100 -+++ opendnssec-1.3.12/Makefile.am 2013-01-31 13:47:08.569951675 +0100 -@@ -37,8 +37,8 @@ - $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf - $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned - $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run -- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec -+ -+ - - docs: - (cd libhsm; $(MAKE) doxygen) diff --git a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild b/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild deleted file mode 100644 index e8f3750cc05..00000000000 --- a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_P="${P/_}" -PKCS11_IUSE="+softhsm opensc external-hsm" -inherit autotools epatch multilib user - -DESCRIPTION="An open-source turn-key solution for DNSSEC" -HOMEPAGE="https://www.opendnssec.org/" -SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc +mysql +signer sqlite test ${PKCS11_IUSE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-lang/perl - dev-libs/libxml2 - dev-libs/libxslt - net-libs/ldns - mysql? ( - virtual/mysql - dev-perl/DBD-mysql - ) - opensc? ( dev-libs/opensc ) - softhsm? ( dev-libs/softhsm:* ) - sqlite? ( - dev-db/sqlite:3 - dev-perl/DBD-SQLite - ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( - app-text/trang - ) -" - -REQUIRED_USE=" - ^^ ( mysql sqlite ) - ^^ ( softhsm opensc external-hsm ) -" - -PATCHES=( - "${FILESDIR}/${PN}-fix-localstatedir.patch" - "${FILESDIR}/${PN}-fix-run-dir.patch" - "${FILESDIR}/${PN}-drop-privileges.patch" - "${FILESDIR}/${PN}-use-system-trang.patch" -) - -S="${WORKDIR}/${MY_P}" - -DOCS=( MIGRATION NEWS ) - -check_pkcs11_setup() { - # PKCS#11 HSM's are often only available with proprietary drivers not - # available in portage tree. - - if use softhsm; then - PKCS11_LIB=softhsm - if has_version ">=dev-libs/softhsm-1.3.1"; then - PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so - else - PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so - fi - elog "Building with SoftHSM PKCS#11 library support." - fi - if use opensc; then - PKCS11_LIB=opensc - PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so - elog "Building with OpenSC PKCS#11 library support." - fi - if use external-hsm; then - if [[ -n ${PKCS11_SCA6000} ]]; then - PKCS11_LIB=sca6000 - PKCS11_PATH=${PKCS11_SCA6000} - elif [[ -n ${PKCS11_ETOKEN} ]]; then - PKCS11_LIB=etoken - PKCS11_PATH=${PKCS11_ETOKEN} - elif [[ -n ${PKCS11_NCIPHER} ]]; then - PKCS11_LIB=ncipher - PKCS11_PATH=${PKCS11_NCIPHER} - elif [[ -n ${PKCS11_AEPKEYPER} ]]; then - PKCS11_LIB=aepkeyper - PKCS11_PATH=${PKCS11_AEPKEYPER} - else - ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11" - ewarn "library. To set a path, set one of the following environment variables:" - ewarn " for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=" - ewarn " for Aladdin eToken, set: PKCS11_ETOKEN=" - ewarn " for Thales/nCipher netHSM, set: PKCS11_NCIPHER=" - ewarn " for AEP Keyper, set: PKCS11_AEPKEYPER=" - ewarn "Example:" - ewarn " PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec" - ewarn "or store the variable into /etc/portage/make.conf" - die "USE flag 'external-hsm' set but no PKCS#11 library path specified." - fi - elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}" - fi -} - -pkg_pretend() { - check_pkcs11_setup -} - -pkg_setup() { - enewgroup opendnssec - enewuser opendnssec -1 -1 -1 opendnssec - - # pretend does not preserve variables so we need to run this once more - check_pkcs11_setup -} - -src_prepare() { - local patch - default - for patch in "${PATCHES[@]}"; do - epatch "$patch" - done - eautoreconf -} - -src_configure() { - econf \ - --without-cunit \ - --localstatedir="${EPREFIX}/var/" \ - --disable-static \ - --with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \ - --with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \ - $(use_enable debug timeshift) \ - $(use_enable signer) -} - -src_compile() { - default - use doc && emake docs -} - -src_install() { - default - - # remove useless .la files - find "${ED}" -name '*.la' -delete - - # Remove subversion tags from config files to avoid useless config updates - sed -i \ - -e '/