From ae51d93e5f54eabe31dcb4c7bd5f450c66999e45 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Fri, 23 Feb 2007 12:00:10 +0000 Subject: [PATCH] Bump for a non bash init script. Package-Manager: portage-2.1.2-r10 --- net-misc/udhcp/ChangeLog | 10 +++- net-misc/udhcp/Manifest | 33 +++++------ .../files/digest-udhcp-0.9.9_pre20041216-r4 | 3 + net-misc/udhcp/files/udhcp.rc | 12 ++-- .../udhcp/udhcp-0.9.9_pre20041216-r4.ebuild | 57 +++++++++++++++++++ 5 files changed, 90 insertions(+), 25 deletions(-) create mode 100644 net-misc/udhcp/files/digest-udhcp-0.9.9_pre20041216-r4 create mode 100644 net-misc/udhcp/udhcp-0.9.9_pre20041216-r4.ebuild diff --git a/net-misc/udhcp/ChangeLog b/net-misc/udhcp/ChangeLog index 66e1bb5c4dc7..cd7f6a204ad7 100644 --- a/net-misc/udhcp/ChangeLog +++ b/net-misc/udhcp/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/udhcp -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/ChangeLog,v 1.31 2006/10/15 13:46:53 uberlord Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/ChangeLog,v 1.32 2007/02/23 12:00:10 uberlord Exp $ + +*udhcp-0.9.9_pre20041216-r4 (23 Feb 2007) + + 23 Feb 2007; Roy Marples files/udhcp.rc, + +udhcp-0.9.9_pre20041216-r4.ebuild: + Bump for a non bash init script. 15 Oct 2006; Roy Marples files/udhcpc.sh: Respect PEER_ROUTERS set by the nogateway option in conf.d/net, #151240. diff --git a/net-misc/udhcp/Manifest b/net-misc/udhcp/Manifest index b460b569329d..4b2db4f70695 100644 --- a/net-misc/udhcp/Manifest +++ b/net-misc/udhcp/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX udhcp-0.9.9_pre20041216-env.patch 3599 RMD160 4f111f1769232f3bddf5881f8b4a339e74e8309d SHA1 afd89eab23146c490a9597cfa541d66623d370b8 SHA256 5ee4c293e667f4bfa5f8a5a50ce1b1cc3b2dda5de000094fd698e7736ee28c17 MD5 64bb08e23054a3867d2cc4b2014e97e0 files/udhcp-0.9.9_pre20041216-env.patch 3599 RMD160 4f111f1769232f3bddf5881f8b4a339e74e8309d files/udhcp-0.9.9_pre20041216-env.patch 3599 @@ -9,10 +6,10 @@ AUX udhcp-gcc-3.4.patch 261 RMD160 d0c31131bc4c14ef20f0a52c46e15a6034bb3fc9 SHA1 MD5 841852ac59a61a1940dd9d509821f231 files/udhcp-gcc-3.4.patch 261 RMD160 d0c31131bc4c14ef20f0a52c46e15a6034bb3fc9 files/udhcp-gcc-3.4.patch 261 SHA256 f4ffec4f9bf809b82c4f8a48a3a0b098084c50f904d6c8b1513cb32087459802 files/udhcp-gcc-3.4.patch 261 -AUX udhcp.rc 719 RMD160 15d474dd873685bf1c301e772548a27f6fc26d5e SHA1 0e30d4c84129f768904e473960c1abb0f79f2747 SHA256 ec031a7de6ed600d5172fc6e131dfd16160e471da9aac8558ad88f1b1c5bc6e1 -MD5 f74f1f81c1fd4933d63b860dc070eec6 files/udhcp.rc 719 -RMD160 15d474dd873685bf1c301e772548a27f6fc26d5e files/udhcp.rc 719 -SHA256 ec031a7de6ed600d5172fc6e131dfd16160e471da9aac8558ad88f1b1c5bc6e1 files/udhcp.rc 719 +AUX udhcp.rc 819 RMD160 b80fee5a52c80913ed838f52341e6bacb8e4a576 SHA1 593a4bed11d0045e6dc6accab3f82074701b211a SHA256 7579fbea1af3327c6cd0e9a75517d4b785dec9d1371065552c3d33683a1ba9cb +MD5 27d1351fca38c390e2cf8d3fc0596050 files/udhcp.rc 819 +RMD160 b80fee5a52c80913ed838f52341e6bacb8e4a576 files/udhcp.rc 819 +SHA256 7579fbea1af3327c6cd0e9a75517d4b785dec9d1371065552c3d33683a1ba9cb files/udhcp.rc 819 AUX udhcpc.sh 2448 RMD160 da50cc701398ebc9324c885e0a161a58e51f798f SHA1 567b85273efc52146fe9b05f9ac9b648f9cf43c7 SHA256 db1e46cd54a19a3f18e9127422e6d292039f5b0e166b118f43dcad309107a43b MD5 1c8b2d4d39c05153522738aca4dc26fb files/udhcpc.sh 2448 RMD160 da50cc701398ebc9324c885e0a161a58e51f798f files/udhcpc.sh 2448 @@ -31,10 +28,14 @@ EBUILD udhcp-0.9.9_pre20041216-r3.ebuild 1503 RMD160 1a964b7cc171a857001abcf0963 MD5 a56d9ce66e90ea6051282b62f08a9af0 udhcp-0.9.9_pre20041216-r3.ebuild 1503 RMD160 1a964b7cc171a857001abcf0963b58c1265c93ec udhcp-0.9.9_pre20041216-r3.ebuild 1503 SHA256 150c8c91f63eceda4864620a30069947fdf8cbf481122c6588c32747371e284c udhcp-0.9.9_pre20041216-r3.ebuild 1503 -MISC ChangeLog 4366 RMD160 fbb8f0246b48b586bd24a1c6e132f858ed06be09 SHA1 2a2c5ca3a2ec52b21d309c3422e3fe7c822820e7 SHA256 08ba55cc52dca1497e081f882e79bd40f924e2b7293ae083b5e908906d9da40e -MD5 fec0bbbcb5a925ca969d8141acc250b9 ChangeLog 4366 -RMD160 fbb8f0246b48b586bd24a1c6e132f858ed06be09 ChangeLog 4366 -SHA256 08ba55cc52dca1497e081f882e79bd40f924e2b7293ae083b5e908906d9da40e ChangeLog 4366 +EBUILD udhcp-0.9.9_pre20041216-r4.ebuild 1504 RMD160 f32809a6960e090e18c837da977ee4a352900705 SHA1 97188b82b1172e157f05e706631888abeea93d34 SHA256 9d10e23b2fcea50bfbb38e6c2dd62040d57f9ae58ecc8bd173ce941e34af7ec4 +MD5 032a47e4160a84030c7f46d6666e7873 udhcp-0.9.9_pre20041216-r4.ebuild 1504 +RMD160 f32809a6960e090e18c837da977ee4a352900705 udhcp-0.9.9_pre20041216-r4.ebuild 1504 +SHA256 9d10e23b2fcea50bfbb38e6c2dd62040d57f9ae58ecc8bd173ce941e34af7ec4 udhcp-0.9.9_pre20041216-r4.ebuild 1504 +MISC ChangeLog 4548 RMD160 370693d2c7abd34e9f8f62f1243603fd64a893e9 SHA1 2b5aeb7d18af9183c0122efcfe62db401c23e4b4 SHA256 9e389f40a5622df2b7c545c43681e35e4ea5f5ce7ddbe9a4c6e84837a0525c66 +MD5 d5eee26a07579c441f3b84306d669ea2 ChangeLog 4548 +RMD160 370693d2c7abd34e9f8f62f1243603fd64a893e9 ChangeLog 4548 +SHA256 9e389f40a5622df2b7c545c43681e35e4ea5f5ce7ddbe9a4c6e84837a0525c66 ChangeLog 4548 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161 @@ -48,10 +49,6 @@ SHA256 8e1df539da56f114fe2b51e764815ff78da8a95d378222fce1568467d63f19e0 files/di MD5 3abdec37a6b19a6b855f1a7b4f291234 files/digest-udhcp-0.9.9_pre20041216-r3 271 RMD160 a3cc96f239981b7db322e546083f1a17563e4d51 files/digest-udhcp-0.9.9_pre20041216-r3 271 SHA256 8e1df539da56f114fe2b51e764815ff78da8a95d378222fce1568467d63f19e0 files/digest-udhcp-0.9.9_pre20041216-r3 271 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFVqDDamhnQswr0vIRAvkBAJ0f7lJ4TXWD2QehrtMtWrscifucrwCePAbF -3r5M704yLaQf74ukKDQcsm4= -=jHWn ------END PGP SIGNATURE----- +MD5 3abdec37a6b19a6b855f1a7b4f291234 files/digest-udhcp-0.9.9_pre20041216-r4 271 +RMD160 a3cc96f239981b7db322e546083f1a17563e4d51 files/digest-udhcp-0.9.9_pre20041216-r4 271 +SHA256 8e1df539da56f114fe2b51e764815ff78da8a95d378222fce1568467d63f19e0 files/digest-udhcp-0.9.9_pre20041216-r4 271 diff --git a/net-misc/udhcp/files/digest-udhcp-0.9.9_pre20041216-r4 b/net-misc/udhcp/files/digest-udhcp-0.9.9_pre20041216-r4 new file mode 100644 index 000000000000..d5e8d6d049f6 --- /dev/null +++ b/net-misc/udhcp/files/digest-udhcp-0.9.9_pre20041216-r4 @@ -0,0 +1,3 @@ +MD5 759bb5f1f05e4725a48e5019fa5f61f2 udhcp-0.9.9_pre20041216.tar.bz2 42353 +RMD160 ed223b166f9ab9c0e0b210b690319e3ca8417af5 udhcp-0.9.9_pre20041216.tar.bz2 42353 +SHA256 e4bcf9490f5e5c14a97d6ca46f054225e15a765edf9cdb181888032a0082dad6 udhcp-0.9.9_pre20041216.tar.bz2 42353 diff --git a/net-misc/udhcp/files/udhcp.rc b/net-misc/udhcp/files/udhcp.rc index 668b05a2e714..59d1fb841f5b 100755 --- a/net-misc/udhcp/files/udhcp.rc +++ b/net-misc/udhcp/files/udhcp.rc @@ -1,19 +1,19 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/files/udhcp.rc,v 1.1 2005/06/07 00:10:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/files/udhcp.rc,v 1.2 2007/02/23 12:00:10 uberlord Exp $ depend() { use net logger } checkconfig() { - if [[ ! -f /etc/udhcpd.conf ]] ; then + if [ ! -f /etc/udhcpd.conf ] ; then eerror "No /etc/udhcpd.conf file exists" return 1 fi - if [[ ! -e /var/lib/misc/udhcpd.leases ]] ; then + if [ ! -e /var/lib/misc/udhcpd.leases ] ; then ebegin "Creating udhcpd.leases" touch /var/lib/misc/udhcpd.leases || return 1 eend $? @@ -24,12 +24,14 @@ start() { checkconfig || return 1 ebegin "Starting udhcpd" - udhcpd > /dev/null + start-stop-daemon --start --exec /sbin/udhcpd \ + --pidfile /var/run/udhcpd.pid >/dev/null eend $? } stop() { ebegin "Stopping udhcpd" - start-stop-daemon --stop --pidfile /var/run/udhcpd.pid + start-stop-daemon --stop --exec /sbin/udhcpd \ + --pidfile /var/run/udhcpd.pid eend $? } diff --git a/net-misc/udhcp/udhcp-0.9.9_pre20041216-r4.ebuild b/net-misc/udhcp/udhcp-0.9.9_pre20041216-r4.ebuild new file mode 100644 index 000000000000..527fb4b7d16d --- /dev/null +++ b/net-misc/udhcp/udhcp-0.9.9_pre20041216-r4.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/udhcp/udhcp-0.9.9_pre20041216-r4.ebuild,v 1.1 2007/02/23 12:00:10 uberlord Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="udhcp Server/Client Package" +HOMEPAGE="http://udhcp.busybox.net/" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86" +IUSE="" + +DEPEND="virtual/libc" +PROVIDE="virtual/dhcpc" + +S="${WORKDIR}/${PN}" + +pkg_setup() { + enewgroup dhcp + enewuser dhcp -1 -1 /var/lib/dhcp dhcp +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # This patch adds the --env,-e option to udhcpc so we can pass the dhcp + # client some environment variables to pass to the script. We do this so + # the script knows mertric and whether to setup DNS, NTP and routers. + epatch "${FILESDIR}/${P}"-env.patch +} + +src_compile() { + emake \ + CROSS_COMPILE=${CHOST}- \ + STRIP=true \ + UDHCP_SYSLOG=1 \ + || die +} + +src_install() { + make STRIP=true install DESTDIR="${D}" USRSBINDIR="${D}/sbin" || die + newinitd "${FILESDIR}"/udhcp.rc udhcp + insinto /etc + doins samples/udhcpd.conf + dodoc AUTHORS ChangeLog README* TODO + newdoc samples/README README.scripts + + # udhcpc setup script - the supplied ones don't work + # This does it supports resolvconf, metrics and whether to setup + # dns, ntp and routers. Requires the --env patch above. + exeinto /lib/rcscripts/sh + newexe "${FILESDIR}"/udhcpc.sh udhcpc.sh +} -- 2.26.2