From 4ead5818a5d230bcc875202c487761a9b786e945 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Dec 2023 10:56:18 +0000 Subject: gentoo auto-resync : 04:12:2023 - 10:56:18 --- net-dns/opendnssec/Manifest | 7 +- .../opendnssec/files/opendnssec-fix-mysql.patch | 39 ++++ net-dns/opendnssec/metadata.xml | 4 +- net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild | 238 -------------------- net-dns/opendnssec/opendnssec-2.1.13.ebuild | 239 +++++++++++++++++++++ 5 files changed, 283 insertions(+), 244 deletions(-) create mode 100644 net-dns/opendnssec/files/opendnssec-fix-mysql.patch delete mode 100644 net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild create mode 100644 net-dns/opendnssec/opendnssec-2.1.13.ebuild (limited to 'net-dns/opendnssec') diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest index 7d0f3241a8ec..51301583d3ea 100644 --- a/net-dns/opendnssec/Manifest +++ b/net-dns/opendnssec/Manifest @@ -1,7 +1,8 @@ +AUX opendnssec-fix-mysql.patch 1292 BLAKE2B 054de4eb88d89ebfdb3df79f72f6d5d47c35dcba760fd80f845724de8e461e7a1bab7b0afeb2220932abcced43d208d678ab3e232f8cf612a7c54f96b695df17 SHA512 2ae9e7228ff9d2def1cceae1da8c3bfb28d8241cf2a54ea74b0c476b81492be18d22c8961cbcf2d3647dc853314b6bad16da91ba93fc38cd1d48c01be3ac7a27 AUX opendnssec-fix-run-dir-2.1.x.patch 1364 BLAKE2B be870fded9a3dfadfe2b131c7bf0dca3e8ec3b89f0baae469148e8c9ef81ceac1f6ace024373536fa34fa1fa31aa23b432ee97fce7d79c7324aee84eaa3014ec SHA512 c476a5808d914e2056c75d49a3297f4c9a6f9f20882734af21208d563d3a1f9b1aca387ea53159a7c91e6faacc38280ba7b72a3bd3d4a6dd7b4ffb3cfd749b33 AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b06373fbdc974f90bf3a3d6fc564d7c69728151afc5a9f793c96a3be77593bb2679af9dee4456bf69e89367fa459f8b70435 SHA512 316b89a2c6ba56c4fe45d00ad1bc31316fa20ba7177a2cc0979c23f11aba4234cd2f0b8972f98e4f14be9535b704fdc3177a514a41c489eb43016f8ff878795c AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def -DIST opendnssec-2.1.10.tar.gz 1142027 BLAKE2B 063650744ffd1c6d6d3b702400c9617883394c6794743f7d61bd63f7bdaf688a3f2a80f47612e561a133a5689dad8b5f7392eec69779d1dc5632a121d9a41c8f SHA512 c7fdbf1c3867d7b53ac11ab5cb5e636af4595dbee8d704429c7fb84cc3a6b2082ed490c33aad7747d4ee1a2c580afcf24a260bc3ed29eaf5e9d337004045b82d -EBUILD opendnssec-2.1.10-r2.ebuild 6713 BLAKE2B bca71841ff652322bbe742d51962d307169abb245ad996c76f2ec2452510fc06bfdf5b3f4251ea1af43f23ff2b7eb40029062a311b4826d60835ff69cf573bc3 SHA512 7fa9c8b42c79c3b56686456e04a071b405b2870430b373f29b0f30edbaba0e4fdf36d665830deb1d0cc4b2bd319a1ee371362177cd9b0f69af9c20cee8de5e19 -MISC metadata.xml 718 BLAKE2B c6369b0a0f4df6fba454e7101d5254dcbd6b2294f9f6227d21d7f1defa04bde31809883d715b44c939fc9192447138d79b1955dc4964d17b0e8fc8341ab032aa SHA512 1b5144f8aca23a9798dd45a32b91fbdb37be1832d3d7b73bbafb3a3b4a7e003a00016ba84094fd662d9c0db5fe1b032a6a3e389b8c921c32fea61e5b0cd30c44 +DIST opendnssec-2.1.13.tar.gz 1161140 BLAKE2B 964a612e191bf5feb09a8b214e3341fbe5fc03c847e22b33bfc64ec7712608fd0f944c3b089901f08d7e3d2a27cb47543b3d5d210de48708192bb87546dacfa3 SHA512 5f3926f0f144cf8819895da2ec81fce21e2a05cf0b83dd9174a72ebfdef99badc3bcff2d6685c498485113209e7c73ab9cf55b3e126009ce6cbcc3cde54d6051 +EBUILD opendnssec-2.1.13.ebuild 6750 BLAKE2B 443c91dd7dc5ca5462439e6f6b6a0f1c08dc17a8283654dea57cd04b9b0ff2c2430eb264066149db9c1bd1b3366b71e628cefaf8440f92355e19846034e5f16f SHA512 37c5709d970a77e0bc3fe946e47f4463b969883e7fc8b0b46f70abcda30aace7cf17ee8013213c780825263cea76b310fe2f1684aeac0c819416c1c0c1c165b7 +MISC metadata.xml 667 BLAKE2B d32db6dbcfebdb81a5b1289f4630034e6277cfc52c96cd6c5d4e361b30570659852ce168f62fb85aafdd187b3db5e7f946f2cb28317154f7767530d3737105c6 SHA512 bf88072975ccb44724c55fcb8543b2626710a7f50fd820ccfb09dbc627e42db0dea19bbb77d763cd39394a14a01d07902811b56e3ff86c1a0f686828050e911c 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/metadata.xml b/net-dns/opendnssec/metadata.xml index c86a03d33842..142c2461b8ff 100644 --- a/net-dns/opendnssec/metadata.xml +++ b/net-dns/opendnssec/metadata.xml @@ -1,9 +1,7 @@ - - mschiff@gentoo.org - + Enables signing capabilities for OpenDNSSEC Enables support for storing DNSSEC keys through a dev-libs/opensc PKCS#11 interface diff --git a/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild b/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild deleted file mode 100644 index 771b0a19985f..000000000000 --- a/net-dns/opendnssec/opendnssec-2.1.10-r2.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${P/_}" -PKCS11_IUSE="+softhsm opensc external-hsm" - -inherit autotools - -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" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc +mysql readline +signer sqlite test ${PKCS11_IUSE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/opendnssec - acct-user/opendnssec - dev-lang/perl - dev-libs/libxml2 - dev-libs/libxslt - net-libs/ldns[ed25519(+),ed448(+)] - mysql? ( - dev-db/mysql-connector-c:0= - 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}" - -BDEPEND=" - doc? ( app-doc/doxygen ) - test? ( - app-text/trang - dev-libs/softhsm:* - dev-util/cunit - ) -" - -REQUIRED_USE=" - ^^ ( mysql sqlite ) - ^^ ( softhsm opensc external-hsm ) -" - -PATCHES=( - "${FILESDIR}/${PN}-fix-run-dir-2.1.x.patch" - "${FILESDIR}/${PN}-use-system-trang.patch" -) - -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 - PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm2.so - 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() { - if has_version "=2.0.0 you need to upgrade to" - eerror "version >=1.4.10 first:" - eerror "" - eerror " emerge \"=1.4.10 first for proper db migraion" - fi - - check_pkcs11_setup -} - -pkg_setup() { - # pretend does not preserve variables so we need to run this once more - check_pkcs11_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { -# --localstatedir="${EPREFIX}/var/lib" \ - econf \ - --enable-installation-user=opendnssec \ - --enable-installation-group=opendnssec \ - --without-cunit \ - --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 '/