virtual/inetd providing

7 files changed, 20 insertions, 58 deletions

diff --git a/sys-apps/netkit-base/ChangeLog b/sys-apps/netkit-base/ChangeLog
index d04897e93e8c..a561a4cc0c15 100644
--- a/sys-apps/netkit-base/ChangeLog
+++ b/sys-apps/netkit-base/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-apps/netkit-base
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/ChangeLog,v 1.14 2003/03/11 06:08:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/ChangeLog,v 1.15 2003/03/27 07:30:39 seemant Exp $
 
   20 Feb 2003; Zach Welch <zwelch@gentoo.org> :
   Added arm to keywords.
@@ -10,6 +10,15 @@
 
 *netkit-base-0.17-r7 (22 Dec 2002)
 
+  26 Mar 2003; Seemant Kulleen <seemant@gentoo.org>
+  netkit-base-0.17-r6.ebuild, netkit-base-0.17-r7.ebuild,
+  files/001_alpha_netkit-base-0.17-ping-fix.patch.bz2,
+  files/002_all_netkit-base-0.17-wrong-byte-fix.patch.bz2,
+  files/netkit-base-0.17-alpha-ping-fix.patch,
+  files/netkit-base-0.17-wrong-byte-fix.patch:
+  compressed and renamed patches to allow epatch's intelligent patching to
+  happen. Also, provides virtual/inetd
+
   24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> netkit-base-0.17-r7.ebuild :
   Marked as stable for mips.
 
diff --git a/sys-apps/netkit-base/files/001_alpha_netkit-base-0.17-ping-fix.patch.bz2 b/sys-apps/netkit-base/files/001_alpha_netkit-base-0.17-ping-fix.patch.bz2
new file mode 100644
index 000000000000..fa2fd58eb12e
--- /dev/null
+++ b/sys-apps/netkit-base/files/001_alpha_netkit-base-0.17-ping-fix.patch.bz2
diff --git a/sys-apps/netkit-base/files/002_all_netkit-base-0.17-wrong-byte-fix.patch.bz2 b/sys-apps/netkit-base/files/002_all_netkit-base-0.17-wrong-byte-fix.patch.bz2
new file mode 100644
index 000000000000..e34ca47f0140
--- /dev/null
+++ b/sys-apps/netkit-base/files/002_all_netkit-base-0.17-wrong-byte-fix.patch.bz2
diff --git a/sys-apps/netkit-base/files/netkit-base-0.17-alpha-ping-fix.patch b/sys-apps/netkit-base/files/netkit-base-0.17-alpha-ping-fix.patch
deleted file mode 100644
index 4cb8c3298ed5..000000000000
--- a/sys-apps/netkit-base/files/netkit-base-0.17-alpha-ping-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- netkit-base-0.17/ping/ping.c	Sun Jul 23 06:16:21 2000
-+++ netkit-base-0.17-alpha-ping-fix/ping/ping.c	Tue Sep 10 20:14:51 2002
-@@ -203,7 +203,7 @@
-  * datalen is the length of the other data plus the timeval.
-  * note: due to alignment problems don't assign to OUTPACK_TIME, use memcpy.
-  */
--static u_int8_t outpack[IP_MAXPACKET];
-+static u_int8_t outpack[IP_MAXPACKET] __attribute__((aligned(sizeof(long)))); 
- static int datalen = DEFDATALEN;
- 
- #define OUTPACK_ICMP    ((struct icmp *)outpack)
-@@ -725,6 +725,7 @@
- 			tp = (struct timeval *)icp->icmp_data;
- 			memcpy(&packettv, tp, sizeof(struct timeval));
- 			tvsub(&now, &packettv);
-+			
- 
- 			/* precision: tenths of milliseconds */
- 			triptime = now.tv_sec * 10000 + (now.tv_usec / 100);
-@@ -760,7 +761,7 @@
- 			       inet_ntoa(from->sin_addr), icp->icmp_seq);
- 			printf(" ttl=%d", ip->ip_ttl);
- 			if (timing) {
--				printf(" time=%ld.%ld ms", triptime/10,
-+				printf(" time=%hd.%hd ms", triptime/10,
- 				       triptime%10);
- 			}
- 			if (dupflag) {
diff --git a/sys-apps/netkit-base/files/netkit-base-0.17-wrong-byte-fix.patch b/sys-apps/netkit-base/files/netkit-base-0.17-wrong-byte-fix.patch
deleted file mode 100644
index 2da89e57f3fc..000000000000
--- a/sys-apps/netkit-base/files/netkit-base-0.17-wrong-byte-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- netkit-base-0.17/ping/ping.c.O	2002-12-12 16:11:40.000000000 +0100
-+++ netkit-base-0.17/ping/ping.c	2002-12-12 16:14:26.000000000 +0100
-@@ -639,7 +639,7 @@ check_packet_data(void)
- 	cp = INPACK_PAYLOAD;
- 	dp = OUTPACK_PAYLOAD;
- 
--	for (i=0; i<datalen-ICMP_MINLEN; i++) {
-+	for (i=sizeof(struct timeval); i<datalen-ICMP_MINLEN; i++) {
- 		if (cp[i] != dp[i]) {
- 			printf("\n");
- 			printf("wrong data byte #%d should be 0x%x "
-@@ -648,7 +648,7 @@ check_packet_data(void)
- 			for (i=0; i<datalen-ICMP_MINLEN; i++) {
- 				if ((i % 32) == 8)
- 					printf("\n\t");
--				printf("%x ", cp[i]);
-+				printf(" %x", cp[i]);
- 			}
- 			return;
- 		}
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
index 0ce259347b32..7469d8ff64f5 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild,v 1.18 2003/03/11 06:08:13 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r6.ebuild,v 1.19 2003/03/27 07:30:39 seemant Exp $
 
 inherit eutils
 
@@ -15,13 +15,13 @@ KEYWORDS="x86 ppc sparc alpha mips hppa"
 
 DEPEND="virtual/glibc"
 
+PROVIDE="virtual/inetd"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	if [ ${ARCH} == "alpha" ]; then
-		epatch ${FILESDIR}/netkit-base-0.17-alpha-ping-fix.patch
-	fi
+	use alpha && epatch ${FILESDIR}/001_alpha_${P}-ping-fix.patch.bz2
 }
 
 src_compile() {
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild
index f799a56035a7..659e1e01f5f8 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild,v 1.7 2003/02/24 22:34:59 dragon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/netkit-base/netkit-base-0.17-r7.ebuild,v 1.8 2003/03/27 07:30:39 seemant Exp $
 
 inherit eutils
 
@@ -14,14 +14,15 @@ LICENSE="BSD"
 
 DEPEND="virtual/glibc"
 
+PROVIDE="virtual/inetd"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	
-	if [ ${ARCH} == "alpha" ]; then
-		epatch ${FILESDIR}/netkit-base-0.17-alpha-ping-fix.patch
-	fi
-	epatch ${FILESDIR}/netkit-base-0.17-wrong-byte-fix.patch
+	# Note that epatch will intelligently patch architecture specific
+	# patches as well
+	epatch ${FILESDIR}
 }
 
 src_compile() {