Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 372437 | Differences between
and this patch

Collapse All | Expand All

(-)a/Manifest (-11 / +2 lines)
Lines 1-16 Link Here
1
-----BEGIN PGP SIGNED MESSAGE-----
2
Hash: SHA1
3
4
AUX dhcpcd.initd 327 RMD160 5391020a6e28fb411fde4ae1610182dcc27abc59 SHA1 2f255cce666c11b1082593e8ff2ef67ad6c3e0a0 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492
1
AUX dhcpcd.initd 327 RMD160 5391020a6e28fb411fde4ae1610182dcc27abc59 SHA1 2f255cce666c11b1082593e8ff2ef67ad6c3e0a0 SHA256 72b42c9939fda3fb56666813513029ed36194c1708bddce06bcb3e131e547492
5
AUX dhcpcd.initd-1 500 RMD160 154c421adaee89a5ad6a95479d3707d58d4949f2 SHA1 8073c2cc3a5cfe12aa214744e895a96ef633ad16 SHA256 96ea2b4110bcddb8a06690e9ecec42f55937cb5c6f5cf7ec59516df70ab8056e
2
AUX dhcpcd.initd-1 500 RMD160 154c421adaee89a5ad6a95479d3707d58d4949f2 SHA1 8073c2cc3a5cfe12aa214744e895a96ef633ad16 SHA256 96ea2b4110bcddb8a06690e9ecec42f55937cb5c6f5cf7ec59516df70ab8056e
3
AUX dhcpcd.service 137 RMD160 dc340a963666fe3e63274a108979217d5e3fb61c SHA1 be0f97c6c26f337bffe70f0c8464a6985965d21d SHA256 8fc320592e8aa2fe29f48c8780269826004bc027a97e0b58f69af347c21b66ed
6
DIST dhcpcd-5.2.12.tar.bz2 72177 RMD160 588a6e508b3ed7e07e044c4da77512eebc9bd607 SHA1 27378a251705c7888332e6d60eea7805d1f8aeb5 SHA256 55da7dcf64cd3dda5217d0e01748a3d980ab0cd625bae0efc00420eadd7f559b
4
DIST dhcpcd-5.2.12.tar.bz2 72177 RMD160 588a6e508b3ed7e07e044c4da77512eebc9bd607 SHA1 27378a251705c7888332e6d60eea7805d1f8aeb5 SHA256 55da7dcf64cd3dda5217d0e01748a3d980ab0cd625bae0efc00420eadd7f559b
7
EBUILD dhcpcd-5.2.12.ebuild 2863 RMD160 3a29e09878f8083bf2f83cde3870020690351b27 SHA1 aefc6a69c560f95011c918354badb9d90bbacf5d SHA256 ba7c42c6184c2dfdd2b907a974b199be13c6f7d30fed4b96fa7988615bcb651f
5
EBUILD dhcpcd-5.2.12-r1.ebuild 2922 RMD160 5497d96712c4890899a557ca2e89c44e54e423b1 SHA1 abce72ce00ad0dfea135bcf8dd8e097e3e7c6ee1 SHA256 450f6e0f09db43770f069725fdecc18e0c3c81cd1605282dbb76f9e3909d226a
8
MISC ChangeLog 44954 RMD160 8c1b92aecc4fe6bbcebe5e1c8e749edf7fae2c28 SHA1 f8f81a184d648fdf4435e549d46e8fa821fd3538 SHA256 7f2d3e56d4468f6b3615da6efef68dd0299c151cd4b6ed9f6facf69aebadd843
6
MISC ChangeLog 44954 RMD160 8c1b92aecc4fe6bbcebe5e1c8e749edf7fae2c28 SHA1 f8f81a184d648fdf4435e549d46e8fa821fd3538 SHA256 7f2d3e56d4468f6b3615da6efef68dd0299c151cd4b6ed9f6facf69aebadd843
9
MISC metadata.xml 267 RMD160 b367f579205ecf0dee9655865b1d475b55ae23c3 SHA1 18d814d5103674d7e4f70cf384977757cb952160 SHA256 e49d3af922c81acd77a87c5432515be3bec34c7fd6646941acae7c5ea113a08e
7
MISC metadata.xml 267 RMD160 b367f579205ecf0dee9655865b1d475b55ae23c3 SHA1 18d814d5103674d7e4f70cf384977757cb952160 SHA256 e49d3af922c81acd77a87c5432515be3bec34c7fd6646941acae7c5ea113a08e
10
-----BEGIN PGP SIGNATURE-----
11
Version: GnuPG v2.0.17 (GNU/Linux)
12
13
iEYEARECAAYFAk2ou1cACgkQOeoy/oIi7uzNPwCggRhGI78SN6oO+cQJBh1SmHb6
14
PF4An1dTVRw6V8Y2jOsiGc86xTW5szHz
15
=z77E
16
-----END PGP SIGNATURE-----
(-)a/dhcpcd-5.2.12-r1.ebuild (+90 lines)
Line 0 Link Here
1
# Copyright 1999-2011 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12.ebuild,v 1.9 2011/04/15 21:39:14 ulm Exp $
4
5
EAPI=1
6
7
inherit eutils systemd
8
9
MY_P="${P/_alpha/-alpha}"
10
MY_P="${MY_P/_beta/-beta}"
11
MY_P="${MY_P/_rc/-rc}"
12
S="${WORKDIR}/${MY_P}"
13
14
DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
15
HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
16
SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
17
LICENSE="BSD-2"
18
19
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
20
21
SLOT="0"
22
IUSE="+zeroconf elibc_glibc"
23
24
DEPEND=""
25
RDEPEND="!<sys-apps/openrc-0.6.0"
26
27
src_unpack() {
28
	unpack ${A}
29
	cd "${S}"
30
31
	if ! use zeroconf; then
32
		elog "Disabling zeroconf support"
33
		{
34
			echo
35
			echo "# dhcpcd ebuild requested no zeroconf"
36
			echo "noipv4ll"
37
		} >> dhcpcd.conf
38
	fi
39
}
40
41
src_compile() {
42
	local hooks="--with-hook=ntp.conf"
43
	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
44
	econf --prefix= --libexecdir=/$(get_libdir)/dhcpcd --dbdir=/var/lib/dhcpcd \
45
		--localstatedir=/var ${hooks}
46
	emake || die
47
}
48
49
src_install() {
50
	emake DESTDIR="${D}" install || die
51
	dodoc README
52
	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
53
	systemd_dounit "${FILESDIR}"/${PN}.service || die
54
}
55
56
pkg_postinst() {
57
	# Upgrade the duid file to the new format if needed
58
	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
59
	local new_duid="${ROOT}"/etc/dhcpcd.duid
60
	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
61
		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
62
	fi
63
64
	# Move the duid to /etc, a more sensible location
65
	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
66
		cp -p "${old_duid}" "${new_duid}"
67
	fi
68
69
	if use zeroconf; then
70
		elog "You have installed dhcpcd with zeroconf support."
71
		elog "This means that it will always obtain an IP address even if no"
72
		elog "DHCP server can be contacted, which will break any existing"
73
		elog "failover support you may have configured in your net configuration."
74
		elog "This behaviour can be controlled with the -L flag."
75
		elog "See the dhcpcd man page for more details."
76
	fi
77
78
	elog
79
	elog "Users upgrading from 4.0 series should pay attention to removal"
80
	elog "of compat useflag. This changes behavior of dhcp in wide manner:"
81
	elog "dhcpcd no longer sends a default ClientID for ethernet interfaces."
82
	elog "This is so we can re-use the address the kernel DHCP client found."
83
	elog "To retain the old behaviour of sending a default ClientID based on the"
84
	elog "hardware address for interface, simply add the keyword clientid"
85
	elog "to dhcpcd.conf or use commandline parameter -I ''"
86
	elog
87
	elog "Also, users upgrading from 4.0 series should be aware that"
88
	elog "the -N, -R and -Y command line options no longer exist."
89
	elog "These are controled now by nohook options in dhcpcd.conf."
90
}
(-)a/dhcpcd-5.2.12.ebuild (-89 lines)
Lines 1-89 Link Here
1
# Copyright 1999-2011 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12.ebuild,v 1.9 2011/04/15 21:39:14 ulm Exp $
4
5
EAPI=1
6
7
inherit eutils
8
9
MY_P="${P/_alpha/-alpha}"
10
MY_P="${MY_P/_beta/-beta}"
11
MY_P="${MY_P/_rc/-rc}"
12
S="${WORKDIR}/${MY_P}"
13
14
DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
15
HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
16
SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
17
LICENSE="BSD-2"
18
19
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
20
21
SLOT="0"
22
IUSE="+zeroconf elibc_glibc"
23
24
DEPEND=""
25
RDEPEND="!<sys-apps/openrc-0.6.0"
26
27
src_unpack() {
28
	unpack ${A}
29
	cd "${S}"
30
31
	if ! use zeroconf; then
32
		elog "Disabling zeroconf support"
33
		{
34
			echo
35
			echo "# dhcpcd ebuild requested no zeroconf"
36
			echo "noipv4ll"
37
		} >> dhcpcd.conf
38
	fi
39
}
40
41
src_compile() {
42
	local hooks="--with-hook=ntp.conf"
43
	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
44
	econf --prefix= --libexecdir=/$(get_libdir)/dhcpcd --dbdir=/var/lib/dhcpcd \
45
		--localstatedir=/var ${hooks}
46
	emake || die
47
}
48
49
src_install() {
50
	emake DESTDIR="${D}" install || die
51
	dodoc README
52
	newinitd "${FILESDIR}"/${PN}.initd-1 ${PN}
53
}
54
55
pkg_postinst() {
56
	# Upgrade the duid file to the new format if needed
57
	local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
58
	local new_duid="${ROOT}"/etc/dhcpcd.duid
59
	if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
60
		sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
61
	fi
62
63
	# Move the duid to /etc, a more sensible location
64
	if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
65
		cp -p "${old_duid}" "${new_duid}"
66
	fi
67
68
	if use zeroconf; then
69
		elog "You have installed dhcpcd with zeroconf support."
70
		elog "This means that it will always obtain an IP address even if no"
71
		elog "DHCP server can be contacted, which will break any existing"
72
		elog "failover support you may have configured in your net configuration."
73
		elog "This behaviour can be controlled with the -L flag."
74
		elog "See the dhcpcd man page for more details."
75
	fi
76
77
	elog
78
	elog "Users upgrading from 4.0 series should pay attention to removal"
79
	elog "of compat useflag. This changes behavior of dhcp in wide manner:"
80
	elog "dhcpcd no longer sends a default ClientID for ethernet interfaces."
81
	elog "This is so we can re-use the address the kernel DHCP client found."
82
	elog "To retain the old behaviour of sending a default ClientID based on the"
83
	elog "hardware address for interface, simply add the keyword clientid"
84
	elog "to dhcpcd.conf or use commandline parameter -I ''"
85
	elog
86
	elog "Also, users upgrading from 4.0 series should be aware that"
87
	elog "the -N, -R and -Y command line options no longer exist."
88
	elog "These are controled now by nohook options in dhcpcd.conf."
89
}
(-)a/files/dhcpcd.service (-1 / +8 lines)
Line 0 Link Here
0
- 
1
[Unit]
2
Description=Lightweight DHCP client daemon
3
4
[Service]
5
ExecStart=/sbin/dhcpcd -q --nobackground
6
7
[Install]
8
WantedBy=network.target

Return to bug 372437