diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
| commit | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (patch) | |
| tree | c34bf820c2809fb7e08ed5564df2a25cf759516f /net-misc/dhcp | |
| parent | 693cc9b6e847a01c1bb692153021aaf9fb0fab25 (diff) | |
gentoo resync 31.01.2019
Diffstat (limited to 'net-misc/dhcp')
| -rw-r--r-- | net-misc/dhcp/Manifest | 2 | ||||
| -rw-r--r-- | net-misc/dhcp/dhcp-4.4.1.ebuild | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest index 1294b0aabd5d..4a39237b85e0 100644 --- a/net-misc/dhcp/Manifest +++ b/net-misc/dhcp/Manifest @@ -28,5 +28,5 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9 DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7 EBUILD dhcp-4.3.6_p1.ebuild 7814 BLAKE2B e3bb178b440b23c39e97fc082af1949dcd3bc9c5b9ba0b778ffbb10cfb8e99e3b8cc3d3c79b1dfa10bb7d924f7b643704a9acfef4289d822b78a71910f632721 SHA512 627121c2f592bdf85e3d1b7b1d98209caa7eda69fa2ca6d9042ed3e6c07b9a4ef2b4b9d985930d21e7275e55ea6bcba816c87b6339f88249d29554d7cf2771b4 -EBUILD dhcp-4.4.1.ebuild 7927 BLAKE2B d59c3bc1bffab0dd9f2065082a06b22f455910475d1d415482d12819cf2fead427c5946658ea58f70eedd3cecc271477e89b46d53a21f1f859f09d46ec1097c7 SHA512 2e223ac06d25a7f9dddd04b664c744479f1b0d8f20f46f807da0ff5e2885bce57e64f0f940be9e38e794d64ab2181caa6e3dd2f7c5b28ca717286ff8b170118b +EBUILD dhcp-4.4.1.ebuild 7941 BLAKE2B 7b6913b724a4f50dfd1e63a9f65b7192298660cf56c368a565c4b0ce8efe5adb702abc84586f371b633493942f6b8b044d2e82e39952483aa2e599dc3c8e1e12 SHA512 aaad6123f649f136b3f8ccb675a5661c1d0b142cbc0748d114dd96b47f89ab4a85ba774933d675bd87aa70f7cdc7149c3fe299a5e4f3ada05a7cdaa8e79aac32 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild index b092a1229505..140b6f709966 100644 --- a/net-misc/dhcp/dhcp-4.4.1.ebuild +++ b/net-misc/dhcp/dhcp-4.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz LICENSE="MPL-2.0 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" +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" DEPEND=" @@ -170,7 +170,7 @@ src_configure() { 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') \ + $(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 \ --without-make-clean } @@ -192,7 +192,7 @@ src_install() { if [[ -e client/dhclient ]] ; then # move the client to / dodir /sbin - mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die + mv "${ED%/}"/usr/sbin/dhclient "${ED%/}"/sbin/ || die exeinto /sbin if use kernel_linux ; then @@ -224,15 +224,15 @@ src_install() { systemd_install_serviced "${FILESDIR}"/dhcrelay4.service.conf systemd_install_serviced "${FILESDIR}"/dhcrelay6.service.conf - sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED}"/etc/init.d/* || die #442560 + sed -i "s:#@slapd@:$(usex ldap slapd ''):" "${ED%/}"/etc/init.d/* || die #442560 fi # the default config files aren't terribly useful #384087 local f - for f in "${ED}"/etc/dhcp/*.conf.example ; do + for f in "${ED%/}"/etc/dhcp/*.conf.example ; do mv "${f}" "${f%.example}" || die done - sed -i '/^[^#]/s:^:#:' "${ED}"/etc/dhcp/*.conf || die + sed -i '/^[^#]/s:^:#:' "${ED%/}"/etc/dhcp/*.conf || die } pkg_preinst() { @@ -245,10 +245,10 @@ pkg_preinst() { for f in dhclient:da7c8496a96452190aecf9afceef4510 dhcpd:10979e7b71134bd7f04d2a60bd58f070 ; do h=${f#*:} f="/etc/dhcp/${f%:*}.conf" - if [ -e "${EROOT}"${f} ] ; then + if [ -e "${EROOT%/}"${f} ] ; then case $(md5sum "${EROOT}"${f}) in ${h}*) ;; - *) cp -p "${EROOT}"${f} "${ED}"${f};; + *) cp -p "${EROOT%/}"${f} "${ED%/}"${f};; esac fi done |