version bump as per bug #124510 thanks to Gonzalo Aguilar Delgado

(Portage version: 2.1_rc4)

7 files changed, 144 insertions, 4 deletions

diff --git a/net-misc/netkit-bootpd/ChangeLog b/net-misc/netkit-bootpd/ChangeLog
index 8d19618ed594..eaf8b72b631e 100644
--- a/net-misc/netkit-bootpd/ChangeLog
+++ b/net-misc/netkit-bootpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2004/09/19 08:41:59 dragonheart Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/ChangeLog,v 1.11 2006/06/04 12:26:44 dragonheart Exp $
+
+*netkit-bootpd-2.4 (04 Jun 2006)
+
+  04 Jun 2006; Daniel Black <dragonheart@gentoo.org>
+  +files/netkit-bootpd-2.4-misc.patch, +netkit-bootpd-2.4.ebuild:
+  version bump as per bug #124510 thanks to Gonzalo Aguilar Delgado
 
 *netkit-bootpd-0.17-r2 (19 Sep 2004)
 
diff --git a/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1 b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1
index 8c3a50839166..90888042fc97 100644
--- a/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1
+++ b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r1
@@ -1 +1,3 @@
 MD5 00d211115b11aec2e214b701fe72f397 netkit-bootparamd_0.17.orig.tar.gz 13934
+RMD160 f71e5449823b87c4f188be0ef63575ee58cdb241 netkit-bootparamd_0.17.orig.tar.gz 13934
+SHA256 7fd44b14f7ee5bf930bdd03b0c3a15bdb6efb60a862af47269b05361c4ed395c netkit-bootparamd_0.17.orig.tar.gz 13934
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
index 8c3a50839166..90888042fc97 100644
--- a/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r2
+++ b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-0.17-r2
@@ -1 +1,3 @@
 MD5 00d211115b11aec2e214b701fe72f397 netkit-bootparamd_0.17.orig.tar.gz 13934
+RMD160 f71e5449823b87c4f188be0ef63575ee58cdb241 netkit-bootparamd_0.17.orig.tar.gz 13934
+SHA256 7fd44b14f7ee5bf930bdd03b0c3a15bdb6efb60a862af47269b05361c4ed395c netkit-bootparamd_0.17.orig.tar.gz 13934
diff --git a/net-misc/netkit-bootpd/files/digest-netkit-bootpd-2.4 b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-2.4
new file mode 100644
index 000000000000..3bf607265793
--- /dev/null
+++ b/net-misc/netkit-bootpd/files/digest-netkit-bootpd-2.4
@@ -0,0 +1,3 @@
+MD5 bf5f112c2e9b29e7681dd3b766342ee5 bootpd-2.4.tar.gz 99765
+RMD160 88de24f8429bf40b5f3f9bd7c59c5cf66b7d6770 bootpd-2.4.tar.gz 99765
+SHA256 13edffae98fd92d99e23b19456b0199d9496fd2121c1325c762bccd23f586682 bootpd-2.4.tar.gz 99765
diff --git a/net-misc/netkit-bootpd/files/netkit-bootpd-2.4-misc.patch b/net-misc/netkit-bootpd/files/netkit-bootpd-2.4-misc.patch
new file mode 100644
index 000000000000..bf4183e932c7
--- /dev/null
+++ b/net-misc/netkit-bootpd/files/netkit-bootpd-2.4-misc.patch
@@ -0,0 +1,86 @@
+diff -Naur bootpd-2.4/bootpd.c bootpd-2.4.new/bootpd.c
+--- bootpd-2.4/bootpd.c	1995-02-19 16:53:02.000000000 +0100
++++ bootpd-2.4.new/bootpd.c	2006-03-01 12:32:06.665548576 +0100
+@@ -185,7 +185,7 @@
+  * main server loop is started.
+  */
+ 
+-void
++int
+ main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -559,9 +559,9 @@
+ 			break;
+ 		}
+ 	}
++	return(0);
+ }
+ 
+-
+ 
+ 
+ /*
+diff -Naur bootpd-2.4/bootpef.c bootpd-2.4.new/bootpef.c
+--- bootpd-2.4/bootpef.c	1994-11-27 14:36:13.000000000 +0100
++++ bootpd-2.4.new/bootpef.c	2006-03-01 12:32:06.652550552 +0100
+@@ -139,7 +139,7 @@
+  * Initialization such as command-line processing is done and then the
+  * main server loop is started.
+  */
+-void
++int
+ main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -275,6 +275,7 @@
+ 		mktagfile(hp);
+ 		hp = (struct host *) hash_NextEntry(nmhashtable);
+ 	}
++	return(0);
+ }
+ 
+ 
+diff -Naur bootpd-2.4/bootpgw.c bootpd-2.4.new/bootpgw.c
+--- bootpd-2.4/bootpgw.c	1994-11-27 14:36:21.000000000 +0100
++++ bootpd-2.4.new/bootpgw.c	2006-03-01 12:32:06.665548576 +0100
+@@ -152,7 +152,7 @@
+  * main server loop is started.
+  */
+ 
+-void
++int
+ main(argc, argv)
+ 	int argc;
+ 	char **argv;
+@@ -481,6 +481,7 @@
+ 			break;
+ 		}
+ 	}
++	return(0);
+ }
+ 
+ 
+diff -Naur bootpd-2.4/getether.c bootpd-2.4.new/getether.c
+--- bootpd-2.4/getether.c	1994-11-27 14:36:20.000000000 +0100
++++ bootpd-2.4.new/getether.c	2006-03-01 12:32:06.664548728 +0100
+@@ -340,7 +340,7 @@
+ 	if (ioctl(fd, SIOCGIFHWADDR, &phys) < 0) {
+ 		report(LOG_ERR, "getether: ioctl SIOCGIFHWADDR failed");
+ 	} else {
+-		bcopy(phys.ifr_hwaddr, eap, EALEN);
++		bcopy(&phys.ifr_hwaddr, eap, EALEN);
+ 		rc = 0;
+ 	}
+ 	close(fd);
+diff -Naur bootpd-2.4/report.c bootpd-2.4.new/report.c
+--- bootpd-2.4/report.c	1994-11-27 14:36:16.000000000 +0100
++++ bootpd-2.4.new/report.c	2006-03-01 12:32:06.658549640 +0100
+@@ -10,6 +10,7 @@
+ 
+ #include <stdio.h>
+ #include <syslog.h>
++#include <errno.h>
+ 
+ #include "report.h"
+ 
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
index 53622ea645fd..ce6078b03071 100644
--- a/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
+++ b/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 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-r1.ebuild,v 1.21 2004/07/15 03:06:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/netkit-bootpd-0.17-r1.ebuild,v 1.22 2006/06/04 12:26:44 dragonheart Exp $
 
 MY_PN=${PN/pd/paramd}
 S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild b/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild
new file mode 100644
index 000000000000..41577f25c2db
--- /dev/null
+++ b/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-bootpd/netkit-bootpd-2.4.ebuild,v 1.1 2006/06/04 12:26:44 dragonheart Exp $
+
+inherit eutils
+
+
+MY_P=${P/netkit-/}
+DESCRIPTION="Netkit - bootp"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netboot/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~hppa ~mips ~ppc ~sparc ~x86"
+IUSE=""
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-misc.patch
+}
+
+src_compile() {
+	emake linux || die "Error compilando"
+}
+
+src_install() {
+	into /usr
+	dosbin bootpd bootpef bootpgw bootptest
+	dosym dosbin /usr/sbin/in.dosbin
+	dosym bootpd /usr/sbin/in.bootpd
+	dosym bootpef /usr/sbin/in.bootpef
+	dosym bootpgw /usr/sbin/in.bootpgw
+	dosym bootptest /usr/sbin/in.bootptest
+	doman bootpd.8
+	doman bootpef.8
+	doman bootptest.8
+	dodoc README README-linux
+#	newdoc rpc.bootparamd/README README.bootparamd
+}