From 8f8fa58023043fa120d682cdfb1dd22c91869fad Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 3 Feb 2012 16:35:13 +0000 Subject: version bump for compile issue and remove old unstable version. (Portage version: 2.2.0_alpha84/cvs/Linux i686) --- net-misc/dhcpcd/ChangeLog | 8 ++- net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild | 104 -------------------------------- net-misc/dhcpcd/dhcpcd-5.5.2.ebuild | 99 ------------------------------ net-misc/dhcpcd/dhcpcd-5.5.3.ebuild | 99 ++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 204 deletions(-) delete mode 100644 net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild delete mode 100644 net-misc/dhcpcd/dhcpcd-5.5.2.ebuild create mode 100644 net-misc/dhcpcd/dhcpcd-5.5.3.ebuild (limited to 'net-misc/dhcpcd') diff --git a/net-misc/dhcpcd/ChangeLog b/net-misc/dhcpcd/ChangeLog index efb12a27a96d..9212840c3aff 100644 --- a/net-misc/dhcpcd/ChangeLog +++ b/net-misc/dhcpcd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/dhcpcd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.327 2012/02/03 16:21:34 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/ChangeLog,v 1.328 2012/02/03 16:35:13 williamh Exp $ + +*dhcpcd-5.5.3 (03 Feb 2012) + + 03 Feb 2012; William Hubbs +dhcpcd-5.5.3.ebuild, + -dhcpcd-5.2.12-r1.ebuild, -dhcpcd-5.5.2.ebuild: + version bump for compile issue and remove old unstable version. *dhcpcd-5.5.2 (03 Feb 2012) diff --git a/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild b/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild deleted file mode 100644 index aa22c1e68f11..000000000000 --- a/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.2.12-r1.ebuild,v 1.7 2012/02/03 16:21:34 williamh Exp $ - -EAPI=4 - -inherit eutils systemd - -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 ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" - -SLOT="0" -IUSE="+zeroconf elibc_glibc" - -DEPEND="" -RDEPEND="" - -src_prepare() { - if ! use zeroconf; then - elog "Disabling zeroconf support" - { - echo - echo "# dhcpcd ebuild requested no zeroconf" - echo "noipv4ll" - } >> dhcpcd.conf - fi -} - -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_compile() { - emake -} - -src_install() { - emake DESTDIR="${D}" install - dodoc README - newinitd "${FILESDIR}"/${PN}.initd-1 ${PN} - systemd_dounit "${FILESDIR}"/${PN}.service || 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 - - elog - elog "Users upgrading from 4.0 series should pay attention to removal" - elog "of compat useflag. This changes behavior of dhcp in wide manner:" - 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 ''" - elog - elog "Also, users upgrading from 4.0 series should be aware that" - elog "the -N, -R and -Y command line options no longer exist." - elog "These are controled now by nohook options in dhcpcd.conf." - - # Mea culpa, feel free to remove that after some time --mgorny. - if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service ]] - then - ebegin "Moving ${PN}.service to multi-user.target" - mv "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service \ - "${ROOT}"/etc/systemd/system/multi-user.target.wants/ - eend ${?} \ - "Please try to re-enable dhcpcd.service" - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild b/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild deleted file mode 100644 index 21f3396ef952..000000000000 --- a/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.5.2.ebuild,v 1.1 2012/02/03 16:21:35 williamh Exp $ - -EAPI=4 - -inherit eutils systemd - -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 ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" - -SLOT="0" -IUSE="+zeroconf elibc_glibc" - -DEPEND="" -RDEPEND="" - -src_prepare() { - if ! use zeroconf; then - elog "Disabling zeroconf support" - { - echo - echo "# dhcpcd ebuild requested no zeroconf" - echo "noipv4ll" - } >> dhcpcd.conf - fi -} - -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 - - 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 - - elog - elog "Users upgrading from 4.0 series should pay attention to removal" - elog "of compat useflag. This changes behavior of dhcp in wide manner:" - 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 ''" - elog - elog "Also, users upgrading from 4.0 series should be aware that" - elog "the -N, -R and -Y command line options no longer exist." - elog "These are controled now by nohook options in dhcpcd.conf." - - # Mea culpa, feel free to remove that after some time --mgorny. - if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service ]] - then - ebegin "Moving ${PN}.service to multi-user.target" - mv "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service \ - "${ROOT}"/etc/systemd/system/multi-user.target.wants/ - eend ${?} \ - "Please try to re-enable dhcpcd.service" - fi -} diff --git a/net-misc/dhcpcd/dhcpcd-5.5.3.ebuild b/net-misc/dhcpcd/dhcpcd-5.5.3.ebuild new file mode 100644 index 000000000000..b03d2884af39 --- /dev/null +++ b/net-misc/dhcpcd/dhcpcd-5.5.3.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd/dhcpcd-5.5.3.ebuild,v 1.1 2012/02/03 16:35:13 williamh Exp $ + +EAPI=4 + +inherit eutils systemd + +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 ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux" + +SLOT="0" +IUSE="+zeroconf elibc_glibc" + +DEPEND="" +RDEPEND="" + +src_prepare() { + if ! use zeroconf; then + elog "Disabling zeroconf support" + { + echo + echo "# dhcpcd ebuild requested no zeroconf" + echo "noipv4ll" + } >> dhcpcd.conf + fi +} + +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 + + 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 + + elog + elog "Users upgrading from 4.0 series should pay attention to removal" + elog "of compat useflag. This changes behavior of dhcp in wide manner:" + 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 ''" + elog + elog "Also, users upgrading from 4.0 series should be aware that" + elog "the -N, -R and -Y command line options no longer exist." + elog "These are controled now by nohook options in dhcpcd.conf." + + # Mea culpa, feel free to remove that after some time --mgorny. + if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service ]] + then + ebegin "Moving ${PN}.service to multi-user.target" + mv "${ROOT}"/etc/systemd/system/network.target.wants/${PN}.service \ + "${ROOT}"/etc/systemd/system/multi-user.target.wants/ + eend ${?} \ + "Please try to re-enable dhcpcd.service" + fi +} -- cgit v1.2.3-65-gdbad