diff options
Diffstat (limited to 'net-misc/dhcpcd')
| -rw-r--r-- | net-misc/dhcpcd/Manifest | 6 | ||||
| -rw-r--r-- | net-misc/dhcpcd/dhcpcd-7.2.3.ebuild (renamed from net-misc/dhcpcd/dhcpcd-7.2.1.ebuild) | 28 | ||||
| -rw-r--r-- | net-misc/dhcpcd/dhcpcd-9999.ebuild | 28 |
3 files changed, 27 insertions, 35 deletions
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest index 67129621b7ff..981b06f845d8 100644 --- a/net-misc/dhcpcd/Manifest +++ b/net-misc/dhcpcd/Manifest @@ -4,10 +4,10 @@ AUX dhcpcd-7.1.1-v6_read_overflow.patch 3359 BLAKE2B 665506fa9c9839b66e86af39ffe AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e DIST dhcpcd-7.1.1.tar.xz 211788 BLAKE2B 984ec97ffdcb15883f57f9e2a699a7c8f006b2630e7651ab9d55e7a980045f8891f09d9f7be420969203a59671d097a1ed76621fe4a62ff26a5020fc8becfe69 SHA512 8791e718d65ef8ae23a16b98e82824860fa91914e6eb0a42cdbbca28236c1c38005ada44214bde33aac57152fe675debebdb5d141b67dcfc82012996d8337bb4 -DIST dhcpcd-7.2.1.tar.xz 213652 BLAKE2B cae5a68ecf285825e6376c8b5bef5f3aba3bb8a393ba4298d8e990d665dd948369f24f688cdb85006df535b7f9b412c795d8eb7817a92e8d9992bdc7b7757a1e SHA512 11c3ef6d3ee49e147aa44725aa1ac0cddff70a268908439fe91990e135175d063e3d65ab587e1780e4f6f0739cf33873a58ffea0a3130d1bfb5598f9f11ec5a3 DIST dhcpcd-7.2.2.tar.xz 213600 BLAKE2B ae36cc44d32c034b41f9c970fdb154ef2935b53ae9a81d76dfe8143882170cb8f4ea9c2048ebbfc2d94096061626e93d5890565192115d2953506a7d1e4ee6f2 SHA512 a774c4788efbb9712be04d3f29943b801043f9ec1ea1925282330afa00b9f3db5c29a85969ef004bf85b20045b4cc6ab241ceaae050a18051079d396845845e8 +DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f EBUILD dhcpcd-7.1.1-r3.ebuild 4641 BLAKE2B 4bf2bc06ab5ad509960e4730a91ac6cedebb2109ffb285cdc3381e3fcdec239e63d1ec26bb5037fbcb745e7532bfbb57673627a0165d197315da97326e8c63d0 SHA512 06fdb570c0f55e13091f6b12b014304b4e9036fb81194944fe7f53fd4809aa6376fa77e0e6d6cdec77d3649336a18363aa13ba4e921247ce20aa5ac37c688c95 -EBUILD dhcpcd-7.2.1.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5 EBUILD dhcpcd-7.2.2.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5 -EBUILD dhcpcd-9999.ebuild 4493 BLAKE2B c327b61bba6c17aa24689b793f929e588d079bcf6385aed24614ac39864f28119841efa86631802589a4f8f66abb9f29f6970cd1904bfefa41c9bf94ae73ed8d SHA512 0d7ce59d11435e7703a12ec2de957a532d2ccb8ef8e579ceb57af6615c37537bb47b7fb393c34a1cf2f174d5119036e9f1706dab331cc35ada64af3f79bb8ac5 +EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6984ce73636a4ef29bf29143a1ba122b0ab31566af2730907b0e24e9ab7e2d5b61698e3c0608e84004fcedc5c218b419727aca598bb1040859b59d5e0e09ee16 SHA512 d7f5917239a1caf2bf001071eb916ff53b26fd66486ec00c8c4595b95b2ea1c77971b88027d9e3e0e4f99dddd2da5dfe6dfb8eb23417d2418fc2392cb53d9a1d +EBUILD dhcpcd-9999.ebuild 4407 BLAKE2B 6984ce73636a4ef29bf29143a1ba122b0ab31566af2730907b0e24e9ab7e2d5b61698e3c0608e84004fcedc5c218b419727aca598bb1040859b59d5e0e09ee16 SHA512 d7f5917239a1caf2bf001071eb916ff53b26fd66486ec00c8c4595b95b2ea1c77971b88027d9e3e0e4f99dddd2da5dfe6dfb8eb23417d2418fc2392cb53d9a1d MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a diff --git a/net-misc/dhcpcd/dhcpcd-7.2.1.ebuild b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild index 48ba26275d0c..b74ad597f96b 100644 --- a/net-misc/dhcpcd/dhcpcd-7.2.1.ebuild +++ b/net-misc/dhcpcd/dhcpcd-7.2.3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit systemd toolchain-funcs @@ -28,22 +28,18 @@ DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" src_configure() { - local dev hooks=() rundir - use udev || dev="--without-dev --without-udev" - hooks=( --with-hook=ntp.conf ) - use elibc_glibc && hooks+=( --with-hook=yp.conf ) - use kernel_linux && rundir="--rundir=${EPREFIX}/run" local myeconfargs=( - --prefix="${EPREFIX}" - --libexecdir="${EPREFIX}/lib/dhcpcd" --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" --localstatedir="${EPREFIX}/var" - ${rundir} + --prefix="${EPREFIX}" + --with-hook=ntp.conf $(use_enable embedded) $(use_enable ipv6) - ${dev} + $(usex elibc_glibc '--with-hook=yp.conf' '') + $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + $(usex udev '' '--without-dev --without-udev') CC="$(tc-getCC)" - ${hooks[@]} ) econf "${myeconfargs[@]}" } @@ -56,10 +52,10 @@ src_install() { } pkg_postinst() { - local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=() + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT%/}"/etc/dhcpcd.duid + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid + local old_duid="${EROOT}"/etc/dhcpcd.duid local new_duid="${dbdir}"/duid if [[ -e "${old_old_duid}" ]] ; then # Upgrade the duid file to the new format if needed @@ -81,7 +77,7 @@ pkg_postinst() { fi old_files+=( "${old_duid}" ) fi - local old_secret="${EROOT%/}"/etc/dhcpcd.secret + local old_secret="${EROOT}"/etc/dhcpcd.secret local new_secret="${dbdir}"/secret if [[ -e "${old_secret}" ]] ; then if [[ ! -e "${new_secret}" ]] ; then @@ -112,7 +108,7 @@ pkg_postinst() { if [[ -n "${old_files[@]}" ]] ; then elog elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT%/}/etc to ${dbdir}" + elog "${EROOT}/etc to ${dbdir}" elog "and copied leases in ${dbdir} to new files with the dhcpcd-" elog "prefix dropped." elog diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild index 48ba26275d0c..b74ad597f96b 100644 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit systemd toolchain-funcs @@ -28,22 +28,18 @@ DEPEND="${COMMON_DEPEND}" RDEPEND="${COMMON_DEPEND}" src_configure() { - local dev hooks=() rundir - use udev || dev="--without-dev --without-udev" - hooks=( --with-hook=ntp.conf ) - use elibc_glibc && hooks+=( --with-hook=yp.conf ) - use kernel_linux && rundir="--rundir=${EPREFIX}/run" local myeconfargs=( - --prefix="${EPREFIX}" - --libexecdir="${EPREFIX}/lib/dhcpcd" --dbdir="${EPREFIX}/var/lib/dhcpcd" + --libexecdir="${EPREFIX}/lib/dhcpcd" --localstatedir="${EPREFIX}/var" - ${rundir} + --prefix="${EPREFIX}" + --with-hook=ntp.conf $(use_enable embedded) $(use_enable ipv6) - ${dev} + $(usex elibc_glibc '--with-hook=yp.conf' '') + $(usex kernel_linux '--rundir=${EPREFIX}/run' '') + $(usex udev '' '--without-dev --without-udev') CC="$(tc-getCC)" - ${hooks[@]} ) econf "${myeconfargs[@]}" } @@ -56,10 +52,10 @@ src_install() { } pkg_postinst() { - local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=() + local dbdir="${EROOT}"/var/lib/dhcpcd old_files=() - local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid - local old_duid="${EROOT%/}"/etc/dhcpcd.duid + local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid + local old_duid="${EROOT}"/etc/dhcpcd.duid local new_duid="${dbdir}"/duid if [[ -e "${old_old_duid}" ]] ; then # Upgrade the duid file to the new format if needed @@ -81,7 +77,7 @@ pkg_postinst() { fi old_files+=( "${old_duid}" ) fi - local old_secret="${EROOT%/}"/etc/dhcpcd.secret + local old_secret="${EROOT}"/etc/dhcpcd.secret local new_secret="${dbdir}"/secret if [[ -e "${old_secret}" ]] ; then if [[ ! -e "${new_secret}" ]] ; then @@ -112,7 +108,7 @@ pkg_postinst() { if [[ -n "${old_files[@]}" ]] ; then elog elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from" - elog "${EROOT%/}/etc to ${dbdir}" + elog "${EROOT}/etc to ${dbdir}" elog "and copied leases in ${dbdir} to new files with the dhcpcd-" elog "prefix dropped." elog |