commit: 80e6c07ef5327cec5616036501de92e408fb1425
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 07:33:32 2018 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue May 22 07:34:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e6c07e
net-dns/bind: Version, bug 656038, CVE-2018-5736 / CVE-2018-5737
Package-Manager: Portage-2.3.37, Repoman-2.3.9
net-dns/bind/Manifest | 3 +-
.../{bind-9.12.1.ebuild => bind-9.11.3.ebuild} | 32 +++-------------------
.../{bind-9.12.1.ebuild => bind-9.12.1_p2.ebuild} | 0
3 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 08da7d21332..e355c6a9f1e 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,3 +1,4 @@
DIST bind-9.11.2_p1.tar.gz 9783329 BLAKE2B
5a3bbd87112064231bd5e6b09ebb4014f9d5cf65cb601c03555ff540a22d87aec3990cd8e37ce5ff09e9a149bdf122d20ecb01f87731e6c79d80379a6926014f
SHA512
168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597
-DIST bind-9.12.1.tar.gz 9302783 BLAKE2B
731ce67acb22f72e54de1122c5d5c3c1f0663c400bdff9545578a45e5fe3094c6d754351e57dd5c52cdfe1528305dfde25eba7382a723a60b8bfdfeebb9536cd
SHA512
701e34a0a3313568c8e5cf76668fefc2a1fceb2ade0de201b8f678401569f1c622c3d1657a71772fa3298efc8b3cdefe974d98432c0087e8b45af3d50a4262fb
+DIST bind-9.11.3.tar.gz 9523375 BLAKE2B
978986e02767b8ac9f015b52e87b3bc161a7ea72f59f343dcb23f50fbe8474528c4b27ee4fd54bdbe6bd825ce6e8b164e8ad145260b2cdcd004e8892bacd313b
SHA512
1f0da13165d1ee872800fe10bb8b0f69c6c76515f9861c1528fb6005213bb71b21a1270906d2ea9ded3eaf6df1a1bac0f2c80aa511683b8d57dcff4f278d8c35
+DIST bind-9.12.1_p2.tar.gz 9305005 BLAKE2B
6be328e9e14a26d17c2f789aafc1f83a4690db0b0ae2aeac7dcc4b54a0e5d228692475a39160599fc5c6fd7ed8733d2f0bbac65a20c513f5fa7b6b49ad4b09ae
SHA512
de47eef272c437316444c4f585a2f98ae9169fc118fd057464a5cd064bb9079ffc07145dabf388cd240f56a5ad6d3ad78cf8d98fc37609681eba5d87e18a4f9a
DIST dyndns-samples.tbz2 22866 BLAKE2B
409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108
SHA512
83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
diff --git a/net-dns/bind/bind-9.12.1.ebuild b/net-dns/bind/bind-9.11.3.ebuild
similarity index 95%
copy from net-dns/bind/bind-9.12.1.ebuild
copy to net-dns/bind/bind-9.11.3.ebuild
index c4deb022483..4da95bc7613 100644
--- a/net-dns/bind/bind-9.12.1.ebuild
+++ b/net-dns/bind/bind-9.11.3.ebuild
@@ -40,8 +40,8 @@ LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# -berkdb by default re bug 602682
-IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi idn
ipv6
-json ldap libressl lmdb mysql nslint odbc postgres python rpz seccomp selinux
ssl static-libs
+IUSE="-berkdb +caps dlz dnstap doc filter-aaaa fixed-rrset geoip gost gssapi
idn ipv6
+json ldap libressl lmdb mysql odbc postgres python rpz seccomp selinux ssl
static-libs
+threads urandom xml +zlib"
# sdb-ldap - patch broken
# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
@@ -65,7 +65,7 @@ DEPEND="
mysql? ( >=virtual/mysql-4.0 )
odbc? ( >=dev-db/unixODBC-2.2.6 )
ldap? ( net-nds/openldap )
- idn? ( <net-dns/idnkit-2:= )
+ idn? ( net-dns/idnkit )
postgres? ( dev-db/postgresql:= )
caps? ( >=sys-libs/libcap-2.1.0 )
xml? ( dev-libs/libxml2 )
@@ -127,10 +127,6 @@ src_prepare() {
# Disable tests for now, bug 406399
sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
- if use nslint; then
- sed -i -e 's:/etc/named.conf:/etc/bind/named.conf:'
${NSLINT_DIR}/nslint.{c,8} || die
- fi
-
# bug #220361
rm aclocal.m4
rm -rf libtool.m4/
@@ -162,7 +158,7 @@ src_configure() {
--enable-full-report \
--without-readline \
$(use_enable caps linux-caps) \
- $(use_enable dnsrps) \
+ $(use_enable filter-aaaa) \
$(use_enable fixed-rrset) \
$(use_enable ipv6) \
$(use_enable rpz rpz-nsdname) \
@@ -193,31 +189,11 @@ src_configure() {
# bug #151839
echo '#undef SO_BSDCOMPAT' >> config.h
-
- if use nslint; then
- cd $NSLINT_DIR
- econf
- fi
-}
-
-src_compile() {
- emake
-
- if use nslint; then
- emake -C $NSLINT_DIR CCOPT="${CFLAGS}"
- fi
}
src_install() {
emake DESTDIR="${D}" install
- if use nslint; then
- cd $NSLINT_DIR
- dobin nslint
- doman nslint.8
- cd "${S}"
- fi
-
dodoc CHANGES README
if use idn; then
diff --git a/net-dns/bind/bind-9.12.1.ebuild
b/net-dns/bind/bind-9.12.1_p2.ebuild
similarity index 100%
rename from net-dns/bind/bind-9.12.1.ebuild
rename to net-dns/bind/bind-9.12.1_p2.ebuild
