Patch applied to make this compatible with jumpstart.bug #63940

5 files changed, 76 insertions, 2 deletions

diff --git a/net-misc/netkit-bootpd/ChangeLog b/net-misc/netkit-bootpd/ChangeLog
index 6dd70cff75f1..8d19618ed594 100644
--- a/net-misc/netkit-bootpd/ChangeLog
+++ b/net-misc/netkit-bootpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/netkit-bootpd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/ChangeLog,v 1.9 2004/06/24 23:58:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/ChangeLog,v 1.10 2004/09/19 08:41:59 dragonheart Exp $
+
+*netkit-bootpd-0.17-r2 (19 Sep 2004)
+
+  19 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/0.17-jumpstart.patch, +netkit-bootpd-0.17-r2.ebuild:
+  Patch applied to make this compatible with jumpstart. Patch by Steve-o
+  <fnjordy@gmail.com> in bug #63940
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
diff --git a/net-misc/netkit-bootpd/Manifest b/net-misc/netkit-bootpd/Manifest
index 27bf763cf196..91ef818cfb80 100644
--- a/net-misc/netkit-bootpd/Manifest
+++ b/net-misc/netkit-bootpd/Manifest
@@ -1,3 +1,6 @@
-MD5 0d1e04d4f16edae8ed199f5c24e49dc8 netkit-bootpd-0.17-r1.ebuild 888
 MD5 6e2c72674ffad78bebad526a0759c22c ChangeLog 1112
+MD5 0d1e04d4f16edae8ed199f5c24e49dc8 netkit-bootpd-0.17-r1.ebuild 888
+MD5 7d3d2d1e9d52d76b2bf48279c2f3d9fa netkit-bootpd-0.17-r2.ebuild 955
 MD5 0fff8ed5c4395d99043f3f50422826bb files/digest-netkit-bootpd-0.17-r1 78
+MD5 6d9cf6a3cff3c0b1c71ce938a7a5fc6a files/0.17-jumpstart.patch 1163
+MD5 0fff8ed5c4395d99043f3f50422826bb files/digest-netkit-bootpd-0.17-r2 78
diff --git a/net-misc/netkit-bootpd/files/0.17-jumpstart.patch b/net-misc/netkit-bootpd/files/0.17-jumpstart.patch
new file mode 100644
index 000000000000..41b471b5075f
--- /dev/null
+++ b/net-misc/netkit-bootpd/files/0.17-jumpstart.patch
@@ -0,0 +1,25 @@
+diff -urN netkit-bootparamd-0.17.old/rpc.bootparamd/rpc.bootparamd.c netkit-bootparamd-0.17/rpc.bootparamd/rpc.bootparamd.c
+--- netkit-bootparamd-0.17.old/rpc.bootparamd/rpc.bootparamd.c	2000-07-22 12:23:56.000000000 -0400
++++ netkit-bootparamd-0.17/rpc.bootparamd/rpc.bootparamd.c	2004-09-13 17:42:43.000000000 -0400
+@@ -136,11 +136,16 @@
+ 	    strncpy(path, where, sizeof(path));
+ 	    path[sizeof(path)-1] = 0;
+ 	    he = gethostbyname(hostname);
+-	    if (!he) goto failed;
+-	    bcopy( he->h_addr, &res.server_address.bp_address_u.ip_addr, 4);
+-	    res.server_name = hostname;
+-	    res.server_path = path;
+-	    res.server_address.address_type = IP_ADDR_TYPE;
++	    if (!he) {	/* jumpstart parameters are not valid hosts */
++		res.server_name = hostname;
++		res.server_path = path;
++		bzero(&res.server_address.bp_address_u.ip_addr,4);
++	    } else {
++	    	bcopy( he->h_addr, &res.server_address.bp_address_u.ip_addr, 4);
++	        res.server_name = hostname;
++		res.server_path = path;
++		res.server_address.address_type = IP_ADDR_TYPE;
++	    }
+ 	}
+ 	else { /* special for dump, answer with null strings */
+ 	    if (!strcmp(getfile->file_id, "dump")) {
diff --git a/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r2 b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r2
new file mode 100644
index 000000000000..8c3a50839166
--- /dev/null
+++ b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r2
@@ -0,0 +1 @@
+MD5 00d211115b11aec2e214b701fe72f397 netkit-bootparamd_0.17.orig.tar.gz 13934
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r2.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-0.17-r2.ebuild
new file mode 100644
index 000000000000..5d7134a41d95
--- /dev/null
+++ b/net-misc/netkit-bootpd/netkit-bootpd-0.17-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/netkit-bootpd-0.17-r2.ebuild,v 1.1 2004/09/19 08:41:59 dragonheart Exp $
+
+inherit eutils
+
+MY_PN=${PN/pd/paramd}
+S=${WORKDIR}/${MY_PN}-${PV}
+DESCRIPTION="Netkit - bootp"
+SRC_URI="mirror://debian/pool/main/n/netkit-bootparamd/${MY_PN}_${PV}.orig.tar.gz"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+
+KEYWORDS="~x86 ~sparc ~ppc ~mips"
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/0.17-jumpstart.patch || die "failed to apply patch"
+}
+
+src_compile() {
+	# Note this is not an autoconf configure
+	./configure || die
+	emake || die
+}
+
+src_install() {
+	into /usr
+	dosbin rpc.bootparamd/bootparamd
+	dosym bootparamd /usr/sbin/rpc.bootparamd
+	doman rpc.bootparamd/bootparamd.8
+	dosym bootparamd.8.gz /usr/share/man/man8/rpc.bootparamd.8.gz
+	doman rpc.bootparamd/bootparams.5
+	dodoc README ChangeLog
+	newdoc rpc.bootparamd/README README.bootparamd
+}