Commit 560fe85b authored by Arnaud Aujon's avatar Arnaud Aujon Committed by Peter Korsgaard
Browse files

Remove deprecated package netkitbase and netkittelnet



[Peter: fixup Config.in.legacy indentation]
Signed-off-by: default avatarArnaud Aujon <arnaud.aujon@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 472f629f
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
@@ -98,6 +98,26 @@ comment "build, or run, in unpredictable ways. "
comment "----------------------------------------------------"
endif

###############################################################################
comment "Legacy options removed in 2014.02"

config BR2_PACKAGE_NETKITBASE
	bool "netkitbase has been removed"
	select BR2_LEGACY
	help
	  The 'netkitbase' package has been removed since it has been
	  deprecated since 2012.11. This package provided 'inetd'
	  which is replaced by 'xinet' and 'ping' which is replaced by
	  'busybox' or 'fping'.

config BR2_PACKAGE_NETKITTELNET
	bool "netkittelnet has been removed"
	select BR2_LEGACY
	help
	  The 'netkittelnet' package has been removed since it has
	  been deprecated since 2012.11. 'busybox' provides a telnet
	  client and should be used instead.

###############################################################################
comment "Legacy options removed in 2013.11"

+0 −2
Original line number Diff line number Diff line
@@ -851,8 +851,6 @@ source "package/ndisc6/Config.in"
source "package/netatalk/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/netcat/Config.in"
source "package/netkitbase/Config.in"
source "package/netkittelnet/Config.in"
endif
source "package/netplug/Config.in"
source "package/netsnmp/Config.in"

package/netkitbase/Config.in

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line
config BR2_PACKAGE_NETKITBASE
	bool "netkitbase"
	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
	depends on BR2_USE_MMU # fork()
	depends on BR2_DEPRECATED
	help
	  Old-style inetd.

	  ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/

comment "netkitbase needs a toolchain w/ RPC"
	depends on BR2_USE_MMU && BR2_DEPRECATED
	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
+0 −12
Original line number Diff line number Diff line
diff -ur netkit-base-0.17/inetd/servtab.c netkit-base-0.17-patched/inetd/servtab.c
--- netkit-base-0.17/inetd/servtab.c	2000-07-22 15:20:50.000000000 -0500
+++ netkit-base-0.17-patched/inetd/servtab.c	2005-04-30 21:23:52.649630720 -0500
@@ -771,7 +771,7 @@
 			return;
 		}
 		
-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
+#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
 
 		/*
 		 * sep->se_wait may be holding the pid of a daemon
+0 −31
Original line number Diff line number Diff line
diff -ur netkit-base-0.17/inetd/builtins.c netkit-base-0.17-patched/inetd/builtins.c
--- netkit-base-0.17/inetd/builtins.c	2000-07-22 15:13:07.000000000 -0500
+++ netkit-base-0.17-patched/inetd/builtins.c	2006-12-02 00:50:05.801209342 -0600
@@ -140,10 +140,10 @@
 	text[LINESIZ + 1] = '\n';
 	for (rs = ring;;) {
 		if ((len = endring - rs) >= LINESIZ)
-			bcopy(rs, text, LINESIZ);
+			memcpy(text, rs, LINESIZ);
 		else {
-			bcopy(rs, text, len);
-			bcopy(ring, text + len, LINESIZ - len);
+			memcpy(text, rs, len);
+			memcpy(text + len, ring, LINESIZ - len);
 		}
 		if (++rs == endring)
 			rs = ring;
@@ -183,10 +183,10 @@
 		return;
 
 	if ((len = endring - rs) >= LINESIZ)
-		bcopy(rs, text, LINESIZ);
+		memcpy(text, rs, LINESIZ);
 	else {
-		bcopy(rs, text, len);
-		bcopy(ring, text + len, LINESIZ - len);
+		memcpy(text, rs, len);
+		memcpy(text + len, ring, LINESIZ - len);
 	}
 	if (++rs == endring)
 		rs = ring;
Loading