diff options
Diffstat (limited to 'net-dns')
| -rw-r--r-- | net-dns/bind-tools/Manifest | 8 | ||||
| -rw-r--r-- | net-dns/bind-tools/bind-tools-9.15.4.ebuild | 139 | ||||
| -rw-r--r-- | net-dns/bind/Manifest | 8 | ||||
| -rw-r--r-- | net-dns/bind/bind-9.15.4.ebuild | 366 | ||||
| -rw-r--r-- | net-dns/dnsmasq/Manifest | 4 | ||||
| -rw-r--r-- | net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-dns/getdns/Manifest | 6 | ||||
| -rw-r--r-- | net-dns/getdns/getdns-1.5.1.ebuild | 6 | ||||
| -rw-r--r-- | net-dns/getdns/getdns-1.5.2-r2.ebuild | 6 | ||||
| -rw-r--r-- | net-dns/getdns/metadata.xml | 4 |
10 files changed, 540 insertions, 11 deletions
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest index 4ef5d607d145..37407f3a6377 100644 --- a/net-dns/bind-tools/Manifest +++ b/net-dns/bind-tools/Manifest @@ -2,6 +2,7 @@ AUX sparc-pause-instruction.patch 4109 BLAKE2B e0a705c5b29033f54ae5d707a0159d881 DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932 DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084 DIST bind-9.14.6.tar.gz 6314291 BLAKE2B f114cf3516e863656d1b0f3bbc634c5b5f5c539ffa4591cbe09f7cc1e26f30b0bff2d4913297b73304387944ba249b847b7983d4279d625645ec64387a0121ed SHA512 129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366 +<<<<<<< HEAD DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646 DIST bind-9.15.3.tar.gz 6296471 BLAKE2B 30815330f4273b7b6df34857fdd7d03490e03e3d340986c01c1d382927480bcd6c01cefdb689c7c397cbb1495b1f06503dbeb425a823a5c676211d45b7b6663a SHA512 2c594c48f1e06c6ab2e0977473fbdb8d3bdbf089bc5c727424510f1bec3fc6dac9a21206724e886f6a88d1e8098aa3b03aed226a92ae91a6c7f3528187288cc0 EBUILD bind-tools-9.14.4.ebuild 3229 BLAKE2B cb70c1a055c7a51fd1be5ce461fc50f327ac7f283f46cc07c5687b90dd82667d3e5aa205590031d80fddb3ffa9eebd560995fcebdde05511a75b93465b2bd84f SHA512 81fa51660bb87b57a013d075275cad7efaa373c8896eeb4069991a2470318d4b8f32a6e8af8646062a477d38e5ae764ef8cdffc4eb1fc843ddc6c6d10dade19a @@ -9,4 +10,11 @@ EBUILD bind-tools-9.14.5.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d6614 EBUILD bind-tools-9.14.6.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908 EBUILD bind-tools-9.15.2.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8 EBUILD bind-tools-9.15.3.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8 +======= +DIST bind-9.15.4.tar.gz 6307930 BLAKE2B e57c5874b18abb8daddee03ecca35ecc422106428b408f078b3e7beb42d986165f853c985996b70343c0cea113389edd2ea4fc53440328b352818def913d4bd7 SHA512 bd6ac320c553253f4c6befe9c5237f31e1172c35b14e34946b5082b333621f246755b2d2856542bee68f4cc411e955ac7dd4c84e2c7155949cbcfe469b5ae709 +EBUILD bind-tools-9.14.4.ebuild 3229 BLAKE2B cb70c1a055c7a51fd1be5ce461fc50f327ac7f283f46cc07c5687b90dd82667d3e5aa205590031d80fddb3ffa9eebd560995fcebdde05511a75b93465b2bd84f SHA512 81fa51660bb87b57a013d075275cad7efaa373c8896eeb4069991a2470318d4b8f32a6e8af8646062a477d38e5ae764ef8cdffc4eb1fc843ddc6c6d10dade19a +EBUILD bind-tools-9.14.5.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908 +EBUILD bind-tools-9.14.6.ebuild 3182 BLAKE2B c34d1ace448997072409bfa1dc8703d66144bed782a5f5230583e0a253ca939736066caed21b930c312461f0ffb85d6ad3bfdae8bf9c4d4700eb044dc5780ef9 SHA512 3cae05cfcc0eab421778ddd3bb05ef863172ab00d73ea4397ab22a61fefc96e95bb7849f3c4496914271bbc6fc2aeef18ba866cbd905ac3daa4bfd93f927f908 +EBUILD bind-tools-9.15.4.ebuild 2964 BLAKE2B acd790353295ad0443255398cf2db941c09b2436b0cf0509ff5202ef402f58a0b1bb62ff153e1a5223bb72a27a07d20cc31d1ee70c258d7fe5081c8beace097b SHA512 b549bfaf7c0ba3a33d6a194cf318fddc169fe2a332d09d95eaa90d1d0d8f3f50365592f91202ae9e9472268a2a1fa41dc98949fa4a3fb07d4823b4738ec3b1d8 +>>>>>>> next MISC metadata.xml 488 BLAKE2B 44d0112102447f6d6f8c76aa5e3018de5fc4746240a1a7f187cb7bc493e9a442812c5b0f1c4a8a0a3410af12fbd2e390f6291c981440840b42348f403a278e2c SHA512 ac2a79f4622fd4aa957f9ad0618c631d4c68497443015bbd12c1670576d4515649f26c39c555046771b2aadd5f9b53fdc4c478ba7fb07e24f06b3a4f30f071e0 diff --git a/net-dns/bind-tools/bind-tools-9.15.4.ebuild b/net-dns/bind-tools/bind-tools-9.15.4.ebuild new file mode 100644 index 000000000000..5a710f6efc50 --- /dev/null +++ b/net-dns/bind-tools/bind-tools-9.15.4.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2019 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.gz" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="" +IUSE="+caps doc gssapi idn ipv6 libedit libressl readline xml" +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +COMMON_DEPEND=" + caps? ( sys-libs/libcap ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + xml? ( dev-libs/libxml2 ) + idn? ( net-dns/libidn2:= ) + gssapi? ( virtual/krb5 ) + libedit? ( dev-libs/libedit ) + !libedit? ( + readline? ( sys-libs/readline:0= ) + )" + +DEPEND="${COMMON_DEPEND}" + +RDEPEND="${COMMON_DEPEND} + !<net-dns/bind-9.10.2" + +BDEPEND="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 + + # 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 + --with-openssl="${EPREFIX}"/usr + $(use_with idn libidn2) + $(use_with xml libxml2) + $(use_with gssapi) + $(use_with readline) + $(use_enable caps linux-caps) + ) + + # 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/ +} + +src_install() { + dodoc README CHANGES + + cd "${S}"/bin/delv || die + dobin delv + doman delv.1 + + cd "${S}"/bin/dig || die + dobin dig host nslookup + doman {dig,host,nslookup}.1 + + cd "${S}"/bin/nsupdate || die + dobin nsupdate + doman nsupdate.1 + if use doc; then + docinto html + dodoc nsupdate.html + fi + + cd "${S}"/bin/dnssec || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + dobin dnssec-"${tool}" + doman dnssec-"${tool}".8 + if use doc; then + docinto html + dodoc dnssec-"${tool}".html + fi + done +} diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest index f1d6fa144e36..9da0fae19929 100644 --- a/net-dns/bind/Manifest +++ b/net-dns/bind/Manifest @@ -10,12 +10,20 @@ AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826b DIST bind-9.14.4.tar.gz 6295768 BLAKE2B c433344d2b431ebb2e9920a6d0af1dc6cf65df1e347c2a77882a7dd2ea165f9a91324edbd7171e6bab7487e13049e38d23a514323f1b4cc74a6ce1f5377f1589 SHA512 f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932 DIST bind-9.14.5.tar.gz 6313555 BLAKE2B 46bde0f6f78ee15357bca0129022a6dd88941f633513a8d768b53d9c3bc0f4f7af4d8dc8cc4b1d6119d148700703b2fa27b6834671dcb5df9b544e4a2025452b SHA512 1b18eda5dea639f9b34e1c41b534704b0d5f64c036b766c9cfccf9bbeb586ce4ea7f0d098a5b2747e88aa403e48ad8ae0b6e560e93348f0dc7616f914671d084 DIST bind-9.14.6.tar.gz 6314291 BLAKE2B f114cf3516e863656d1b0f3bbc634c5b5f5c539ffa4591cbe09f7cc1e26f30b0bff2d4913297b73304387944ba249b847b7983d4279d625645ec64387a0121ed SHA512 129cb6c8e18fabf9f9fda91afa06fccf65e7009b2e8f9f7c1960f0039d35c22614986fbea36ca0b7bbc74995e380df083a641cf51601a0cf0c87e7dbb77a0366 +<<<<<<< HEAD DIST bind-9.15.2.tar.gz 6303402 BLAKE2B c8a16a80c9f690adb61284b27a619b4dbe120eadad7b38138da099a1d5a1171443da6e1c717e876e2739ee4d543cb00665c07fac460a256b178bace96510f4a3 SHA512 df7499bc3eeabf39eebfe346efe15631929cd7287e12fc6b04baea90c332a02fc4b9a8d40f043e308ebd61a82baafb5cf9e69654511dc9a2dcb7415597d5a646 DIST bind-9.15.3.tar.gz 6296471 BLAKE2B 30815330f4273b7b6df34857fdd7d03490e03e3d340986c01c1d382927480bcd6c01cefdb689c7c397cbb1495b1f06503dbeb425a823a5c676211d45b7b6663a SHA512 2c594c48f1e06c6ab2e0977473fbdb8d3bdbf089bc5c727424510f1bec3fc6dac9a21206724e886f6a88d1e8098aa3b03aed226a92ae91a6c7f3528187288cc0 +======= +DIST bind-9.15.4.tar.gz 6307930 BLAKE2B e57c5874b18abb8daddee03ecca35ecc422106428b408f078b3e7beb42d986165f853c985996b70343c0cea113389edd2ea4fc53440328b352818def913d4bd7 SHA512 bd6ac320c553253f4c6befe9c5237f31e1172c35b14e34946b5082b333621f246755b2d2856542bee68f4cc411e955ac7dd4c84e2c7155949cbcfe469b5ae709 +>>>>>>> next DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac EBUILD bind-9.14.4.ebuild 11646 BLAKE2B 8112eb9963f76aeab8b708d1f859fb23fb9bdca794c5608dd62f97f616f2344288e895ef3b2d4201ee8efb14d935b73d38808b03efcba364f27c610e3d56990c SHA512 1318ea4e198956c1f28cddb2d5ed05b8583f02b4d03bc006183341690e19213f29f3a9f514a70e2ed2c22c969f4dfe35cbf3b32e7cd55a7ffb2d0008d565b213 EBUILD bind-9.14.5.ebuild 11355 BLAKE2B cfecd5bcd818c0d877d2e9fac5936351ce5d445a06c5f07e18ed22f0125bdb7054d9b6abe64f6ad42f0f2abe8d4daaffb1ff95b6d72ff5f80e3556468b934936 SHA512 b948632349e8ff57fb252396b78fca62acb7bbab2d28d5128cc9d7700df5f1ab570f101026c8a518512c7747fe904af40fbfc01f158f6e81395c69169c2c5c02 EBUILD bind-9.14.6.ebuild 11355 BLAKE2B cfecd5bcd818c0d877d2e9fac5936351ce5d445a06c5f07e18ed22f0125bdb7054d9b6abe64f6ad42f0f2abe8d4daaffb1ff95b6d72ff5f80e3556468b934936 SHA512 b948632349e8ff57fb252396b78fca62acb7bbab2d28d5128cc9d7700df5f1ab570f101026c8a518512c7747fe904af40fbfc01f158f6e81395c69169c2c5c02 +<<<<<<< HEAD EBUILD bind-9.15.2.ebuild 11454 BLAKE2B 6c1ea71ffab3a2b9e3391da5250dc92d93a811faa88a837e14b2893d07696e669f97ecd62db0b5aaf66928b03487a720b8d45063e9d6ed83da496c8d45f57e21 SHA512 88022b4c1dc7a3065bd5cef960f1eeb9954e1f7f399472af5d9374838b95897130cb3f5565bd626b76b2a8574182095f7bc1d3909ff0f024ea85eed4583a6b63 EBUILD bind-9.15.3.ebuild 11458 BLAKE2B 62acb41ae664893fdd657cdc5466bd14de8cdb5f91f16f644a0ca0edb31fd0237a053ed770c3309b9f9bbe2d480aa2c60ca173d611fab845c604bf178955bafe SHA512 7a55459af4d9f45783de288e512aedb591c73359807ea30cc31ed662b08f7242755dc7c74307472098acc148611a7bc2957749b3051b321d4487bfa6cc084b7d +======= +EBUILD bind-9.15.4.ebuild 10943 BLAKE2B 73d58287c568a030ccd5c204645d1a15141506b20d32e5417089afb2d03db3e4efb07483af45d34d6bcf29adee36c1a1ce6b04adbe7d186d7b672c03a8a010dd SHA512 ef1ce8e4337b20521c04ef392fbf18f083a065c93683190b32c02c377a392308a3bae444268f735a1533e24d7435dd07e26b4abbb5cd3b2b920f237a5507edcf +>>>>>>> next MISC metadata.xml 1188 BLAKE2B 6da9a02bb959544829b980c3edfbe859b73e9f21485e78a23c00d9351fd933de5ba668ebffcffbec7da118116d95232ccaae7d4528de9c2dac6565cabc4f29cc SHA512 0589922970d0998c59e48e485c4475eede9a04cc5b029e1c4c2988d478e72287230613003777034b1df98042c0e7b4f79cfe22585c108b2c668d20710d43c655 diff --git a/net-dns/bind/bind-9.15.4.ebuild b/net-dns/bind/bind-9.15.4.ebuild new file mode 100644 index 000000000000..bcd5b8bfe745 --- /dev/null +++ b/net-dns/bind/bind-9.15.4.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Re dlz/mysql and threads, needs to be verified.. +# MySQL uses thread local storage in its C api. Thus MySQL +# requires that each thread of an application execute a MySQL +# thread initialization to setup the thread local storage. +# This is impossible to do safely while staying within the DLZ +# driver API. This is a limitation caused by MySQL, and not the DLZ API. +# Because of this BIND MUST only run with a single thread when +# using the MySQL driver. + +EAPI=7 + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit python-r1 eutils autotools toolchain-funcs flag-o-matic multilib db-use user systemd + +MY_PV="${PV/_p/-P}" +MY_PV="${MY_PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +SDB_LDAP_VER="1.1.0-fc14" + +RRL_PV="${MY_PV}" + +# SDB-LDAP: http://bind9-ldap.bayour.com/ + +DESCRIPTION="Berkeley Internet Name Domain - Name Server" +HOMEPAGE="https://www.isc.org/software/bind" +SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.gz + doc? ( mirror://gentoo/dyndns-samples.tbz2 )" +# sdb-ldap? ( +# http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-${SDB_LDAP_VER}.patch.bz2 +# )" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0" +SLOT="0" +KEYWORDS="" +# -berkdb by default re bug 602682 +IUSE="-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gssapi +json ldap libressl lmdb mysql odbc postgres python selinux static-libs +urandom xml +zlib" +# sdb-ldap - patch broken +# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687 + +REQUIRED_USE=" + postgres? ( dlz ) + berkdb? ( dlz ) + mysql? ( dlz ) + odbc? ( dlz ) + ldap? ( dlz ) + python? ( ${PYTHON_REQUIRED_USE} )" +# sdb-ldap? ( dlz ) + +DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) + libressl? ( dev-libs/libressl ) + mysql? ( dev-db/mysql-connector-c:0= ) + odbc? ( >=dev-db/unixODBC-2.2.6 ) + ldap? ( net-nds/openldap ) + postgres? ( dev-db/postgresql:= ) + caps? ( >=sys-libs/libcap-2.1.0 ) + xml? ( dev-libs/libxml2 ) + geoip? ( >=dev-libs/geoip-1.4.6 ) + gssapi? ( virtual/krb5 ) + json? ( dev-libs/json-c:= ) + lmdb? ( dev-db/lmdb ) + zlib? ( sys-libs/zlib ) + dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) + python? ( + ${PYTHON_DEPS} + dev-python/ply[${PYTHON_USEDEP}] + )" +# sdb-ldap? ( net-nds/openldap ) + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-bind ) + || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )" + +S="${WORKDIR}/${MY_P}" + +# bug 479092, requires networking +RESTRICT="test" + +pkg_setup() { + ebegin "Creating named group and user" + enewgroup named 40 + enewuser named 40 -1 /etc/bind named + eend ${?} +} + +src_prepare() { + default + + export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)" + + # Adjusting PATHs in manpages + for i in bin/{named/named.8,check/named-checkconf.8,rndc/rndc.8} ; do + sed -i \ + -e 's:/etc/named.conf:/etc/bind/named.conf:g' \ + -e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \ + -e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \ + "${i}" || die "sed failed, ${i} doesn't exist" + done + +# if use dlz; then +# # sdb-ldap patch as per bug #160567 +# # Upstream URL: http://bind9-ldap.bayour.com/ +# # New patch take from bug 302735 +# if use sdb-ldap; then +# epatch "${WORKDIR}"/${PN}-sdb-ldap-${SDB_LDAP_VER}.patch +# cp -fp contrib/sdb/ldap/ldapdb.[ch] bin/named/ +# cp -fp contrib/sdb/ldap/{ldap2zone.1,ldap2zone.c} bin/tools/ +# cp -fp contrib/sdb/ldap/{zone2ldap.1,zone2ldap.c} bin/tools/ +# fi +# fi + + # should be installed by bind-tools + sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die + + # Disable tests for now, bug 406399 + sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die + + # bug #220361 + rm aclocal.m4 || die + rm -rf libtool.m4/ || die + eautoreconf +} + +src_configure() { + local myeconfargs=( + --sysconfdir=/etc/bind + --localstatedir=/var + --with-libtool + --enable-full-report + --without-readline + --with-openssl="${EPREFIX}"/usr + $(use_enable caps linux-caps) + $(use_enable dnsrps) + $(use_enable dnstap) + $(use_enable fixed-rrset) + # $(use_enable static-libs static) + $(use_with berkdb dlz-bdb) + $(use_with dlz dlopen) + $(use_with dlz dlz-filesystem) + $(use_with dlz dlz-stub) + $(use_with gssapi) + $(use_with json libjson) + $(use_with ldap dlz-ldap) + $(use_with mysql dlz-mysql) + $(use_with odbc dlz-odbc) + $(use_with postgres dlz-postgres) + $(use_with lmdb) + $(use_with python) + $(use_with xml libxml2) + $(use_with zlib) + ) + + use geoip && myeconfargs+=( --enable-geoip ) + + # bug #158664 +# gcc-specs-ssp && replace-flags -O[23s] -O + + # To include db.h from proper path + use berkdb && append-flags "-I$(db_includedir)" + + export BUILD_CC=$(tc-getBUILD_CC) + econf "${myeconfargs[@]}" + + # bug #151839 + echo '#undef SO_BSDCOMPAT' >> config.h +} + +src_install() { + default + + dodoc CHANGES README + + if use doc; then + dodoc doc/arm/Bv9ARM.pdf + + docinto misc + dodoc -r doc/misc/ + + # might a 'html' useflag make sense? + docinto html + dodoc -r doc/arm/ + + docinto contrib + dodoc contrib/scripts/{nanny.pl,named-bootconf.sh} + + # some handy-dandy dynamic dns examples + pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die + tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die + popd 1>/dev/null || die + fi + + insinto /etc/bind + newins "${FILESDIR}"/named.conf-r8 named.conf + + # ftp://ftp.rs.internic.net/domain/named.cache: + insinto /var/bind + newins "${FILESDIR}"/named.cache-r3 named.cache + + insinto /var/bind/pri + newins "${FILESDIR}"/localhost.zone-r3 localhost.zone + + newinitd "${FILESDIR}"/named.init-r13 named + newconfd "${FILESDIR}"/named.confd-r7 named + + newenvd "${FILESDIR}"/10bind.env 10bind + + # Let's get rid of those tools and their manpages since they're provided by bind-tools + rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup}.1* || die + rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die + rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die + rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die + for tool in dsfromkey importkey keyfromlabel keygen \ + revoke settime signzone verify; do + rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die + rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die + done + + # bug 405251, library archives aren't properly handled by --enable/disable-static + if ! use static-libs; then + find "${ED}" -type f -name '*.a' -delete || die + fi + + # bug 405251 + find "${ED}" -type f -name '*.la' -delete || die + + if use python; then + install_python_tools() { + dosbin bin/python/dnssec-{checkds,coverage} + } + python_foreach_impl install_python_tools + + python_replicate_script "${ED%/}/usr/sbin/dnssec-checkds" + python_replicate_script "${ED%/}/usr/sbin/dnssec-coverage" + fi + + # bug 450406 + dosym named.cache /var/bind/root.cache + + dosym "${ED}"/var/bind/pri /etc/bind/pri + dosym "${ED}"/var/bind/sec /etc/bind/sec + dosym "${ED}"/var/bind/dyn /etc/bind/dyn + keepdir /var/bind/{pri,sec,dyn} + + dodir /var/log/named + + fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn} + fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf} + fperms 0750 /etc/bind /var/bind/pri + fperms 0770 /var/log/named /var/bind/{,sec,dyn} + + systemd_newunit "${FILESDIR}/named.service-r1" named.service + systemd_dotmpfilesd "${FILESDIR}"/named.conf + exeinto /usr/libexec + doexe "${FILESDIR}/generate-rndc-key.sh" +} + +pkg_postinst() { + if [ ! -f '/etc/bind/rndc.key' ]; then + if use urandom; then + einfo "Using /dev/urandom for generating rndc.key" + /usr/sbin/rndc-confgen -r /dev/urandom -a + echo + else + einfo "Using /dev/random for generating rndc.key" + /usr/sbin/rndc-confgen -a + echo + fi + chown root:named /etc/bind/rndc.key || die + chmod 0640 /etc/bind/rndc.key || die + fi + + einfo + einfo "You can edit /etc/conf.d/named to customize named settings" + einfo + use mysql || use postgres || use ldap && { + elog "If your named depends on MySQL/PostgreSQL or LDAP," + elog "uncomment the specified rc_named_* lines in your" + elog "/etc/conf.d/named config to ensure they'll start before bind" + einfo + } + einfo "If you'd like to run bind in a chroot AND this is a new" + einfo "install OR your bind doesn't already run in a chroot:" + einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named." + einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`" + einfo + + CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT}) + if [[ -n ${CHROOT} ]]; then + elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + elog "To enable the old behaviour (without using mount) uncomment the" + elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + elog "If you decide to use the new/default method, ensure to make backup" + elog "first and merge your existing configs/zones to /etc/bind and" + elog "/var/bind because bind will now mount the needed directories into" + elog "the chroot dir." + fi +} + +pkg_config() { + CHROOT=$(source /etc/conf.d/named; echo ${CHROOT}) + CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT}) + CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP}) + + if [[ -z "${CHROOT}" ]]; then + eerror "This config script is designed to automate setting up" + eerror "a chrooted bind/named. To do so, please first uncomment" + eerror "and set the CHROOT variable in '/etc/conf.d/named'." + die "Unset CHROOT" + fi + if [[ -d "${CHROOT}" ]]; then + ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!" + ewarn "To enable the old behaviour (without using mount) uncomment the" + ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config." + ewarn + ewarn "${CHROOT} already exists... some things might become overridden" + ewarn "press CTRL+C if you don't want to continue" + sleep 10 + fi + + echo; einfo "Setting up the chroot directory..." + + mkdir -m 0750 -p ${CHROOT} || die + mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die + mkdir -m 0750 -p ${CHROOT}/etc/bind || die + mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die + + chown root:named \ + ${CHROOT} \ + ${CHROOT}/var/{bind,log/named} \ + ${CHROOT}/run/named/ \ + ${CHROOT}/etc/bind \ + || die + + mknod ${CHROOT}/dev/null c 1 3 || die + chmod 0666 ${CHROOT}/dev/null || die + + mknod ${CHROOT}/dev/zero c 1 5 || die + chmod 0666 ${CHROOT}/dev/zero || die + + if use urandom; then + mknod ${CHROOT}/dev/urandom c 1 9 || die + chmod 0666 ${CHROOT}/dev/urandom || die + else + mknod ${CHROOT}/dev/random c 1 8 || die + chmod 0666 ${CHROOT}/dev/random || die + fi + + if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then + cp -a /etc/bind ${CHROOT}/etc/ || die + cp -a /var/bind ${CHROOT}/var/ || die + fi + + if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then + mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die + fi + + elog "You may need to add the following line to your syslog-ng.conf:" + elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };" +} diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest index 7b71a162652f..c1b877025e50 100644 --- a/net-dns/dnsmasq/Manifest +++ b/net-dns/dnsmasq/Manifest @@ -8,6 +8,10 @@ AUX dnsmasq.service-r1 278 BLAKE2B 3bfe6a01efd5f8338c3bb134a061f8ecbef850293c4a8 DIST dnsmasq-2.79.tar.xz 493036 BLAKE2B 91152c52aef06def74151f6fbae9153d25261ba5e6a728cbab503c074967963e40dce39d93a0fbe4c5497c9313ac24d495cc8233934c00d4ab82aefe83b01ccd SHA512 2c06212696ab55e1584f6133872f5b196013509e4b1822d0457787b456e14341afdde887749e370a2e512124cb4138f012f4601b08690707be4acc7cf2f2876f DIST dnsmasq-2.80.tar.xz 501072 BLAKE2B 39c9808df43a22e32286105c9e001b2f817a4f68b92b84282eeb8cfeaa61404d64275bbb3f944bec6fac1b015987fba6aeab7a88201446c0cff67f02c8d88d8c SHA512 58e56beb553fc41311e5dc16d8b0eb3b6801e2bdfbcd0e7a6659703f08960b6ad10d48b0b14a4d727636faf35483e01597cff2ae49e7fe9fa9e214f437b1c068 EBUILD dnsmasq-2.79.ebuild 4594 BLAKE2B 28cf745cd261bf067114adc98733f5e00a2f6a10a906d4eaf2175c0457d538d7d96b91fe87a87320c3df27a5c64234ed7d5bbee993070964fa421b8e5b12693c SHA512 eb8ac4fdf747657983909b22baa2e0af5f2299d2a5ab4d97933b185e528cddbb1d4cc7ca14c2efddcd8c6f4ec9861f3c37d9fc59c96b68f55c45a274acf7eff7 +<<<<<<< HEAD EBUILD dnsmasq-2.80-r1.ebuild 4803 BLAKE2B f596685ea68a061c1319b6f49c9d27089bc0ef36822d6074cc70e02155d4866a97c2059077901b0576c96bf09ba6328bb74bc6f720553e635ca3758381ac05f9 SHA512 69fd9a952d9414842bc9cabec39b3ab065010ebcd93c6804208d7fb6085e0917c9a00679cc84b36fef2591b3bf838319a5d4f94f499f5d25b197ed9b28f944d7 +======= +EBUILD dnsmasq-2.80-r1.ebuild 4798 BLAKE2B e9b667e47e20493d66035efca9db5e6f9095f899c58b6c8191d16d650806b6d5a981edb5aceaeaded932259257d2a7ec212dcc4a6a88c8e465ad48014562863b SHA512 5f6a03704fdf8eb3e7c50e4a0637ab2894caa8bfe054c20001a46cb55c58733254a8a0a968f9732276305667810d5c7001ba5a27e30d24fa2116d7e326fcb6ac +>>>>>>> next EBUILD dnsmasq-2.80.ebuild 4684 BLAKE2B 64850d70d7fe613c4e3b89944052ccba458f702e59f6d3f6b5228d4a32e65221c64a7ae9a168edd9499723276f0b8fab10a1f97d4b5eaab89c6c87359e7f652d SHA512 0a14dca3228b931f646d465de4426d2e48ae4e4a1c76637620e8a4d6e9c5cfd877ffd34b2841508a405749626e5fb6299cae5485a2529ca79cf891f66d4897a2 MISC metadata.xml 1247 BLAKE2B cdaa193ae5c90b1f833968bafb1e725be1f67d21ee9025552fe2c153d096f2b4b7cd505aabe3713678426bea2a1059de3eeebd58a9d81793520f2690e5bf4851 SHA512 24cd4320dad43122014b0c5ddd5d65a199ef6d0bb378738180e03e4f0410cc1c21ee46b7973bdadca6e6323f3e9c6ce0073a813d4ecfe3e6bac44645dc9970dc diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild index 2319ec5f277b..6e3d80b6e8ca 100644 --- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild @@ -11,7 +11,11 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" +<<<<<<< HEAD KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +======= +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +>>>>>>> next IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" IUSE+=" +inotify ipv6 lua nls script selinux static tftp" diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest index dfa47e6de7b0..f9035331b8dc 100644 --- a/net-dns/getdns/Manifest +++ b/net-dns/getdns/Manifest @@ -4,6 +4,6 @@ AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b934f9b9b9f9001a41ebaf148d266272529c594a79eb27c0b99ff9f30d4c519f91128d35b4ea87eb22 SHA512 c4f1de3789debd1d51a47499960b6f688bc594b4beb01062a55c5623a6ceb07d03705e4f411c9a0cc88442af223120b29c46a9dc72c600477d3e598f9c02c805 DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0 DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4 -EBUILD getdns-1.5.1.ebuild 2086 BLAKE2B 0ed0e7e26b1281ef4eebc09a786e4cb0d5124f5db19135746813cc1e88168c8d033f6fbc989bf7b285312b1e9c9f213d5731d79cbe66be8b3b3b43fa66a58ff6 SHA512 ea45872a78ee6bfaaa42d44e4f2aec8bab1a615f0e847fab94414fa3d321bd6160ef4aed915c4672fcd6ae548ad8a9b23fef3086161d0f5f61443a7a23ec7dc1 -EBUILD getdns-1.5.2-r2.ebuild 2225 BLAKE2B b479481177672ed4384fef437695ea7cc24a23571e43bac5d2c287c4af0392f17838552e2dbf70ab9b433ef3f19514cd7f760841d81a70e0ba38e88408e883df SHA512 d84a9457c1f99428129a3773531d83d1e030ff62daa91ce26f17ab889f4f4b43af98e953655f03f158191b55654deccb2146348163c9914897f402db112d3309 -MISC metadata.xml 935 BLAKE2B 62a4d9f2530b6eed7728e230b9891e78c3a90c864aabf01d0dec19bad40c51d41b0acaafdcb723a1661b918c33f97bdfbd40047b328ef63d43668f9313b1eeac SHA512 c87c65163beff2f084e20ffbd52e4ac4f3ca8cfe5cad2ce3f7f7ee7ff14ce7b9958cda4fa3c6eb9e1e582ec79f03e4e8ed121a1dfd1e7ade7c9b5422ba47447d +EBUILD getdns-1.5.1.ebuild 2117 BLAKE2B 1e9a9cd2140fe0609310cea1bb2e751005c2cb25832e3f52b4b1eea006ac14e86d047ade4a81b6643a5eb7371b5fdb686b599f4611a2599860cd05c415f810a0 SHA512 04d57c28f0e172b1f4c920c07f610add18e374ff36e1f970f6cafc35ef1206e900ec3f1d9bc6bb3ac757c2fcc66e1d4b07b1fdd3acfec2d3e0b2d5324f83a80c +EBUILD getdns-1.5.2-r2.ebuild 2256 BLAKE2B 3fb6799436c86950a50b862956326fca0a227b9cbd227756006fd54f8bd63864fd2f7cd618b6350ea2cbff0e7af29917d2a488fbf729a4f6c64101fd8e9658a9 SHA512 6de0a9a8ac4c78768a86c53994e8ffc6fa5ca480233968bcb3a776ff33f16a8811fb016ab10cb93bfa4f0104c10f87fb424239263cb045a247f064790b41194a +MISC metadata.xml 935 BLAKE2B 8a1cec2e5db3f06da68bdd753fd558b7ba94b7366be054a421d585af5e6383d6f5440372fc998f5c55a42dd7efb1f51d171a00155d722e8317ce6e1f77720a36 SHA512 3d1bb8b1a423d976334131c803c7bdb917bcf30c8e4974312bb7d82e3ae3e342839f132e2b7680ef4857c94d14ca2e24293a452c2cc48ae91b052aaa91c0ca16 diff --git a/net-dns/getdns/getdns-1.5.1.ebuild b/net-dns/getdns/getdns-1.5.1.ebuild index 05ba4798a0f4..412a42a0a402 100644 --- a/net-dns/getdns/getdns-1.5.1.ebuild +++ b/net-dns/getdns/getdns-1.5.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc +getdns_query +getdns_server_mon +idn libev libevent libressl libuv static-libs stubby +threads +unbound" +IUSE="doc +getdns-query +getdns-server-mon +idn libev libevent libressl libuv static-libs stubby +threads +unbound" # https://bugs.gentoo.org/661760 # https://github.com/getdnsapi/getdns/issues/407 @@ -43,8 +43,8 @@ src_configure() { econf \ --runstatedir=/var/run \ $(use_enable static-libs static) \ - $(use_with getdns_query) \ - $(use_with getdns_server_mon) \ + $(use_with getdns-query getdns_query) \ + $(use_with getdns-server-mon getdns_server_mon) \ $(use_with idn libidn2) \ $(use_with libev) \ $(use_with libevent) \ diff --git a/net-dns/getdns/getdns-1.5.2-r2.ebuild b/net-dns/getdns/getdns-1.5.2-r2.ebuild index 2a5badd50634..69a1687fe2b2 100644 --- a/net-dns/getdns/getdns-1.5.2-r2.ebuild +++ b/net-dns/getdns/getdns-1.5.2-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://getdnsapi.net/releases/${P//./-}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc +getdns_query +getdns_server_mon gnutls +idn libev libevent libuv nettle static-libs stubby +threads +unbound" +IUSE="doc +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv nettle static-libs stubby +threads +unbound" REQUIRED_USE="gnutls? ( nettle )" @@ -46,8 +46,8 @@ src_configure() { econf \ --runstatedir=/var/run \ $(use_enable static-libs static) \ - $(use_with getdns_query) \ - $(use_with getdns_server_mon) \ + $(use_with getdns-query getdns_query) \ + $(use_with getdns-server-mon getdns_server_mon) \ $(usex gnutls '--with-gnutls' '' '' '') \ $(use_with idn libidn2) \ $(use_with libev) \ diff --git a/net-dns/getdns/metadata.xml b/net-dns/getdns/metadata.xml index 55534e1c9406..dbf4417374b7 100644 --- a/net-dns/getdns/metadata.xml +++ b/net-dns/getdns/metadata.xml @@ -11,8 +11,8 @@ </maintainer> <use> <flag name="stubby">Add Stubby DNS Privacy Deamon</flag> - <flag name="getdns_query">Add getdns_query tool</flag> - <flag name="getdns_server_mon">Add getdns_server_mon tool</flag> + <flag name="getdns-query">Add getdns_query tool</flag> + <flag name="getdns-server-mon">Add getdns_server_mon tool</flag> <flag name="unbound">Enable <pkg>net-dns/unbound</pkg> libraries support</flag> <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> support</flag> <flag name="libev">Enable <pkg>dev-libs/libev</pkg> support</flag> |