Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dhcpcd/
Date: Thu, 04 Jun 2020 18:30:34
Message-Id: 1591295403.c5bf6136b7be50bb59dfdd98525ee9e4121e1556.polynomial-c@gentoo
1 commit: c5bf6136b7be50bb59dfdd98525ee9e4121e1556
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 4 18:24:12 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 4 18:30:03 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5bf6136
7
8 net-misc/dhcpcd: Synced live ebuild
9
10 Package-Manager: Portage-2.3.100, Repoman-2.3.22
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 net-misc/dhcpcd/dhcpcd-9999.ebuild | 22 +---------------------
14 1 file changed, 1 insertion(+), 21 deletions(-)
15
16 diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
17 index ac18c5907ad..092c6e4a1dd 100644
18 --- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
19 +++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
20 @@ -21,7 +21,7 @@ DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
21 HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
22 LICENSE="BSD-2"
23 SLOT="0"
24 -IUSE="debug elibc_glibc +embedded ipv6 kernel_linux +privsep +udev"
25 +IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
26
27 COMMON_DEPEND="udev? ( virtual/udev )"
28 DEPEND="${COMMON_DEPEND}"
29 @@ -113,26 +113,6 @@ pkg_postinst() {
30 cp "${lease}" "${dbdir}/${new_lease}"
31 done
32
33 - # dhcpcd-9 introduced privesep support in a chroot
34 - if use privsep ; then
35 - local dhcpcd_libdir="/var/lib/dhcpcd"
36 - local chroot_base="${EROOT}/var/chroot/dhcpcd"
37 - local chroot_dir="${chroot_base}${dhcpcd_libdir}"
38 - local chroot_retval=0
39 - # Set up proper chroot.
40 - if [[ ! -e "${chroot_dir}" ]] ; then
41 - mkdir -p "${chroot_dir}" || chroot_retval=1
42 - cp -a "${EROOT}${dhcpcd_libdir}" "${chroot_dir}" || chroot_retval=1
43 - chown -R dhcpcd:dhcpcd "${chroot_dir}" || chroot_retval=1
44 - elif [[ ! -d "${chroot_dir}" ]] ; then
45 - ewarn "${chroot_dir} is not a directory!"
46 - ewarn "Did not set up ${PN} chroot!"
47 - fi
48 - if [[ "${chroot_retval}" -ne 0 ]] ; then
49 - ewarn "There were issues setting up ${PN} chroot."
50 - fi
51 - fi
52 -
53 # Warn about removing stale files
54 if [[ -n "${old_files[@]}" ]] ; then
55 elog