* [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/, net-dns/bind-tools/files/
@ 2019-08-22 11:10 Mikle Kolyada
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2019-08-22 11:10 UTC (permalink / raw
To: gentoo-commits
commit: 25be2b1ffdcbf50bf28d89f8987f853f9bdca79c
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 11:09:27 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 11:10:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25be2b1f
net-dns/bind-tools: detect sparc pause instruction properly
Closes: https://bugs.gentoo.org/691708
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-dns/bind-tools/bind-tools-9.14.4.ebuild | 2 +
.../bind-tools/files/sparc-pause-instruction.patch | 135 +++++++++++++++++++++
2 files changed, 137 insertions(+)
diff --git a/net-dns/bind-tools/bind-tools-9.14.4.ebuild b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
index 489ecbb114f..7090d635dc0 100644
--- a/net-dns/bind-tools/bind-tools-9.14.4.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.14.4.ebuild
@@ -42,6 +42,8 @@ S="${WORKDIR}/${MY_P}"
# bug 479092, requires networking
RESTRICT="test"
+PATCHES=( "${FILESDIR}"/sparc-pause-instruction.patch )
+
src_prepare() {
default
diff --git a/net-dns/bind-tools/files/sparc-pause-instruction.patch b/net-dns/bind-tools/files/sparc-pause-instruction.patch
new file mode 100644
index 00000000000..35ddb24da0b
--- /dev/null
+++ b/net-dns/bind-tools/files/sparc-pause-instruction.patch
@@ -0,0 +1,135 @@
+From a5ad6b16c5c0bfd333758d707a6397be79a92914 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Thu, 8 Aug 2019 08:33:10 +0100
+Subject: [PATCH] configure.ac: autodetect 'pause' instruction presence on
+ sparc
+
+The change fixes the following build failure on sparc T3 and older CPUs:
+
+```
+sparc-unknown-linux-gnu-gcc ... -O2 -mcpu=niagara2 ... -c rwlock.c
+{standard input}: Assembler messages:
+{standard input}:398: Error: Architecture mismatch on "pause ".
+{standard input}:398: (Requires v9e|v9v|v9m|m8; requested architecture is v9b.)
+make[1]: *** [Makefile:280: rwlock.o] Error 1
+```
+
+`pause` insutruction exists only on `-mcpu=niagara4` (`T4`) and upper.
+
+The change adds `pause` configure-time autodetection and uses it if available.
+config.h.in got new `HAVE_SPARC_PAUSE` knob. Fallback is a fall-through no-op.
+
+Build-tested on:
+
+- sparc-unknown-linux-gnu-gcc (no `pause`, build succeeds)
+- sparc-unknown-linux-gnu-gcc -mcpu=niagara4 (`pause`, build succeeds)
+
+Reported-by: Rolf Eike Beer
+Bug: https://bugs.gentoo.org/691708
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ config.h.in | 3 +++
+ configure | 33 +++++++++++++++++++++++++++++++++
+ configure.ac | 14 ++++++++++++++
+ lib/isc/rwlock.c | 2 +-
+ 4 files changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/config.h.in b/config.h.in
+index 91508e5d91..eeba105ec6 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -357,6 +357,9 @@
+ /* Define to 1 if you have the `setresuid' function. */
+ #undef HAVE_SETRESUID
+
++/* define if the SPARC pause instruction is available */
++#undef HAVE_SPARC_PAUSE
++
+ /* define if struct stat has st_mtim.tv_nsec field */
+ #undef HAVE_STAT_NSEC
+
+diff --git a/configure b/configure
+index d336f6aa24..757dacb06e 100755
+--- a/configure
++++ b/configure
+@@ -13872,6 +13872,39 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
+ ;;
+ esac
+
++#
++# Check for pause support on SPARC processors
++#
++case $host in #(
++ sparc*) :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pause instruction support" >&5
++$as_echo_n "checking for pause instruction support... " >&6; }
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++__asm__ __volatile__ ("pause")
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HAVE_SPARC_PAUSE 1" >>confdefs.h
++
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
++ *) :
++ ;;
++esac
++
+ for ac_func in sysctlbyname
+ do :
+ ac_fn_c_check_func "$LINENO" "sysctlbyname" "ac_cv_func_sysctlbyname"
+diff --git a/configure.ac b/configure.ac
+index 90aafae8d0..b04c651966 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -415,6 +415,20 @@ AS_CASE([$host],
+ [define if the ARM yield instruction is available])],
+ [AC_MSG_RESULT([no])])])
+
++#
++# Check for pause support on SPARC processors
++#
++AS_CASE([$host],
++ [sparc*],
++ [AC_MSG_CHECKING([for pause instruction support])
++ AC_COMPILE_IFELSE(
++ [AC_LANG_PROGRAM([[]],
++ [[__asm__ __volatile__ ("pause")]])],
++ [AC_MSG_RESULT([yes])
++ AC_DEFINE([HAVE_SPARC_PAUSE], [1],
++ [define if the SPARC pause instruction is available])],
++ [AC_MSG_RESULT([no])])])
++
+ AC_CHECK_FUNCS([sysctlbyname])
+
+ #
+diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
+index a6ea35feed..e313a912e0 100644
+--- a/lib/isc/rwlock.c
++++ b/lib/isc/rwlock.c
+@@ -152,7 +152,7 @@ isc_rwlock_destroy(isc_rwlock_t *rwl) {
+ # define isc_rwlock_pause() __asm__ __volatile__ ("yield")
+ #elif defined(sun) && (defined(__sparc) || defined(__sparc__))
+ # define isc_rwlock_pause() smt_pause()
+-#elif defined(__sparc) || defined(__sparc__)
++#elif (defined(__sparc) || defined(__sparc__)) && HAVE_SPARC_PAUSE
+ # define isc_rwlock_pause() __asm__ __volatile__ ("pause")
+ #elif defined(__ppc__) || defined(_ARCH_PPC) || \
+ defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)
+--
+2.21.0
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/, net-dns/bind-tools/files/
@ 2022-10-31 1:47 John Helmert III
0 siblings, 0 replies; 2+ messages in thread
From: John Helmert III @ 2022-10-31 1:47 UTC (permalink / raw
To: gentoo-commits
commit: 47033ea393993395b38465b0054d7e85e45ca04a
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 01:47:14 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 01:47:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47033ea3
net-dns/bind-tools: cleanup alongside bind cleanup
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
net-dns/bind-tools/Manifest | 5 -
net-dns/bind-tools/bind-tools-9.16.27.ebuild | 152 --------------------
net-dns/bind-tools/bind-tools-9.16.29-r1.ebuild | 156 --------------------
net-dns/bind-tools/bind-tools-9.16.30.ebuild | 156 --------------------
net-dns/bind-tools/bind-tools-9.16.31.ebuild | 157 ---------------------
net-dns/bind-tools/bind-tools-9.16.32.ebuild | 157 ---------------------
.../bind-tools-9.16.29-fortify-source-3.patch | 35 -----
7 files changed, 818 deletions(-)
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index e3e798fba869..d1b69114006f 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -1,6 +1 @@
-DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62
-DIST bind-9.16.29.tar.xz 5088348 BLAKE2B 17ee1443926327c30f1d5820110b01a193c53eb24e23385b713217a4e49d9c2b5ddb6e1c49cb80d2c9083c71ce7872a26fe3597209f2e3215e6cc7e930e68004 SHA512 b4acbafed370438ac53e73468ccb5ea5745a1c8f764dd96f9c9a027594a3b7ce0d486e7f01138b39795b456265e0e6116cd76e44f5a3329687cd718550ca79fb
-DIST bind-9.16.30.tar.xz 5086288 BLAKE2B 35fe14b58a018df25563e58a9632b4431f740bc7a708eb823117541548d23b1855e43058cf7323361ca904d5e59d687e282abb73dc8b617e4eb25ef113168e93 SHA512 cc9bcbedf63c2efe0a23f14db3e57fdae46f0509aac58e5840a6805ce4fbd76cad5bfde4d461442adb88c4d947f8d79bf979aeb24aeb9303b6adc8d169b7118c
-DIST bind-9.16.31.tar.xz 5087424 BLAKE2B 75c9038c00fe289161a15a8e4fdadaef5a6a7f3ca03068ec24e82aa9f30ac82d0ded9cf73df83219058cd81b198ea8f561211a323e31b41407294f6932dc61d3 SHA512 8577b4d021a5a763b8669d59ef6c3499238e87657ca94ccfc530cb9a7a215ee3682002aa6141f5731154cbc43e0e6094372961468811a68bbd2a37e20e287c7e
-DIST bind-9.16.32.tar.xz 5091860 BLAKE2B df6f2c878138015da580dfaf0e16b5a97b11ead9f99c1425a09da8484954196ea3dafb828ac3ab386200ce2b180646c7eb1e0e62a84c153162270a4a1e19a5fc SHA512 99abedf055901b43e1a85c448ee4c2dd731b7ab77de1454b73c8f9df816aa32262e70e23a8112959d94be990fd4f1c48c36611657ba745670141a7447fd53316
DIST bind-9.16.33.tar.xz 5092516 BLAKE2B 4246b61ce91af3d494ace4b8065b4c0043b2cfaf28c6de326691a969837e7d1cfbc0dac6b1e1a5182fc32af68048abcfa1202d00022951f3caa13afb03ebeb69 SHA512 43fd2cea52dfd1115a4cca83830ab5b93208be401cdbbdff2bbf204b8f0d99fb434ad3156d3a21649488cc904ae09f145feba97b9b6918b0cf063ff5e2b10af5
diff --git a/net-dns/bind-tools/bind-tools-9.16.27.ebuild b/net-dns/bind-tools/bind-tools-9.16.27.ebuild
deleted file mode 100644
index a928124efddb..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.27.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn ipv6 libedit readline xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-COMMON_DEPEND="
- dev-libs/libuv:=
- caps? ( sys-libs/libcap )
- dev-libs/openssl:=
- xml? ( dev-libs/libxml2 )
- idn? ( net-dns/libidn2:= )
- gssapi? ( virtual/krb5 )
- libedit? ( dev-libs/libedit )
- !libedit? (
- readline? ( sys-libs/readline:= )
- )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# sphinx required for man-page and html creation
-BDEPEND="
- doc? ( dev-python/sphinx )
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-src_prepare() {
- default
-
- export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
- # Disable tests for now, bug 406399
- sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
- # Do not disable thread local storage on Solaris, it works with our
- # toolchain, and it breaks further configure checks
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
-
- # bug #220361
- rm aclocal.m4 || die
- rm -rf libtool.m4/ || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --localstatedir="${EPREFIX}"/var
- --without-python
- --without-libjson
- --without-zlib
- --without-lmdb
- --without-maxminddb
- --disable-geoip
- --with-openssl="${ESYSROOT}"/usr
- $(use_with idn libidn2 "${ESYSROOT}"/usr)
- $(use_with xml libxml2)
- $(use_with gssapi)
- $(use_with readline)
- $(use_enable caps linux-caps)
- AR="$(type -P $(tc-getAR))"
- )
-
- # bug 607400
- if use libedit ; then
- myeconfargs+=( --with-readline=-ledit )
- elif use readline ; then
- myeconfargs+=( --with-readline=-lreadline )
- else
- myeconfargs+=( --without-readline )
- fi
-
- # bug 344029
- append-cflags "-DDIG_SIGCHASE"
-
- # to expose CMSG_* macros from sys/sockets.h
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
- # localstatedir for nsupdate -l, bug 395785
- tc-export BUILD_CC
- econf "${myeconfargs[@]}"
-
- # bug #151839
- echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
- local AR=$(tc-getAR)
-
- emake AR="${AR}" -C lib/
- emake AR="${AR}" -C bin/delv/
- emake AR="${AR}" -C bin/dig/
- emake AR="${AR}" -C bin/nsupdate/
- emake AR="${AR}" -C bin/dnssec/
- emake -C doc/man/ man $(usev doc)
-}
-
-src_install() {
- local man_dir="${S}/doc/man"
- local html_dir="${man_dir}/_build/html"
-
- dodoc README CHANGES
-
- cd "${S}"/bin/delv || die
- dobin delv
- doman ${man_dir}/delv.1
-
- cd "${S}"/bin/dig || die
- dobin dig host nslookup
- doman ${man_dir}/{dig,host,nslookup}.1
-
- cd "${S}"/bin/nsupdate || die
- dobin nsupdate
- doman ${man_dir}/nsupdate.1
- if use doc; then
- docinto html
- dodoc ${html_dir}/nsupdate.html
- fi
-
- cd "${S}"/bin/dnssec || die
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- dobin dnssec-"${tool}"
- doman ${man_dir}/dnssec-"${tool}".8
- if use doc; then
- docinto html
- dodoc ${html_dir}/dnssec-"${tool}".html
- fi
- done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.16.29-r1.ebuild b/net-dns/bind-tools/bind-tools-9.16.29-r1.ebuild
deleted file mode 100644
index 6ab46c310694..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.29-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn ipv6 libedit readline xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-
-COMMON_DEPEND="
- dev-libs/libuv:=
- caps? ( sys-libs/libcap )
- dev-libs/openssl:=
- xml? ( dev-libs/libxml2 )
- idn? ( net-dns/libidn2:= )
- gssapi? ( virtual/krb5 )
- libedit? ( dev-libs/libedit )
- !libedit? (
- readline? ( sys-libs/readline:= )
- )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# sphinx required for man-page and html creation
-BDEPEND="
- doc? ( dev-python/sphinx )
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# bug 479092, requires networking
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fortify-source-3.patch
-)
-
-src_prepare() {
- default
-
- export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
-
- # Disable tests for now, bug 406399
- sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
-
- # Do not disable thread local storage on Solaris, it works with our
- # toolchain, and it breaks further configure checks
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
-
- # bug #220361
- rm aclocal.m4 || die
- rm -rf libtool.m4/ || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --localstatedir="${EPREFIX}"/var
- --without-python
- --without-libjson
- --without-zlib
- --without-lmdb
- --without-maxminddb
- --disable-geoip
- --with-openssl="${ESYSROOT}"/usr
- $(use_with idn libidn2 "${ESYSROOT}"/usr)
- $(use_with xml libxml2)
- $(use_with gssapi)
- $(use_with readline)
- $(use_enable caps linux-caps)
- AR="$(type -P $(tc-getAR))"
- )
-
- # bug 607400
- if use libedit ; then
- myeconfargs+=( --with-readline=-ledit )
- elif use readline ; then
- myeconfargs+=( --with-readline=-lreadline )
- else
- myeconfargs+=( --without-readline )
- fi
-
- # bug 344029
- append-cflags "-DDIG_SIGCHASE"
-
- # to expose CMSG_* macros from sys/sockets.h
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
- # localstatedir for nsupdate -l, bug 395785
- tc-export BUILD_CC
- econf "${myeconfargs[@]}"
-
- # bug #151839
- echo '#undef SO_BSDCOMPAT' >> config.h
-}
-
-src_compile() {
- local AR=$(tc-getAR)
-
- emake AR="${AR}" -C lib/
- emake AR="${AR}" -C bin/delv/
- emake AR="${AR}" -C bin/dig/
- emake AR="${AR}" -C bin/nsupdate/
- emake AR="${AR}" -C bin/dnssec/
- emake -C doc/man/ man $(usev doc)
-}
-
-src_install() {
- local man_dir="${S}/doc/man"
- local html_dir="${man_dir}/_build/html"
-
- dodoc README CHANGES
-
- cd "${S}"/bin/delv || die
- dobin delv
- doman ${man_dir}/delv.1
-
- cd "${S}"/bin/dig || die
- dobin dig host nslookup
- doman ${man_dir}/{dig,host,nslookup}.1
-
- cd "${S}"/bin/nsupdate || die
- dobin nsupdate
- doman ${man_dir}/nsupdate.1
- if use doc; then
- docinto html
- dodoc ${html_dir}/nsupdate.html
- fi
-
- cd "${S}"/bin/dnssec || die
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- dobin dnssec-"${tool}"
- doman ${man_dir}/dnssec-"${tool}".8
- if use doc; then
- docinto html
- dodoc ${html_dir}/dnssec-"${tool}".html
- fi
- done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.16.30.ebuild b/net-dns/bind-tools/bind-tools-9.16.30.ebuild
deleted file mode 100644
index 777764136be4..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.30.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn ipv6 libedit readline test xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-libs/libuv:=
- dev-libs/openssl:=
- caps? ( sys-libs/libcap )
- xml? ( dev-libs/libxml2 )
- idn? ( net-dns/libidn2:= )
- gssapi? ( virtual/krb5 )
- libedit? ( dev-libs/libedit )
- !libedit? (
- readline? ( sys-libs/readline:= )
- )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# sphinx required for man-page and html creation
-BDEPEND="
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
- test? (
- dev-util/cmocka
- dev-util/kyua
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
-
- # Do not disable thread local storage on Solaris, it works with our
- # toolchain, and it breaks further configure checks
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
-
- # bug #220361
- rm aclocal.m4 || die
- rm -rf libtool.m4/ || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --localstatedir="${EPREFIX}"/var
- --without-python
- --without-libjson
- --without-zlib
- --without-lmdb
- --without-maxminddb
- --disable-geoip
- --with-openssl="${ESYSROOT}"/usr
- $(use_with idn libidn2 "${ESYSROOT}"/usr)
- $(use_with xml libxml2)
- $(use_with gssapi)
- $(use_with readline)
- $(use_enable caps linux-caps)
- AR="$(type -P $(tc-getAR))"
- )
-
- # bug 607400
- if use libedit ; then
- myeconfargs+=( --with-readline=-ledit )
- elif use readline ; then
- myeconfargs+=( --with-readline=-lreadline )
- else
- myeconfargs+=( --without-readline )
- fi
-
- # bug #344029
- append-cflags "-DDIG_SIGCHASE"
-
- # to expose CMSG_* macros from sys/sockets.h
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
- # localstatedir for nsupdate -l, bug #395785
- tc-export BUILD_CC
- econf "${myeconfargs[@]}"
-
- # bug #151839
- echo '#undef SO_BSDCOMPAT' >> config.h || die
-}
-
-src_compile() {
- local AR="$(tc-getAR)"
-
- emake AR="${AR}" -C lib/
- emake AR="${AR}" -C bin/delv/
- emake AR="${AR}" -C bin/dig/
- emake AR="${AR}" -C bin/nsupdate/
- emake AR="${AR}" -C bin/dnssec/
- emake -C doc/man/ man $(usev doc)
-}
-
-src_test() {
- # system tests ('emake test') require network configuration for IPs etc
- TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
-}
-
-src_install() {
- local man_dir="${S}/doc/man"
- local html_dir="${man_dir}/_build/html"
-
- dodoc README CHANGES
-
- cd "${S}"/bin/delv || die
- dobin delv
- doman ${man_dir}/delv.1
-
- cd "${S}"/bin/dig || die
- dobin dig host nslookup
- doman ${man_dir}/{dig,host,nslookup}.1
-
- cd "${S}"/bin/nsupdate || die
- dobin nsupdate
- doman ${man_dir}/nsupdate.1
- if use doc; then
- docinto html
- dodoc ${html_dir}/nsupdate.html
- fi
-
- cd "${S}"/bin/dnssec || die
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- dobin dnssec-"${tool}"
- doman ${man_dir}/dnssec-"${tool}".8
- if use doc; then
- docinto html
- dodoc ${html_dir}/dnssec-"${tool}".html
- fi
- done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.16.31.ebuild b/net-dns/bind-tools/bind-tools-9.16.31.ebuild
deleted file mode 100644
index 4a9cc94b8e64..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.31.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn libedit readline test xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-libs/libuv:=
- dev-libs/openssl:=
- caps? ( sys-libs/libcap )
- xml? ( dev-libs/libxml2 )
- idn? ( net-dns/libidn2:= )
- gssapi? ( virtual/krb5 )
- libedit? ( dev-libs/libedit )
- !libedit? (
- readline? ( sys-libs/readline:= )
- )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# sphinx required for man-page and html creation
-BDEPEND="
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
- test? (
- dev-util/cmocka
- dev-util/kyua
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
-
- # Do not disable thread local storage on Solaris, it works with our
- # toolchain, and it breaks further configure checks
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
-
- # bug #220361
- rm aclocal.m4 || die
- rm -rf libtool.m4/ || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --localstatedir="${EPREFIX}"/var
- --without-python
- --without-libjson
- --without-zlib
- --without-lmdb
- --without-maxminddb
- --disable-geoip
- --with-openssl="${ESYSROOT}"/usr
- $(use_with idn libidn2 "${ESYSROOT}"/usr)
- $(use_with xml libxml2)
- $(use_with gssapi)
- $(use_with readline)
- $(use_enable caps linux-caps)
- AR="$(type -P $(tc-getAR))"
- )
-
- # bug 607400
- if use libedit ; then
- myeconfargs+=( --with-readline=-ledit )
- elif use readline ; then
- myeconfargs+=( --with-readline=-lreadline )
- else
- myeconfargs+=( --without-readline )
- fi
-
- # bug #344029
- append-cflags "-DDIG_SIGCHASE"
-
- # to expose CMSG_* macros from sys/sockets.h
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
- # localstatedir for nsupdate -l, bug #395785
- tc-export BUILD_CC
- econf "${myeconfargs[@]}"
-
- # bug #151839
- echo '#undef SO_BSDCOMPAT' >> config.h || die
-}
-
-src_compile() {
- local AR="$(tc-getAR)"
-
- emake AR="${AR}" -C lib/
- emake AR="${AR}" -C bin/delv/
- emake AR="${AR}" -C bin/dig/
- emake AR="${AR}" -C bin/nsupdate/
- emake AR="${AR}" -C bin/dnssec/
- emake -C doc/man/ man $(usev doc)
-}
-
-src_test() {
- # system tests ('emake test') require network configuration for IPs etc
- # so we run the unit tests instead.
- TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
-}
-
-src_install() {
- local man_dir="${S}/doc/man"
- local html_dir="${man_dir}/_build/html"
-
- dodoc README CHANGES
-
- cd "${S}"/bin/delv || die
- dobin delv
- doman ${man_dir}/delv.1
-
- cd "${S}"/bin/dig || die
- dobin dig host nslookup
- doman ${man_dir}/{dig,host,nslookup}.1
-
- cd "${S}"/bin/nsupdate || die
- dobin nsupdate
- doman ${man_dir}/nsupdate.1
- if use doc; then
- docinto html
- dodoc ${html_dir}/nsupdate.html
- fi
-
- cd "${S}"/bin/dnssec || die
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- dobin dnssec-"${tool}"
- doman ${man_dir}/dnssec-"${tool}".8
- if use doc; then
- docinto html
- dodoc ${html_dir}/dnssec-"${tool}".html
- fi
- done
-}
diff --git a/net-dns/bind-tools/bind-tools-9.16.32.ebuild b/net-dns/bind-tools/bind-tools-9.16.32.ebuild
deleted file mode 100644
index 4a9cc94b8e64..000000000000
--- a/net-dns/bind-tools/bind-tools-9.16.32.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic multiprocessing toolchain-funcs
-
-MY_PN=${PN//-tools}
-MY_PV=${PV/_p/-P}
-MY_PV=${MY_PV/_rc/rc}
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
-HOMEPAGE="https://www.isc.org/software/bind https://gitlab.isc.org/isc-projects/bind9"
-SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
-
-LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+caps doc gssapi idn libedit readline test xml"
-# no PKCS11 currently as it requires OpenSSL to be patched, also see bug #409687
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-libs/libuv:=
- dev-libs/openssl:=
- caps? ( sys-libs/libcap )
- xml? ( dev-libs/libxml2 )
- idn? ( net-dns/libidn2:= )
- gssapi? ( virtual/krb5 )
- libedit? ( dev-libs/libedit )
- !libedit? (
- readline? ( sys-libs/readline:= )
- )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# sphinx required for man-page and html creation
-BDEPEND="
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
- test? (
- dev-util/cmocka
- dev-util/kyua
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)"
-
- # Do not disable thread local storage on Solaris, it works with our
- # toolchain, and it breaks further configure checks
- sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
-
- # bug #220361
- rm aclocal.m4 || die
- rm -rf libtool.m4/ || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --localstatedir="${EPREFIX}"/var
- --without-python
- --without-libjson
- --without-zlib
- --without-lmdb
- --without-maxminddb
- --disable-geoip
- --with-openssl="${ESYSROOT}"/usr
- $(use_with idn libidn2 "${ESYSROOT}"/usr)
- $(use_with xml libxml2)
- $(use_with gssapi)
- $(use_with readline)
- $(use_enable caps linux-caps)
- AR="$(type -P $(tc-getAR))"
- )
-
- # bug 607400
- if use libedit ; then
- myeconfargs+=( --with-readline=-ledit )
- elif use readline ; then
- myeconfargs+=( --with-readline=-lreadline )
- else
- myeconfargs+=( --without-readline )
- fi
-
- # bug #344029
- append-cflags "-DDIG_SIGCHASE"
-
- # to expose CMSG_* macros from sys/sockets.h
- [[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
-
- # localstatedir for nsupdate -l, bug #395785
- tc-export BUILD_CC
- econf "${myeconfargs[@]}"
-
- # bug #151839
- echo '#undef SO_BSDCOMPAT' >> config.h || die
-}
-
-src_compile() {
- local AR="$(tc-getAR)"
-
- emake AR="${AR}" -C lib/
- emake AR="${AR}" -C bin/delv/
- emake AR="${AR}" -C bin/dig/
- emake AR="${AR}" -C bin/nsupdate/
- emake AR="${AR}" -C bin/dnssec/
- emake -C doc/man/ man $(usev doc)
-}
-
-src_test() {
- # system tests ('emake test') require network configuration for IPs etc
- # so we run the unit tests instead.
- TEST_PARALLEL_JOBS="$(makeopts_jobs)" emake unit
-}
-
-src_install() {
- local man_dir="${S}/doc/man"
- local html_dir="${man_dir}/_build/html"
-
- dodoc README CHANGES
-
- cd "${S}"/bin/delv || die
- dobin delv
- doman ${man_dir}/delv.1
-
- cd "${S}"/bin/dig || die
- dobin dig host nslookup
- doman ${man_dir}/{dig,host,nslookup}.1
-
- cd "${S}"/bin/nsupdate || die
- dobin nsupdate
- doman ${man_dir}/nsupdate.1
- if use doc; then
- docinto html
- dodoc ${html_dir}/nsupdate.html
- fi
-
- cd "${S}"/bin/dnssec || die
- for tool in dsfromkey importkey keyfromlabel keygen \
- revoke settime signzone verify; do
- dobin dnssec-"${tool}"
- doman ${man_dir}/dnssec-"${tool}".8
- if use doc; then
- docinto html
- dodoc ${html_dir}/dnssec-"${tool}".html
- fi
- done
-}
diff --git a/net-dns/bind-tools/files/bind-tools-9.16.29-fortify-source-3.patch b/net-dns/bind-tools/files/bind-tools-9.16.29-fortify-source-3.patch
deleted file mode 100644
index d084d6e62ce8..000000000000
--- a/net-dns/bind-tools/files/bind-tools-9.16.29-fortify-source-3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://gitlab.isc.org/isc-projects/bind9/-/commit/b6670787d25743ddf39dfe8e615828efc928f50d
-https://gitlab.isc.org/isc-projects/bind9/-/issues/3351
-https://bugs.gentoo.org/847295
-
-From: Evan Hunt <each@isc.org>
-Date: Fri, 13 May 2022 19:59:58 -0700
-Subject: [PATCH] prevent a possible buffer overflow in configuration check
-
-corrected code that could have allowed a buffer overfow while
-parsing named.conf.
-
-(cherry picked from commit 921043b54161c7a3e6dc4036b038ca4dbc5fe472)
---- a/lib/bind9/check.c
-+++ b/lib/bind9/check.c
-@@ -2500,8 +2500,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
- } else if (dns_name_isula(zname)) {
- ula = true;
- }
-- tmp += strlen(tmp);
- len -= strlen(tmp);
-+ tmp += strlen(tmp);
- (void)snprintf(tmp, len, "%u/%s", zclass,
- (ztype == CFG_ZONE_INVIEW) ? target
- : (viewname != NULL) ? viewname
-@@ -3247,8 +3247,8 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
- char *tmp = keydirbuf;
- size_t len = sizeof(keydirbuf);
- dns_name_format(zname, keydirbuf, sizeof(keydirbuf));
-- tmp += strlen(tmp);
- len -= strlen(tmp);
-+ tmp += strlen(tmp);
- (void)snprintf(tmp, len, "/%s", (dir == NULL) ? "(null)" : dir);
- tresult = keydirexist(zconfig, (const char *)keydirbuf,
- kaspname, keydirs, logctx, mctx);
-GitLab
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-31 2:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-22 11:10 [gentoo-commits] repo/gentoo:master commit in: net-dns/bind-tools/, net-dns/bind-tools/files/ Mikle Kolyada
-- strict thread matches above, loose matches on Subject: below --
2022-10-31 1:47 John Helmert III
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox