summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-05-29 23:29:24 +0000
committerMike Frysinger <vapier@gentoo.org>2009-05-29 23:29:24 +0000
commitfe5d8859a0c235d3ac7dcce6120950f8155f20f6 (patch)
tree1ea708591d1737c3aee32eeaec19bd7818f67ee5 /net-misc/dhcpcd
parentVersion bump #267402 by Paul Mulders. (diff)
downloadgentoo-2-fe5d8859a0c235d3ac7dcce6120950f8155f20f6.tar.gz
gentoo-2-fe5d8859a0c235d3ac7dcce6120950f8155f20f6.tar.bz2
gentoo-2-fe5d8859a0c235d3ac7dcce6120950f8155f20f6.zip
old
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/dhcpcd')
-rw-r--r--net-misc/dhcpcd/dhcpcd-3.0.16-r1.ebuild37
-rw-r--r--net-misc/dhcpcd/dhcpcd-3.1.5-r1.ebuild68
-rw-r--r--net-misc/dhcpcd/dhcpcd-3.2.3.ebuild87
-rw-r--r--net-misc/dhcpcd/dhcpcd-4.0.10.ebuild95
-rw-r--r--net-misc/dhcpcd/dhcpcd-4.0.11.ebuild95
-rw-r--r--net-misc/dhcpcd/dhcpcd-4.0.12.ebuild95
-rw-r--r--net-misc/dhcpcd/dhcpcd-4.0.8.ebuild95
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-3.0.16-min-message.patch24
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch18
9 files changed, 0 insertions, 614 deletions
diff --git a/net-misc/dhcpcd/dhcpcd-3.0.16-r1.ebuild b/net-misc/dhcpcd/dhcpcd-3.0.16-r1.ebuild
deleted file mode 100644
index 19e3982b810a..000000000000
--- a/net-misc/dhcpcd/dhcpcd-3.0.16-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.0.16-r1.ebuild,v 1.5 2009/01/08 01:39:08 darkside Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://dhcpcd.berlios.de"
-SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Redefine the location of ntp.drift
- sed -i -e 's,#define NTPDRIFTFILE\t.*,#define NTPDRIFTFILE\t\t\"/var/lib/ntp/ntp.drift\",' \
- pathnames.h || die "sed failed"
-
- epatch "${FILESDIR}"/${P}-min-message.patch
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc ChangeLog
-}
diff --git a/net-misc/dhcpcd/dhcpcd-3.1.5-r1.ebuild b/net-misc/dhcpcd/dhcpcd-3.1.5-r1.ebuild
deleted file mode 100644
index fe44d94766a3..000000000000
--- a/net-misc/dhcpcd/dhcpcd-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.1.5-r1.ebuild,v 1.4 2009/01/08 01:39:08 darkside Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://dhcpcd.berlios.de"
-SRC_URI="http://download.berlios.de/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="vram"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Redefine the location of ntp.drift
- {
- echo
- echo "/* Gentoo stores ntpd drift file here */"
- echo "#undef NTPDRIFTFILE"
- echo "#define NTPDRIFTFILE \"/var/lib/ntp/ntp.drift\""
- } >> config.h
-
- # Disable DUID support if we have volatile storage.
- # LiveCD's *should* enable this USE flag
- if use vram; then
- einfo "Disabling DUID support in dhcpcd"
- {
- echo
- echo "/* User indicated volatile ram storage */"
- echo "#undef ENABLE_DUID"
- } >> config.h
- else
- einfo "DUID support enabled"
- fi
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc ChangeLog
-}
-
-pkg_postinst() {
- use vram && return 0
-
- ewarn "You have installed dhcpcd with DUID support."
- einfo "This means that we will generate a DUID in /var/lib/dhcpcd/dhcpcd.duid"
- einfo "This is generated from a MAC address of the card and a timestamp."
- einfo "It will be used in every subsequent DHCP transaction, along with a IAID"
- einfo "in the ClientID option. This is required by RFC 4361."
- echo
- ewarn "Some DHCP server implementations require a MAC address only in the"
- ewarn "ClientID field. These DHCP servers should be updated to be RFC"
- ewarn "conformant. If you cannot do this, you can revert to the old"
- ewarn "behaviour by using the -I '' option OR building dhcpcd with the"
- ewarn "vram USE flag enabled."
-}
diff --git a/net-misc/dhcpcd/dhcpcd-3.2.3.ebuild b/net-misc/dhcpcd/dhcpcd-3.2.3.ebuild
deleted file mode 100644
index 8b636cd616b0..000000000000
--- a/net-misc/dhcpcd/dhcpcd-3.2.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-3.2.3.ebuild,v 1.9 2009/01/08 01:39:08 darkside Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/dhcpcd"
-SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="vram zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- if use zeroconf; then
- elog "ZeroConf support enabled"
- else
- elog "Disabling zeroconf support"
- {
- echo
- echo "/* User indicated no zeroconf support */"
- echo "#undef ENABLE_IPV4LL"
- } >> config.h
- fi
-
- # Disable DUID support if we have volatile storage.
- # LiveCD's *should* enable this USE flag
- if use vram; then
- elog "Disabling DUID support"
- {
- echo
- echo "/* User indicated volatile ram storage */"
- echo "#undef ENABLE_DUID"
- } >> config.h
- else
- elog "DUID support enabled"
- fi
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" INFODIR=/var/lib/dhcpcd || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
- # Upgrade the duid file to the new format if needed
- local duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
- if [ -e "${duid}" ] && ! grep -q '..:..:..:..:..:..' "${duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${duid}"
- fi
-
- if use zeroconf; then
- elog "You have installed dhcpcd with zeroconf support."
- elog "This means that it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any existing"
- elog "failover support you may have configured in your net configuration."
- elog "This behaviour can be controlled with the -L flag."
- elog "See the dhcpcd man page for more details."
- fi
-
- if ! use vram; then
- use zeroconf && echo
- elog "You have installed dhcpcd with DUID support."
- elog "This means that we will generate a DUID in /var/lib/dhcpcd/dhcpcd.duid"
- elog "This is generated from a MAC address of the card and a timestamp."
- elog "It will be used in every subsequent DHCP transaction, along with a IAID"
- elog "in the ClientID option. This is required by RFC 4361."
- echo
- elog "Some DHCP server implementations require a MAC address only in the"
- elog "ClientID field. These DHCP servers should be updated to be RFC"
- elog "conformant. If you cannot do this, you can revert to the old"
- elog "behaviour by using the -I '' option OR building dhcpcd with the"
- elog "vram USE flag enabled."
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.10.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.10.ebuild
deleted file mode 100644
index 222f46aac969..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.10.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.10.ebuild,v 1.1 2009/02/04 09:37:47 the_paya Exp $
-
-EAPI=1
-
-inherit toolchain-funcs eutils
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-MY_P="${MY_P/_rc/-rc}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd"
-SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- if ! use zeroconf; then
- elog "Disabling zeroconf support"
- {
- echo
- echo "# dhcpcd ebuild requested no zeroconf"
- echo "noipv4ll"
- } >> dhcpcd.conf
- fi
-
- if use compat; then
- elog "dhcpcd-3 command line support enabled"
- {
- echo
- echo "/* User indicated command line compatability */"
- echo "#define CMDLINE_COMPAT"
- } >> config.h
- fi
-}
-
-pkg_setup() {
- MAKE_ARGS="DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd"
-}
-
-src_compile() {
- [ -z "${MAKE_ARGS}" ] && die "MAKE_ARGS is empty"
- emake CC="$(tc-getCC)" ${MAKE_ARGS} || die
-}
-
-src_install() {
- local hooks="50-ntp.conf"
- use elibc_glibc && hooks="${hooks} 50-yp.conf"
- use compat && hooks="${hooks} 50-dhcpcd-compat"
- emake ${MAKE_ARGS} HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
- # Upgrade the duid file to the new format if needed
- local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
- local new_duid="${ROOT}"/etc/dhcpcd.duid
- if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
-
- if use zeroconf; then
- elog "You have installed dhcpcd with zeroconf support."
- elog "This means that it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any existing"
- elog "failover support you may have configured in your net configuration."
- elog "This behaviour can be controlled with the -L flag."
- elog "See the dhcpcd man page for more details."
- fi
- if ! use compat; then
- elog
- elog "dhcpcd no longer sends a default ClientID for ethernet interfaces."
- elog "This is so we can re-use the address the kernel DHCP client found."
- elog "To retain the old behaviour of sending a default ClientID based on the"
- elog "hardware address for interface, simply add the keyword clientid"
- elog "to dhcpcd.conf or use commandline parameter -I ''"
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.11.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.11.ebuild
deleted file mode 100644
index 7dc5e89fdb80..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.11.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.11.ebuild,v 1.1 2009/02/19 22:18:36 welp Exp $
-
-EAPI=1
-
-inherit toolchain-funcs eutils
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-MY_P="${MY_P/_rc/-rc}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd"
-SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- if ! use zeroconf; then
- elog "Disabling zeroconf support"
- {
- echo
- echo "# dhcpcd ebuild requested no zeroconf"
- echo "noipv4ll"
- } >> dhcpcd.conf
- fi
-
- if use compat; then
- elog "dhcpcd-3 command line support enabled"
- {
- echo
- echo "/* User indicated command line compatability */"
- echo "#define CMDLINE_COMPAT"
- } >> config.h
- fi
-}
-
-pkg_setup() {
- MAKE_ARGS="DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd"
-}
-
-src_compile() {
- [ -z "${MAKE_ARGS}" ] && die "MAKE_ARGS is empty"
- emake CC="$(tc-getCC)" ${MAKE_ARGS} || die
-}
-
-src_install() {
- local hooks="50-ntp.conf"
- use elibc_glibc && hooks="${hooks} 50-yp.conf"
- use compat && hooks="${hooks} 50-dhcpcd-compat"
- emake ${MAKE_ARGS} HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
- # Upgrade the duid file to the new format if needed
- local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
- local new_duid="${ROOT}"/etc/dhcpcd.duid
- if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
-
- if use zeroconf; then
- elog "You have installed dhcpcd with zeroconf support."
- elog "This means that it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any existing"
- elog "failover support you may have configured in your net configuration."
- elog "This behaviour can be controlled with the -L flag."
- elog "See the dhcpcd man page for more details."
- fi
- if ! use compat; then
- elog
- elog "dhcpcd no longer sends a default ClientID for ethernet interfaces."
- elog "This is so we can re-use the address the kernel DHCP client found."
- elog "To retain the old behaviour of sending a default ClientID based on the"
- elog "hardware address for interface, simply add the keyword clientid"
- elog "to dhcpcd.conf or use commandline parameter -I ''"
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.12.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.12.ebuild
deleted file mode 100644
index d56732803bfe..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.12.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.12.ebuild,v 1.1 2009/02/26 14:32:01 armin76 Exp $
-
-EAPI=1
-
-inherit toolchain-funcs eutils
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-MY_P="${MY_P/_rc/-rc}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd"
-SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- if ! use zeroconf; then
- elog "Disabling zeroconf support"
- {
- echo
- echo "# dhcpcd ebuild requested no zeroconf"
- echo "noipv4ll"
- } >> dhcpcd.conf
- fi
-
- if use compat; then
- elog "dhcpcd-3 command line support enabled"
- {
- echo
- echo "/* User indicated command line compatability */"
- echo "#define CMDLINE_COMPAT"
- } >> config.h
- fi
-}
-
-pkg_setup() {
- MAKE_ARGS="DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd"
-}
-
-src_compile() {
- [ -z "${MAKE_ARGS}" ] && die "MAKE_ARGS is empty"
- emake CC="$(tc-getCC)" ${MAKE_ARGS} || die
-}
-
-src_install() {
- local hooks="50-ntp.conf"
- use elibc_glibc && hooks="${hooks} 50-yp.conf"
- use compat && hooks="${hooks} 50-dhcpcd-compat"
- emake ${MAKE_ARGS} HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
- # Upgrade the duid file to the new format if needed
- local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
- local new_duid="${ROOT}"/etc/dhcpcd.duid
- if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
-
- if use zeroconf; then
- elog "You have installed dhcpcd with zeroconf support."
- elog "This means that it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any existing"
- elog "failover support you may have configured in your net configuration."
- elog "This behaviour can be controlled with the -L flag."
- elog "See the dhcpcd man page for more details."
- fi
- if ! use compat; then
- elog
- elog "dhcpcd no longer sends a default ClientID for ethernet interfaces."
- elog "This is so we can re-use the address the kernel DHCP client found."
- elog "To retain the old behaviour of sending a default ClientID based on the"
- elog "hardware address for interface, simply add the keyword clientid"
- elog "to dhcpcd.conf or use commandline parameter -I ''"
- fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-4.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-4.0.8.ebuild
deleted file mode 100644
index b23347364330..000000000000
--- a/net-misc/dhcpcd/dhcpcd-4.0.8.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-4.0.8.ebuild,v 1.1 2009/01/28 08:45:19 armin76 Exp $
-
-EAPI=1
-
-inherit toolchain-funcs eutils
-
-MY_P="${P/_alpha/-alpha}"
-MY_P="${MY_P/_beta/-beta}"
-MY_P="${MY_P/_rc/-rc}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="http://roy.marples.name/projects/dhcpcd"
-SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-SLOT="0"
-IUSE="+compat zeroconf"
-
-DEPEND=""
-PROVIDE="virtual/dhcpc"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- if ! use zeroconf; then
- elog "Disabling zeroconf support"
- {
- echo
- echo "# dhcpcd ebuild requested no zeroconf"
- echo "noipv4ll"
- } >> dhcpcd.conf
- fi
-
- if use compat; then
- elog "dhcpcd-3 command line support enabled"
- {
- echo
- echo "/* User indicated command line compatability */"
- echo "#define CMDLINE_COMPAT"
- } >> config.h
- fi
-}
-
-pkg_setup() {
- MAKE_ARGS="DBDIR=/var/lib/dhcpcd LIBEXECDIR=/lib/dhcpcd"
-}
-
-src_compile() {
- [ -z "${MAKE_ARGS}" ] && die "MAKE_ARGS is empty"
- emake CC="$(tc-getCC)" ${MAKE_ARGS} || die
-}
-
-src_install() {
- local hooks="50-ntp.conf"
- use elibc_glibc && hooks="${hooks} 50-yp.conf"
- use compat && hooks="${hooks} 50-dhcpcd-compat"
- emake ${MAKE_ARGS} HOOKSCRIPTS="${hooks}" DESTDIR="${D}" install || die
-}
-
-pkg_postinst() {
- # Upgrade the duid file to the new format if needed
- local old_duid="${ROOT}"/var/lib/dhcpcd/dhcpcd.duid
- local new_duid="${ROOT}"/etc/dhcpcd.duid
- if [ -e "${old_duid}" ] && ! grep -q '..:..:..:..:..:..' "${old_duid}"; then
- sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_duid}"
- fi
-
- # Move the duid to /etc, a more sensible location
- if [ -e "${old_duid}" -a ! -e "${new_duid}" ]; then
- cp -p "${old_duid}" "${new_duid}"
- fi
-
- if use zeroconf; then
- elog "You have installed dhcpcd with zeroconf support."
- elog "This means that it will always obtain an IP address even if no"
- elog "DHCP server can be contacted, which will break any existing"
- elog "failover support you may have configured in your net configuration."
- elog "This behaviour can be controlled with the -L flag."
- elog "See the dhcpcd man page for more details."
- fi
- if ! use compat; then
- elog
- elog "dhcpcd no longer sends a default ClientID for ethernet interfaces."
- elog "This is so we can re-use the address the kernel DHCP client found."
- elog "To retain the old behaviour of sending a default ClientID based on the"
- elog "hardware address for interface, simply add the keyword clientid"
- elog "to dhcpcd.conf or use commandline parameter -I ''"
- fi
-}
diff --git a/net-misc/dhcpcd/files/dhcpcd-3.0.16-min-message.patch b/net-misc/dhcpcd/files/dhcpcd-3.0.16-min-message.patch
deleted file mode 100644
index c1448c2c493b..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-3.0.16-min-message.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: dhcp.c
-===================================================================
---- dhcp.c (revision 188)
-+++ dhcp.c (working copy)
-@@ -38,6 +38,7 @@
- #include "logger.h"
- #include "socket.h"
-
-+#define DHCP_PACKET_LENTH_MIN 300
- #define BROADCAST_FLAG 0x8000
-
- static const char *dhcp_message[] = {
-@@ -266,6 +267,11 @@
-
- *p++ = DHCP_END;
-
-+#ifdef DHCP_PACKET_LENTH_MIN
-+ while (p - m < DHCP_PACKET_LENTH_MIN)
-+ *p++ = 0;
-+#endif
-+
- message_length = p - m;
-
- memset (&packet, 0, sizeof (struct udp_dhcp_packet));
diff --git a/net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch b/net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch
deleted file mode 100644
index e8de24d40f93..000000000000
--- a/net-misc/dhcpcd/files/dhcpcd-4.0.1-no-empty-clientid.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Restore the 3.x behavior of an empty -I '' argument.
-
-Bug: http://bugs.marples.name/show_bug.cgi?id=116
-Patch: http://bugs.marples.name/attachment.cgi?id=56
-
-diff --git a/dhcpcd.c b/dhcpcd.c
-index 0219b02..d492a2d 100644
---- a/dhcpcd.c
-+++ b/dhcpcd.c
-@@ -511,7 +511,7 @@ parse_option(int opt, char *oarg, struct options *options)
- case 'I':
- /* Strings have a type of 0 */;
- options->clientid[1] = 0;
-- if (oarg)
-+ if (oarg && *oarg)
- s = parse_string_hwaddr((char *)options->clientid + 1,
- CLIENTID_MAX_LEN, oarg, 1);
- else