diff options
Diffstat (limited to 'net-libs/ldns')
| -rw-r--r-- | net-libs/ldns/Manifest | 6 | ||||
| -rw-r--r-- | net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch | 15 | ||||
| -rw-r--r-- | net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch | 17 | ||||
| -rw-r--r-- | net-libs/ldns/ldns-1.7.0-r2.ebuild | 98 | ||||
| -rw-r--r-- | net-libs/ldns/ldns-1.7.1-r1.ebuild | 2 |
5 files changed, 2 insertions, 136 deletions
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest index 608a42091f46..5ad6df499e9d 100644 --- a/net-libs/ldns/Manifest +++ b/net-libs/ldns/Manifest @@ -1,8 +1,4 @@ -AUX ldns-1.7.0-CVE-2017-1000231.patch 396 BLAKE2B 60225693e684ce9b7850fa416da879b91543b08573b36eaa1da40cb26c6726930d0d0c31a68b7aa99852859ae4554cc7b111c8318ffa832c7140a1a9cae80668 SHA512 c9119730ef74aaa89a362fa5354267da7e0336873a66a9e68b1d634946ab7938ac8833a8b1dbd27d51add226008b0b9336e4e4e06f20d714b225e35cb3efcbcd -AUX ldns-1.7.0-CVE-2017-1000232.patch 469 BLAKE2B 4e17f4d13928081cef5093b51db1b1b1f393d151a5822ad4d40f385620fd7f78168e581a6e2d50164240ffe368d4926687a860f5555432d2a9b5b389a3287ea7 SHA512 2eaddaa4ab7ecf8e54a7fef341406e1f8bdb278a2caca3d8cafdebcfc349c7e3ba1247f194a5fc0fd50074c8836f29b4e5427b2ce7c3b8513191aa1b4b08c681 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d -DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7 -EBUILD ldns-1.7.0-r2.ebuild 2249 BLAKE2B 9e2df8aee72acc1adab2f9ae23edf8538881e97d2d15a092ebb83af1479f24d460e5dbc4c02dd31708dc3d12e5b860b25e93b855b63747e9555d06dd6782a565 SHA512 30dc0b7d5b0f8d8e644ca66f8ab4870dc6b3bb60baa90e243297dd6480817028a5ea783a8e20088f50d72c659c279ebf7c8a75becbae725566c22e8e17c7cd08 -EBUILD ldns-1.7.1-r1.ebuild 2743 BLAKE2B 930ef54c6483238aa0d52f16396bd74edd2bcc82d86fba6be5203ee8b122eb4204dce91a70a91b69299a6e88a6440c27b439fba272ce75cf3278b55f32b6fcac SHA512 0dae14d12743d374b0dbaf11f41a3bae4cd2a1994d741327ea08521ef65fc2ae17be6f2a2cf5a1c0f77123940e48e95fbc56c50db8c741cf1d6aa87ec8715789 +EBUILD ldns-1.7.1-r1.ebuild 2742 BLAKE2B de1880e0b2fd045e29d9dff7049f9aa188f7de93fa6b3a46d9ee04ce979c442a13342ddc8ce7c999a19521741aaa72664ec8c0c00e33875e0f18513dae30ebb6 SHA512 7d07ce2d6fb1957533eadf0ed705b2e76128676b88fb48253683b4100b9d2c93bf242164cdf3b5164b3e32c96058ab7ff2c04873cea0ff7265946c4c7b478260 MISC metadata.xml 849 BLAKE2B 5a0c468d958b8be1956d1b1e27d19d4c278064083a0be71de56189b6a185625b2cb5752030ff0100faccc131e37593952e7c8fc68c975548fef944f0360cbf61 SHA512 af85a3ec41e590ff505fd78ff53f716ff0d6cd70dd4a603a37f7fb32487370dccdf893bdf3aa6ad0a1cb835ca1d30b7a78124ca12328526f4abf2ee55d7e4e85 diff --git a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch b/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch deleted file mode 100644 index 9ff92e25c75e..000000000000 --- a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/parse.c b/parse.c -index e68627c..947dbb8 100644 ---- a/parse.c -+++ b/parse.c -@@ -118,6 +118,10 @@ ldns_fget_token_l(FILE *f, char *token, const char *delim, size_t limit, int *li - if (line_nr) { - *line_nr = *line_nr + 1; - } -+ if (limit > 0 && (i >= limit || (size_t)(t-token) >= limit)) { -+ *t = '\0'; -+ return -1; -+ } - *t++ = ' '; - prev_c = c; - continue; diff --git a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch b/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch deleted file mode 100644 index 341dfa5916e4..000000000000 --- a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/str2host.c b/str2host.c -index b274b17..f2a317b 100644 ---- a/str2host.c -+++ b/str2host.c -@@ -1525,8 +1525,10 @@ ldns_str2rdf_long_str(ldns_rdf **rd, const char *str) - if (! str) { - return LDNS_STATUS_SYNTAX_BAD_ESCAPE; - } -- length = (size_t)(dp - data); -- -+ if (!(length = (size_t)(dp - data))) { -+ LDNS_FREE(data); -+ return LDNS_STATUS_SYNTAX_EMPTY; -+ } - /* Lose the overmeasure */ - data = LDNS_XREALLOC(dp = data, uint8_t, length); - if (! data) { diff --git a/net-libs/ldns/ldns-1.7.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild deleted file mode 100644 index c55730be0304..000000000000 --- a/net-libs/ldns/ldns-1.7.0-r2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils ltprune multilib-minimal python-single-r1 - -DESCRIPTION="a library with the aim to simplify DNS programming in C" -HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/" -SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="+dane doc +ecdsa gost libressl python static-libs vim-syntax" - -# configure will die if ecdsa is enabled and ssl is not -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - python? ( ${PYTHON_DEPS} ) - ecdsa? ( - !libressl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}] ) - ) - !libressl? ( >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}] ) - libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - python? ( dev-lang/swig ) - doc? ( app-doc/doxygen ) -" - -RESTRICT="test" # 1.6.9 has no test directory - -MULTILIB_CHOST_TOOLS=( - /usr/bin/ldns-config -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - $(use_enable gost) \ - $(use_enable ecdsa) \ - $(use_enable dane) \ - $(multilib_native_use_with python pyldns) \ - $(multilib_native_use_with python pyldnsx) \ - --with-ssl="${EPREFIX}"/usr \ - --enable-sha2 \ - --without-drill \ - --without-examples \ - --disable-dane-ta-usage \ - --disable-rpath - - # >=openssl-1.1.0 required for dane-ta -} - -src_prepare() { - epatch "${FILESDIR}/${P}-CVE-2017-1000231.patch" - epatch "${FILESDIR}/${P}-CVE-2017-1000232.patch" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc ; then - emake doxygen - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc ; then - dohtml -r doc/html/. - fi -} - -multilib_src_install_all() { - dodoc Changelog README* - - prune_libtool_files --modules - use python && python_optimize - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect - doins libdns.vim - fi - - einfo - elog "Install net-dns/ldns-utils if you want drill and examples" - einfo -} diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r1.ebuild index fb249bb22ad9..0c10feffa979 100644 --- a/net-libs/ldns/ldns-1.7.1-r1.ebuild +++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0/3" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+dane doc +ecdsa ed25519 ed448 gost libressl python static-libs vim-syntax" # configure will die if ecdsa is enabled and ssl is not |