summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2013-06-07 15:25:04 +0000
committerWilliam Hubbs <williamh@gentoo.org>2013-06-07 15:25:04 +0000
commite634c4a95ebd2d033c9cf2f30c345bbbb1471f26 (patch)
treecf964b6492508812cf26e93b925e466a460d2a71 /net-misc
parentVersion bump. (diff)
downloadgentoo-2-e634c4a95ebd2d033c9cf2f30c345bbbb1471f26.tar.gz
gentoo-2-e634c4a95ebd2d033c9cf2f30c345bbbb1471f26.tar.bz2
gentoo-2-e634c4a95ebd2d033c9cf2f30c345bbbb1471f26.zip
revision
(Portage version: 2.2.0_alpha177/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/dhcpcd/ChangeLog8
-rw-r--r--net-misc/dhcpcd/dhcpcd-5.99.7-r1.ebuild83
-rw-r--r--net-misc/dhcpcd/files/dhcpcd-5.99.7-fix-prefix.patch33
3 files changed, 123 insertions, 1 deletions
diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog
index e7a210d9b25c..11e4e76fb8b7 100644
--- a/net-misc/dhcpcd/ChangeLog
+++ b/net-misc/dhcpcd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-misc/dhcpcd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.358 2013/06/04 16:23:20 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.359 2013/06/07 15:25:04 williamh Exp $
+
+*dhcpcd-5.99.7-r1 (07 Jun 2013)
+
+ 07 Jun 2013; William Hubbs <williamh@gentoo.org> +dhcpcd-5.99.7-r1.ebuild,
+ +files/dhcpcd-5.99.7-fix-prefix.patch:
+ revision bump for bug #358167
04 Jun 2013; William Hubbs <williamh@gentoo.org>
-files/dhcpcd-5.6.2-if-bsd.patch, -files/dhcpcd.initd-1:
diff --git a/net-misc/dhcpcd/dhcpcd-5.99.7-r1.ebuild b/net-misc/dhcpcd/dhcpcd-5.99.7-r1.ebuild
new file mode 100644
index 000000000000..0275f5e617a9
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-5.99.7-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.99.7-r1.ebuild,v 1.1 2013/06/07 15:25:04 williamh Exp $
+
+EAPI=5
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="git://roy.marples.name/${PN}.git"
+ inherit git-2
+else
+ MY_P="${P/_alpha/-alpha}"
+ MY_P="${MY_P/_beta/-beta}"
+ MY_P="${MY_P/_rc/-rc}"
+ SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare()
+{
+ epatch "${FILESDIR}"/${P}-fix-prefix.patch
+ epatch_user
+}
+
+src_configure()
+{
+ local hooks="--with-hook=ntp.conf"
+ use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+ econf \
+ --prefix="${EPREFIX}" \
+ --libexecdir="${EPREFIX}/lib/dhcpcd" \
+ --dbdir="${EPREFIX}/var/lib/dhcpcd" \
+ --localstatedir="${EPREFIX}/var" \
+ ${hooks}
+}
+
+src_install()
+{
+ default
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+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
+
+ elog
+ elog "dhcpcd has zeroconf support active by default."
+ elog "This means 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 noipv4ll configuration"
+ elog "file option or the -L command line switch."
+ elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+ if ! has_version net-dns/bind-tools; then
+ elog
+ elog "If you activate the lookup-hostname hook to look up your hostname"
+ elog "using the dns, you need to install net-dns/bind-tools."
+ fi
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-5.99.7-fix-prefix.patch b/net-misc/dhcpcd/files/dhcpcd-5.99.7-fix-prefix.patch
new file mode 100644
index 000000000000..05def8cca38c
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-5.99.7-fix-prefix.patch
@@ -0,0 +1,33 @@
+From 791c63ac688169ed7d0b4145dfefb2ce0c9cc7d4 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Thu, 6 Jun 2013 01:31:00 +0100
+Subject: [PATCH] Prefer --prefix over $PREFIX
+
+---
+ configure | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 896a8fe..1fe383c 100755
+--- a/configure
++++ b/configure
+@@ -36,7 +36,7 @@ for x do
+ --enable-ipv4) INET=yes;;
+ --disable-ipv6) INET6=no;;
+ --enable-ipv6) INET6=yes;;
+- --prefix) prefix=$var;;
++ --prefix) PREFIX=$var;;
+ --sysconfdir) SYSCONFDIR=$var;;
+ --bindir|--sbindir) SBINDIR=$var;;
+ --libexecdir) LIBEXECDIR=$var;;
+@@ -135,7 +135,6 @@ done
+ : ${SED:=sed}
+
+ : ${FORK:=yes}
+-: ${PREFIX:=$prefix}
+ : ${SYSCONFDIR:=$PREFIX/etc}
+ : ${SBINDIR:=$PREFIX/sbin}
+ : ${LIBDIR:=$PREFIX/lib}
+--
+1.8.1.5
+