[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/

[Lars Wendler]

commit:     135e7f7665906c5ac144101b35121a05495eefc8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 16:34:22 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 16:35:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=135e7f76

net-misc/dhcp: Bump to versions 4.3.6_p1 and 4.4.1

Bug: https://bugs.gentoo.org/649010
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/dhcp/Manifest                                  |  3 ++-
 .../dhcp/{dhcp-4.4.0.ebuild => dhcp-4.3.6_p1.ebuild}    | 17 ++++++++---------
 net-misc/dhcp/{dhcp-4.4.0.ebuild => dhcp-4.4.1.ebuild}  |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index a0c93eb7fa5..e3151d1326c 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -1,4 +1,5 @@
 DIST dhcp-4.3.4.tar.gz 9302513 BLAKE2B eb7fb7d7d46d5a706b4f22b4add98619709f7ac1ecf8244564f043fd56adb6e2f54a0e01b573abcd7e054a82f74279c8134802380ee2d02c1cab1118d48a4965 SHA512 411c3f0e1effedb2a95f00539d13164530a56b50830008eb78906b3c8bf4070c331cf54a431770aed5d1b6ba214840446964210060674f746781cc97842ad706
 DIST dhcp-4.3.5.tar.gz 10075147 BLAKE2B ffce896cfafe17a412030d0a1cb4a92323be175ecbb35061fe0538ed13a9f91d604daed89b5f282c92ef161944e9f18557545d95c9fbbd29e1f6a31485ef3b11 SHA512 aba0e1d361eb9e7ed33fc48c0b0b9288057af9ec51775e40e27feb9ababc182506706fcf39079236ce36b0f7ded391e107474dc29de2e60ed45d37753505e1f0
+DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62
 DIST dhcp-4.3.6.tar.gz 10182593 BLAKE2B 2b6324c63446a5cbded9a7cdd4455b6c880aabd282dfd19d44fe2fafe684a991b4afa87ec04ee3fc131437c8efdddbe2777d70586c2e8b2b4319e786325dc398 SHA512 de4962dc2aa174df17a3a1456719a777a42d238c3d6ad1771ccc460fa70c9e9cefcce52c7437f7acde61b9c3a2e84e9d49fd2dc33c7e9243053ceed5b247be03
-DIST dhcp-4.4.0.tar.gz 11158069 BLAKE2B c554e15f549bdf6342bfa4337ab54f2a259a1c212700a69b56d795b1c91230759e254b050087ad09cf065d9dcc380e6110a95d63c3d2ba982c567dd381889d3e SHA512 0dcddfe803db0cea49204f71c9fbc3b1a55496acc83e344d9147893410bbb5f96874ff6457037ee9f759d701cea4bab98dc51ad5d7b23926254e25e5e421eabd
+DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7

diff --git a/net-misc/dhcp/dhcp-4.4.0.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
similarity index 92%
copy from net-misc/dhcp/dhcp-4.4.0.ebuild
copy to net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index ca0eefb2fec..9e73d36618c 100644
--- a/net-misc/dhcp/dhcp-4.4.0.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.isc.org/products/DHCP"
 SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 	ftp://ftp.isc.org/isc/dhcp/${MY_PV}/${MY_P}.tar.gz"
 
-LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
@@ -60,10 +60,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.2.2-dhclient-stdin-conf.patch"
 	"${FILESDIR}/${PN}-4.3.6-nogateway.patch" #265531
 	"${FILESDIR}/${PN}-4.3.6-quieter-ping.patch" #296921
-	"${FILESDIR}/${PN}-4.4.0-always-accept-4.patch" #437108
+	"${FILESDIR}/${PN}-4.2.4-always-accept-4.patch" #437108
 	"${FILESDIR}/${PN}-4.3.6-iproute2-path.patch" #480636
 	"${FILESDIR}/${PN}-4.2.5-bindtodevice-inet6.patch" #471142
 	"${FILESDIR}/${PN}-4.3.3-ldap-ipv6-client-id.patch" #559832
+	"${FILESDIR}/${PN}-4.3.6-lmdb-removal.patch" #628598
 )
 
 src_prepare() {
@@ -120,11 +121,9 @@ src_prepare() {
 	binddir=${binddir}
 	GMAKE=${MAKE:-gmake}
 	EOF
-	eapply -p2 "${FILESDIR}"/${PN}-4.4.0-bind-disable.patch
-	# Only use the relevant subdirs now that ISC
-	#removed the lib/export structure in bind.
-	sed '/^SUBDIRS/s@=.*$@= isc dns isccfg irs samples@' \
-		-i bind-*/lib/Makefile.in || die
+	eapply -p2 "${FILESDIR}"/${PN}-4.3.4-bind-disable.patch
+	cd bind-*/ || die
+	eapply -p2 "${FILESDIR}"/${PN}-4.2.2-bind-parallel-build.patch #380717
 }
 
 src_configure() {
@@ -169,14 +168,14 @@ src_configure() {
 	# perl and we don't want to require that #383837.
 	cd bind/bind-*/ || die
 	eval econf \
-		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el}; fi; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
+		$(sed -n '/^bindconfig =/,/^$/{:a;N;$!ba;s,^[^-]*,,;s,\\\s*\n\s*--,--,g;s, @[[:upper:]]\+@,,g;P;D}' ../Makefile.in) \
 		--disable-symtable \
 		--without-make-clean
 }
 
 src_compile() {
 	# build local bind cruft first
-	emake -C bind/bind-*/lib install
+	emake -C bind/bind-*/lib/export install
 	# then build standard dhcp code
 	emake AR="$(tc-getAR)"
 }

diff --git a/net-misc/dhcp/dhcp-4.4.0.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
similarity index 99%
rename from net-misc/dhcp/dhcp-4.4.0.ebuild
rename to net-misc/dhcp/dhcp-4.4.1.ebuild
index ca0eefb2fec..358e3c1f12a 100644
--- a/net-misc/dhcp/dhcp-4.4.0.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -168,6 +168,7 @@ src_configure() {
 	# configure local bind cruft.  symtable option requires
 	# perl and we don't want to require that #383837.
 	cd bind/bind-*/ || die
+	local el
 	eval econf \
 		$(for el in $(awk '/^bindconfig/,/^$/ {print}' ../Makefile.in) ; do if [[ ${el} =~ ^-- ]] ; then printf ' %s' ${el}; fi; done | sed 's,@\([[:alpha:]]\+\)dir@,${binddir}/\1,g') \
 		--disable-symtable \