* [gentoo-commits] repo/gentoo:master commit in: net-dns/opendnssec/files/, net-dns/opendnssec/
@ 2016-08-23 15:48 Marc Schiffbauer
0 siblings, 0 replies; 4+ messages in thread
From: Marc Schiffbauer @ 2016-08-23 15:48 UTC (permalink / raw
To: gentoo-commits
commit: 4682b8281173d153f8d7bddec72d49b45322f123
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 15:47:40 2016 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 15:48:33 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4682b828
net-dns/opendnssec: added version 2.0.1
Package-Manager: portage-2.3.0
net-dns/opendnssec/Manifest | 1 +
.../files/opendnssec-drop-privileges-2.0.x.patch | 29 +++
.../files/opendnssec-fix-localstatedir-2.0.x.patch | 22 ++
.../files/opendnssec-fix-run-dir-2.0.x.patch | 24 +++
net-dns/opendnssec/opendnssec-2.0.1.ebuild | 240 +++++++++++++++++++++
5 files changed, 316 insertions(+)
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 4f98250..156c921 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,3 +1,4 @@
DIST opendnssec-1.3.18.tar.gz 1143889 SHA256 e61d23ae0cc57b6e09d408bade6872fe5241896c61a03e8bc5ceeb65df13a676 SHA512 5df39ba778c9b1245e88b81df7aa491bca0aad2943845284c4f8b4dd729fa69014d45f07bdf99a048ccf668a1c9675a8dd99efcec1abdbd4e06e9738fec6ab6d WHIRLPOOL 7213b8f2f86651114449bc4734452d6065960e26ee289051949ca27ae3b23280cea45ff707f71942eef91c9009200272c0985ef3d3de43c9343ad2e1e54303ce
DIST opendnssec-1.4.10.tar.gz 1036069 SHA256 55b44c1da3a665eef0af1d1b3f4d1c57d20f50f77858b1dd3d03ca6ebc1df7cb SHA512 00ba6ceba595f9d4d7736af982b78779f204eb52fcf92222256792368328647ca1a4c84b4db64dcdd9a0119292f132a4efd15e60436c2a125bf6a8fb3f33540e WHIRLPOOL 2122feed10b83b38f8954ebaaf5d065bbf124d573c085559d0b3542dc8b58b8c55a489ceda9707836501a03efbe7a81bc7518e394c86ef1f682822943bbc0a82
DIST opendnssec-1.4.8.2.tar.gz 1043171 SHA256 7fd553ee39173e807477ed1daff6ee2f8b1c83875cd2e52a1df3315bf0015513 SHA512 7f2e10b425f60947aca40c61509b07ddc4363105cc882b518ffa816437299d6f881411cb38325f27b3a34c2005953988b39c945362866dd0f1f7c6ef973bfa06 WHIRLPOOL 38079a89d8e3d039aeab28c80b7fb1a9739014736d6076442c546fae1b13e1c89faa1858beb6f4d2f495d19a2a1187a7af10c55c0ed33563bc9b2d57945de807
+DIST opendnssec-2.0.1.tar.gz 1101523 SHA256 bf874bbb346699a5b539699f90a54e0c15fff0574df7a3c118abb30938b7b346 SHA512 aa12818f92688e087acaff8a6771d2a7da733e04d9e821967d313c7ff880a1056f470b11988eba1e7aad606418c3a4587f654163d74f68e3f61943c74d86d052 WHIRLPOOL 865fbd0d21cd015e87da5f26858e39a233464fb04e56a21683b4713d3836b925eea80973446571da78730ef765d5a1a3fc5f8ad192dd09fdf6eb7467ae417769
diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch
new file mode 100644
index 0000000..f3adc48
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch
@@ -0,0 +1,29 @@
+diff -ur opendnssec-2.0.1.orig/conf/conf.xml.in opendnssec-2.0.1/conf/conf.xml.in
+--- opendnssec-2.0.1.orig/conf/conf.xml.in 2016-07-21 16:15:27.000000000 +0200
++++ opendnssec-2.0.1/conf/conf.xml.in 2016-08-23 15:21:09.633384446 +0200
+@@ -36,12 +36,10 @@
+ </Common>
+
+ <Enforcer>
+-<!--
+ <Privileges>
+ <User>opendnssec</User>
+ <Group>opendnssec</Group>
+ </Privileges>
+--->
+
+ <Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
+ <!--The enforcer interval parameter is no long used in 2.0 and will be deprecated in 2.1 -->
+@@ -60,12 +58,10 @@
+ </Enforcer>
+
+ <Signer>
+-<!--
+ <Privileges>
+ <User>opendnssec</User>
+ <Group>opendnssec</Group>
+ </Privileges>
+--->
+
+ <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/signer</WorkingDirectory>
+ <WorkerThreads>4</WorkerThreads>
diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch
new file mode 100644
index 0000000..5940c2f
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch
@@ -0,0 +1,22 @@
+diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am
+--- opendnssec-2.0.1.orig/Makefile.am 2016-07-21 16:15:00.000000000 +0200
++++ opendnssec-2.0.1/Makefile.am 2016-08-23 14:01:50.618393034 +0200
+@@ -30,12 +30,12 @@
+
+ install-data-hook:
+ $(INSTALL) -d $(DESTDIR)$(localstatedir)
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signer
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/enforcer
+- $(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/signer
++ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/enforcer
++ $(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 --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch
new file mode 100644
index 0000000..5ea9c80
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch
@@ -0,0 +1,24 @@
+diff -ur opendnssec-2.0.1.orig/m4/opendnssec_common.m4 opendnssec-2.0.1/m4/opendnssec_common.m4
+--- opendnssec-2.0.1.orig/m4/opendnssec_common.m4 2016-07-21 16:15:00.000000000 +0200
++++ opendnssec-2.0.1/m4/opendnssec_common.m4 2016-08-23 14:42:35.033460972 +0200
+@@ -17,7 +17,7 @@
+ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
+ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
+ OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/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-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am
+--- opendnssec-2.0.1.orig/Makefile.am 2016-08-23 14:40:10.009951791 +0200
++++ opendnssec-2.0.1/Makefile.am 2016-08-23 14:43:20.377870776 +0200
+@@ -36,8 +36,6 @@
+ $(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-2.0.1.ebuild b/net-dns/opendnssec/opendnssec-2.0.1.ebuild
new file mode 100644
index 0000000..f2caf66
--- /dev/null
+++ b/net-dns/opendnssec/opendnssec-2.0.1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${P/_}"
+PKCS11_IUSE="+softhsm opensc external-hsm"
+inherit autotools eutils multilib user
+
+DESCRIPTION="An open-source turn-key solution for DNSSEC"
+HOMEPAGE="http://www.opendnssec.org/"
+SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +mysql readline +signer sqlite test ${PKCS11_IUSE}"
+
+RDEPEND="
+ dev-lang/perl
+ dev-libs/libxml2
+ dev-libs/libxslt
+ net-libs/ldns
+ mysql? (
+ virtual/mysql
+ dev-perl/DBD-mysql
+ )
+ opensc? ( dev-libs/opensc )
+ readline? ( sys-libs/readline:0 )
+ 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-2.0.x.patch"
+ "${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
+ "${FILESDIR}/${PN}-drop-privileges-2.0.x.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=<path>"
+ ewarn " for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
+ ewarn " for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
+ ewarn " for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
+ ewarn "Example:"
+ ewarn " PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
+ ewarn "or store the variable into /etc/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() {
+ if has_version "<net-dns/opendnssec-1.4.10"; then
+ ################################################################################
+ eerror "You are already using OpenDNSSEC."
+ eerror "In order to migrate to version >=2.0.0 you need to upgrade to"
+ eerror "version >=1.4.10 first:"
+ eerror ""
+ eerror " emerge \"<net-dns/opendnssec-2\""
+ eerror ""
+ eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION"
+ eerror "for details."
+ eerror ""
+ die "Please upgrade to version >=1.4.10 first for proper db migraion"
+ fi
+
+ 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-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
+ --with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
+ $(use_with readline) \
+ $(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 '/<!-- \$Id:/ d' \
+ "${ED}"/etc/opendnssec/* || die
+
+ # install db update/migration stuff
+ insinto /usr/share/opendnssec/db
+ if use sqlite; then
+ doins enforcer/utils/convert_mysql_to_sqlite
+ fi
+ if use mysql; then
+ doins enforcer/utils/convert_sqlite_to_mysql
+ fi
+
+ insinto /usr/share/opendnssec/db/sql
+ if use sqlite; then
+ doins enforcer/src/db/schema.sqlite
+ fi
+ if use mysql; then
+ doins enforcer/src/db/schema.mysql
+ fi
+
+ insinto /usr/share/opendnssec/db/1.4-2.0_db_convert
+ doins enforcer/utils/1.4-2.0_db_convert/find_problematic_zones.sql
+ doins enforcer/utils/1.4-2.0_db_convert/README.md
+ if use sqlite; then
+ doins enforcer/utils/1.4-2.0_db_convert/sqlite_convert.sql
+ doins enforcer/utils/1.4-2.0_db_convert/convert_sqlite
+ fi
+ if use mysql; then
+ doins enforcer/utils/1.4-2.0_db_convert/convert_mysql
+ doins enforcer/utils/1.4-2.0_db_convert/mysql_convert.sql
+ fi
+
+ # patch scripts to find schema files
+ sed -i \
+ -e 's,^SCHEMA=../src/db/,/usr/share/opendnssec/db/,' \
+ -e 's,^SCHEMA=../../src/db/,/usr/share/opendnssec/db/,' \
+ "${ED}"/usr/share/opendnssec/db/convert_* \
+ "${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_*
+
+ # fix permissions
+ fowners root:opendnssec /etc/opendnssec
+ fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
+ fowners opendnssec:opendnssec /var/lib/opendnssec/{,enforcer,signconf,signed,signer,unsigned}
+
+ # install conf/init script
+ newinitd "${FILESDIR}"/opendnssec.initd opendnssec
+ newconfd "${FILESDIR}"/opendnssec.confd opendnssec
+}
+
+pkg_postinst() {
+ local v
+ if use softhsm; then
+ elog "Please make sure that you create your softhsm database in a location writeable"
+ elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
+ elog "Suggested configuration is:"
+ elog " echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
+ elog " softhsm --init-token --slot 0 --label OpenDNSSEC"
+ elog " chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
+ fi
+ for v in $REPLACING_VERSIONS; do
+ case $v in
+ 1.4.*)
+ ewarn ""
+ ewarn "You are upgrading from version 1.4."
+ ewarn ""
+ ewarn "A migration is needed from 1.4 to 2.0."
+ ewarn "For details see /usr/share/doc/${P}/MIGRATION*"
+ ewarn ""
+ ewarn "For your convenience the mentioned migration scripts and README"
+ ewarn "have been installed to /usr/share/${PN}/db/1.4-2.0_db_convert"
+ ewarn ""
+ ;;
+ esac
+ done
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/opendnssec/files/, net-dns/opendnssec/
@ 2021-04-25 18:06 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-04-25 18:06 UTC (permalink / raw
To: gentoo-commits
commit: bfad81224e37f1881b6e787b6d546497e781a891
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 10:21:29 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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 @@
- </Common>
-
- <Enforcer>
--<!--
- <Privileges>
- <User>opendnssec</User>
- <Group>opendnssec</Group>
- </Privileges>
---->
- <!-- NOTE: Enforcer worker threads are not used; this option is ignored -->
- <!--
- <WorkerThreads>4</WorkerThreads>
-@@ -60,12 +58,10 @@
- </Enforcer>
-
- <Signer>
--<!--
- <Privileges>
- <User>opendnssec</User>
- <Group>opendnssec</Group>
- </Privileges>
---->
-
- <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- <WorkerThreads>4</WorkerThreads>
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=<path>"
- ewarn " for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
- ewarn " for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
- ewarn " for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
- 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 '/<!-- \$Id:/ d' \
- "${ED}"/etc/opendnssec/* || die
-
- # install update scripts
- insinto /usr/share/opendnssec
- if use sqlite; then
- doins enforcer/utils/migrate_*sqlite*
- fi
- if use mysql; then
- doins enforcer/utils/migrate_*mysql*
- fi
-
- # fix permissions
- fowners root:opendnssec /etc/opendnssec
- fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
- fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-
- # install conf/init script
- newinitd "${FILESDIR}"/opendnssec.initd opendnssec
- newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
- local v
- if use softhsm; then
- elog "Please make sure that you create your softhsm database in a location writeable"
- elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
- elog "Suggested configuration is:"
- elog " echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
- elog " softhsm --init-token --slot 0 --label OpenDNSSEC"
- elog " chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
- fi
-
- for v in $REPLACING_VERSIONS; do
- case $v in
- 1.3.*)
- ewarn ""
- ewarn "You are upgrading from version 1.3."
- ewarn ""
- ewarn "Please be aware of the following:"
- ewarn " * OpenDNSSEC now supports both input and output adapters for"
- ewarn " AXFR and IXFR in addition to file transfer."
- ewarn " -> The zonefetch.xml file has been replaced by addns.xml"
- ewarn " to support this enhancement."
- ewarn " -> changes to the KASP database mean that a database"
- ewarn " migration is required to upgrade to 1.4 from earlier"
- ewarn " versions of OpenDNSSEC."
- ewarn " * The auditor is no longer supported."
- ewarn ""
- ewarn "You can find more information here:"
- ewarn " * /usr/share/doc/opendnssec*/MIGRATION*"
- ewarn " * https://wiki.opendnssec.org/display/DOCS/Migrating+zone+fetcher+to+DNS+adapters"
- ewarn " * https://wiki.opendnssec.org/display/DOCS/Migrating+from+earlier+versions+of+OpenDNSSEC"
- ewarn ""
- ;;
- esac
- done
-}
diff --git a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
deleted file mode 100644
index 9a4bd33a2f2..00000000000
--- a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,240 +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 readline +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 )
- readline? ( sys-libs/readline:0 )
- 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-2.0.x.patch"
- "${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
- "${FILESDIR}/${PN}-drop-privileges-2.0.x.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=<path>"
- ewarn " for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
- ewarn " for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
- ewarn " for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
- 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() {
- if has_version "<net-dns/opendnssec-1.4.10"; then
- ################################################################################
- eerror "You are already using OpenDNSSEC."
- eerror "In order to migrate to version >=2.0.0 you need to upgrade to"
- eerror "version >=1.4.10 first:"
- eerror ""
- eerror " emerge \"<net-dns/opendnssec-2\""
- eerror ""
- eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION"
- eerror "for details."
- eerror ""
- die "Please upgrade to version >=1.4.10 first for proper db migraion"
- fi
-
- 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-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
- --with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
- $(use_with readline) \
- $(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 '/<!-- \$Id:/ d' \
- "${ED}"/etc/opendnssec/* || die
-
- # install db update/migration stuff
- insinto /usr/share/opendnssec/db
- if use sqlite; then
- doins enforcer/utils/convert_mysql_to_sqlite
- fi
- if use mysql; then
- doins enforcer/utils/convert_sqlite_to_mysql
- fi
-
- insinto /usr/share/opendnssec/db/sql
- if use sqlite; then
- doins enforcer/src/db/schema.sqlite
- fi
- if use mysql; then
- doins enforcer/src/db/schema.mysql
- fi
-
- insinto /usr/share/opendnssec/db/1.4-2.0_db_convert
- doins enforcer/utils/1.4-2.0_db_convert/find_problematic_zones.sql
- doins enforcer/utils/1.4-2.0_db_convert/README.md
- if use sqlite; then
- doins enforcer/utils/1.4-2.0_db_convert/sqlite_convert.sql
- doins enforcer/utils/1.4-2.0_db_convert/convert_sqlite
- fi
- if use mysql; then
- doins enforcer/utils/1.4-2.0_db_convert/convert_mysql
- doins enforcer/utils/1.4-2.0_db_convert/mysql_convert.sql
- fi
-
- # patch scripts to find schema files
- sed -i \
- -e 's,^SCHEMA=../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
- -e 's,^SCHEMA=../../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
- "${ED}"/usr/share/opendnssec/db/convert_* \
- "${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_*
-
- # fix permissions
- fowners root:opendnssec /etc/opendnssec
- fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
- fowners opendnssec:opendnssec /var/lib/opendnssec/{,enforcer,signconf,signed,signer,unsigned}
-
- # install conf/init script
- newinitd "${FILESDIR}"/opendnssec.initd opendnssec
- newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
- local v
- if use softhsm; then
- elog "Please make sure that you create your softhsm database in a location writeable"
- elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
- elog "Suggested configuration is:"
- elog " echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
- elog " softhsm --init-token --slot 0 --label OpenDNSSEC"
- elog " chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
- fi
- for v in $REPLACING_VERSIONS; do
- case $v in
- 1.4.*)
- ewarn ""
- ewarn "You are upgrading from version 1.4."
- ewarn ""
- ewarn "A migration is needed from 1.4 to 2.0."
- ewarn "For details see /usr/share/doc/${P}/MIGRATION*"
- ewarn ""
- ewarn "For your convenience the mentioned migration scripts and README"
- ewarn "have been installed to /usr/share/${PN}/db/1.4-2.0_db_convert"
- ewarn ""
- ;;
- esac
- done
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/opendnssec/files/, net-dns/opendnssec/
@ 2021-11-28 0:41 Marc Schiffbauer
0 siblings, 0 replies; 4+ messages in thread
From: Marc Schiffbauer @ 2021-11-28 0:41 UTC (permalink / raw
To: gentoo-commits
commit: a93883869c71373646f69d6fd5c70fd8052c65c4
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 28 00:40:15 2021 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Sun Nov 28 00:40:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9388386
net-dns/opendnssec: add 2.1.10, drop 2.0.3-r2
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
net-dns/opendnssec/Manifest | 2 +-
.../files/opendnssec-drop-privileges-2.0.x.patch | 29 ------------
.../files/opendnssec-fix-localstatedir-2.0.x.patch | 22 ---------
.../files/opendnssec-fix-run-dir-2.0.x.patch | 24 ----------
.../files/opendnssec-fix-run-dir-2.1.x.patch | 24 ++++++++++
.../opendnssec/files/opendnssec-openssl1.1.patch | 55 ----------------------
...ec-2.0.3-r2.ebuild => opendnssec-2.1.10.ebuild} | 21 +++++----
7 files changed, 38 insertions(+), 139 deletions(-)
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index b7655458e116..c14ca9969b6a 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1 +1 @@
-DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
+DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f SHA512 c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d
diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch
deleted file mode 100644
index f3adc487dee9..000000000000
--- a/net-dns/opendnssec/files/opendnssec-drop-privileges-2.0.x.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur opendnssec-2.0.1.orig/conf/conf.xml.in opendnssec-2.0.1/conf/conf.xml.in
---- opendnssec-2.0.1.orig/conf/conf.xml.in 2016-07-21 16:15:27.000000000 +0200
-+++ opendnssec-2.0.1/conf/conf.xml.in 2016-08-23 15:21:09.633384446 +0200
-@@ -36,12 +36,10 @@
- </Common>
-
- <Enforcer>
--<!--
- <Privileges>
- <User>opendnssec</User>
- <Group>opendnssec</Group>
- </Privileges>
---->
-
- <Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
- <!--The enforcer interval parameter is no long used in 2.0 and will be deprecated in 2.1 -->
-@@ -60,12 +58,10 @@
- </Enforcer>
-
- <Signer>
--<!--
- <Privileges>
- <User>opendnssec</User>
- <Group>opendnssec</Group>
- </Privileges>
---->
-
- <WorkingDirectory>@OPENDNSSEC_STATE_DIR@/signer</WorkingDirectory>
- <WorkerThreads>4</WorkerThreads>
diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch
deleted file mode 100644
index 5940c2f050e6..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-localstatedir-2.0.x.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur opendnssec-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am
---- opendnssec-2.0.1.orig/Makefile.am 2016-07-21 16:15:00.000000000 +0200
-+++ opendnssec-2.0.1/Makefile.am 2016-08-23 14:01:50.618393034 +0200
-@@ -30,12 +30,12 @@
-
- install-data-hook:
- $(INSTALL) -d $(DESTDIR)$(localstatedir)
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signer
-- $(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/enforcer
-- $(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/signer
-+ $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/enforcer
-+ $(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 --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch
deleted file mode 100644
index 5ea9c80f2ba7..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.0.x.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur opendnssec-2.0.1.orig/m4/opendnssec_common.m4 opendnssec-2.0.1/m4/opendnssec_common.m4
---- opendnssec-2.0.1.orig/m4/opendnssec_common.m4 2016-07-21 16:15:00.000000000 +0200
-+++ opendnssec-2.0.1/m4/opendnssec_common.m4 2016-08-23 14:42:35.033460972 +0200
-@@ -17,7 +17,7 @@
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
- OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/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-2.0.1.orig/Makefile.am opendnssec-2.0.1/Makefile.am
---- opendnssec-2.0.1.orig/Makefile.am 2016-08-23 14:40:10.009951791 +0200
-+++ opendnssec-2.0.1/Makefile.am 2016-08-23 14:43:20.377870776 +0200
-@@ -36,8 +36,6 @@
- $(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/files/opendnssec-fix-run-dir-2.1.x.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.1.x.patch
new file mode 100644
index 000000000000..87560e090e82
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-fix-run-dir-2.1.x.patch
@@ -0,0 +1,24 @@
+diff -ur opendnssec-2.1.10.orig/m4/opendnssec_common.m4 opendnssec-2.1.10/m4/opendnssec_common.m4
+--- opendnssec-2.1.10.orig/m4/opendnssec_common.m4 2021-09-10 09:11:17.000000000 -1000
++++ opendnssec-2.1.10/m4/opendnssec_common.m4 2021-11-27 14:18:26.430202347 -1000
+@@ -17,7 +17,7 @@
+ OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
+ OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
+ OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/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-2.1.10.orig/Makefile.am opendnssec-2.1.10/Makefile.am
+--- opendnssec-2.1.10.orig/Makefile.am 2021-09-10 09:11:17.000000000 -1000
++++ opendnssec-2.1.10/Makefile.am 2021-11-27 14:19:02.685418411 -1000
+@@ -38,8 +38,6 @@
+ $(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
+ $(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
+ $(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/opendnssec/signed
+- $(INSTALL) -d $(DESTDIR)$(localstatedir)/run
+- $(INSTALL) @INSTALLATIONUSERARG@ @INSTALLATIONGROUPARG@ -d $(DESTDIR)$(localstatedir)/run/opendnssec
+
+ docs:
+ (cd libhsm; $(MAKE) doxygen)
diff --git a/net-dns/opendnssec/files/opendnssec-openssl1.1.patch b/net-dns/opendnssec/files/opendnssec-openssl1.1.patch
deleted file mode 100644
index b81068c4b9fd..000000000000
--- a/net-dns/opendnssec/files/opendnssec-openssl1.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/signer/src/wire/tsig-openssl.c
-+++ b/signer/src/wire/tsig-openssl.c
-@@ -126,7 +126,11 @@ static void
- cleanup_context(void *data)
- {
- HMAC_CTX* context = (HMAC_CTX*) data;
-+#ifdef HAVE_SSL_NEW_HMAC
-+ HMAC_CTX_free(context);
-+#else
- HMAC_CTX_cleanup(context);
-+#endif
- }
-
- static void
-@@ -146,8 +150,13 @@ static void*
- create_context()
- {
- HMAC_CTX* context;
-+#ifdef HAVE_SSL_NEW_HMAC
-+ CHECKALLOC(context = HMAC_CTX_new());
-+ HMAC_CTX_reset(context);
-+#else
- CHECKALLOC(context = (HMAC_CTX*) malloc(sizeof(HMAC_CTX)));
- HMAC_CTX_init(context);
-+#endif
- context_add_cleanup(context);
- return context;
- }
---- a/m4/acx_ssl.m4 2016-10-14 09:40:13.000000000 -0400
-+++ b/m4/acx_ssl.m4 2019-02-18 13:52:49.861127549 -0500
-@@ -35,12 +35,21 @@
- if test x_$ssldir = x_/usr/sfw; then
- SSL_LIBS="$SSL_LIBS -R$ssldir/lib";
- fi
-- AC_CHECK_LIB(crypto, HMAC_CTX_init,, [
-- AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
-- ])
-+ save_LIBS=$LIBS
-+ AC_CHECK_LIB(crypto, HMAC_CTX_reset, [
-+ AC_DEFINE_UNQUOTED([HAVE_SSL_NEW_HMAC], [], [Define if you have the SSL libraries with new HMAC related functions.])
-+ ], [
-+ AC_CHECK_LIB(crypto, HMAC_CTX_init,, [
-+ AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
-+ ])
-+ ] )
-+ SSL_LIBS="$SSL_LIBS -lcrypto";
-+ LIBS="$SSL_LIBS $LIBS"
- AC_CHECK_FUNCS([EVP_sha1 EVP_sha256])
-+ LIBS=$saveLIBS
- fi
- AC_SUBST(HAVE_SSL)
-+ AC_SUBST(HAVE_SSL_NEW_HMAC)
- AC_SUBST(SSL_INCLUDES)
- AC_SUBST(SSL_LIBS)
- fi
diff --git a/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild b/net-dns/opendnssec/opendnssec-2.1.10.ebuild
similarity index 92%
rename from net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild
rename to net-dns/opendnssec/opendnssec-2.1.10.ebuild
index 17efc48d4904..2df181514c42 100644
--- a/net-dns/opendnssec/opendnssec-2.0.3-r2.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.1.10.ebuild
@@ -53,12 +53,16 @@ REQUIRED_USE="
^^ ( softhsm opensc external-hsm )
"
+#PATCHES=(
+# "${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch"
+# "${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
+# "${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
+# "${FILESDIR}/${PN}-use-system-trang.patch"
+# "${FILESDIR}/${PN}-openssl1.1.patch"
+#)
PATCHES=(
- "${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch"
- "${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
- "${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
+ "${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch"
"${FILESDIR}/${PN}-use-system-trang.patch"
- "${FILESDIR}/${PN}-openssl1.1.patch"
)
DOCS=( MIGRATION NEWS )
@@ -119,8 +123,7 @@ pkg_pretend() {
eerror ""
eerror " emerge \"<net-dns/opendnssec-2\""
eerror ""
- eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION"
- eerror "for details."
+ eerror "See /usr/share/doc/opendnssec-2.1.10/MIGRATION* for details."
eerror ""
die "Please upgrade to version >=1.4.10 first for proper db migraion"
fi
@@ -140,8 +143,10 @@ src_prepare() {
src_configure() {
econf \
+ --enable-installation-user=opendnssec \
+ --enable-installation-group=opendnssec \
+ --localstatedir="${EPREFIX}/var/lib" \
--without-cunit \
- --localstatedir="${EPREFIX}/var" \
--disable-static \
--with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
@@ -230,7 +235,7 @@ pkg_postinst() {
ewarn ""
ewarn "You are upgrading from version 1.4."
ewarn ""
- ewarn "A migration is needed from 1.4 to 2.0."
+ ewarn "A migration is needed from 1.4 to 2.x."
ewarn "For details see /usr/share/doc/${P}/MIGRATION*"
ewarn ""
ewarn "For your convenience the mentioned migration scripts and README"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/opendnssec/files/, net-dns/opendnssec/
@ 2023-12-04 7:53 Marc Schiffbauer
0 siblings, 0 replies; 4+ messages in thread
From: Marc Schiffbauer @ 2023-12-04 7:53 UTC (permalink / raw
To: gentoo-commits
commit: 11cb2ae479c8af8c7b88107ff8c8c37d66ebdc39
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 07:51:28 2023 +0000
Commit: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 07:53:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11cb2ae4
net-dns/opendnssec: add 2.1.13, drop 2.1.10-r2
Signed-off-by: Marc Schiffbauer <mschiff <AT> gentoo.org>
net-dns/opendnssec/Manifest | 2 +-
.../opendnssec/files/opendnssec-fix-mysql.patch | 39 ++++++++++++++++++++++
...c-2.1.10-r2.ebuild => opendnssec-2.1.13.ebuild} | 5 +--
3 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index c14ca9969b6a..cc67e3c2f5bf 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1 +1 @@
-DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f SHA512 c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d
+DIST opendnssec-2.1.13.tar.gz 1161140 BLAKE2B 964a612e191bf5feb09a8b214e3341fbe5fc03c847e22b33bfc64ec7712608fd0f944c3b089901f08d7e3d2a27cb47543b3d5d210de48708192bb87546dacfa3 SHA512 5f3926f0f144cf8819895da2ec81fce21e2a05cf0b83dd9174a72ebfdef99badc3bcff2d6685c498485113209e7c73ab9cf55b3e126009ce6cbcc3cde54d6051
diff --git a/net-dns/opendnssec/files/opendnssec-fix-mysql.patch b/net-dns/opendnssec/files/opendnssec-fix-mysql.patch
new file mode 100644
index 000000000000..b138892dc232
--- /dev/null
+++ b/net-dns/opendnssec/files/opendnssec-fix-mysql.patch
@@ -0,0 +1,39 @@
+diff -urN opendnssec-2.1.13.orig/enforcer/src/db/db_backend_mysql.c opendnssec-2.1.13/enforcer/src/db/db_backend_mysql.c
+--- opendnssec-2.1.13.orig/enforcer/src/db/db_backend_mysql.c 2023-06-26 13:24:05.000000000 +0200
++++ opendnssec-2.1.13/enforcer/src/db/db_backend_mysql.c 2023-12-04 08:39:37.685365824 +0100
+@@ -72,7 +72,7 @@
+ db_backend_mysql_bind_t* next;
+ MYSQL_BIND* bind;
+ unsigned long length;
+- my_bool error;
++ _Bool error;
+ int value_enum;
+ };
+
+@@ -270,7 +270,7 @@
+ }
+
+ bind->bind = (mysql_bind = &((*statement)->mysql_bind_output[i]));
+- mysql_bind->is_null = (my_bool*)0;
++ mysql_bind->is_null = (_Bool*)0;
+ mysql_bind->error = &bind->error;
+ mysql_bind->length = &bind->length;
+
+@@ -959,7 +959,7 @@
+ }
+
+ (*bind)->bind->length = &((*bind)->bind->buffer_length);
+- (*bind)->bind->is_null = (my_bool*)0;
++ (*bind)->bind->is_null = (_Bool*)0;
+
+ switch (db_clause_type(clause)) {
+ case DB_CLAUSE_EQUAL:
+@@ -1079,7 +1079,7 @@
+ }
+
+ bind->bind->length = &(bind->bind->buffer_length);
+- bind->bind->is_null = (my_bool*)0;
++ bind->bind->is_null = (_Bool*)0;
+
+ switch (db_value_type(value)) {
+ case DB_TYPE_PRIMARY_KEY:
diff --git a/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild b/net-dns/opendnssec/opendnssec-2.1.13.ebuild
similarity index 98%
rename from net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild
rename to net-dns/opendnssec/opendnssec-2.1.13.ebuild
index 771b0a19985f..6ed5a297adfb 100644
--- a/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild
+++ b/net-dns/opendnssec/opendnssec-2.1.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
MY_P="${P/_}"
PKCS11_IUSE="+softhsm opensc external-hsm"
@@ -58,6 +58,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch"
"${FILESDIR}/${PN}-use-system-trang.patch"
+ "${FILESDIR}/${PN}-fix-mysql.patch"
)
DOCS=( MIGRATION NEWS )
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-04 7:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-25 18:06 [gentoo-commits] repo/gentoo:master commit in: net-dns/opendnssec/files/, net-dns/opendnssec/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-12-04 7:53 Marc Schiffbauer
2021-11-28 0:41 Marc Schiffbauer
2016-08-23 15:48 Marc Schiffbauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox