Remove deprecated package netkitbase and netkittelnet
PATCH 1/1 Remove deprecated package netkitbase and netkittelnet
Signed-off-by Arnaud Aujon <[email protected]>
--- Config.in.legacy | 19 +++ package/Config.in | 2 - package/netkitbase/Config.in | 13 -- package/netkitbase/netkitbase-gcc4.patch | 12 -- package/netkitbase/netkitbase-remove-bcopy.patch | 31 ---- package/netkitbase/netkitbase.mk | 35 ----- package/netkittelnet/Config.in | 13 -- package/netkittelnet/netkittelnet-bcopy.patch | 57 ------- package/netkittelnet/netkittelnet.mk | 36 ----- package/netkittelnet/netkittelnet.patch | 182 ----------------------- 10 files changed, 19 insertions(+), 381 deletions(-) delete mode 100644 package/netkitbase/Config.in delete mode 100644 package/netkitbase/netkitbase-gcc4.patch delete mode 100644 package/netkitbase/netkitbase-remove-bcopy.patch delete mode 100644 package/netkitbase/netkitbase.mk delete mode 100644 package/netkittelnet/Config.in delete mode 100644 package/netkittelnet/netkittelnet-bcopy.patch delete mode 100644 package/netkittelnet/netkittelnet.mk delete mode 100644 package/netkittelnet/netkittelnet.patch
Config.in.legacy +19 -0
@@ -99,6 +99,25 @@ 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" config BR2_PACKAGE_LVM2_DMSETUP_ONLY
package/Config.in +0 -2
@@ -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 deleted +0 -13
@@ -1,13 +0,0 @@ -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
package/netkitbase/netkitbase-gcc4.patch deleted +0 -12
@@ -1,12 +0,0 @@ -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
package/netkitbase/netkitbase-remove-bcopy.patch deleted +0 -31
@@ -1,31 +0,0 @@ -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;
package/netkitbase/netkitbase.mk deleted +0 -35
@@ -1,35 +0,0 @@ -################################################################################ -# -# netkitbase -# -################################################################################ - -NETKITBASE_VERSION = 0.17 -NETKITBASE_SOURCE = netkit-base-$(NETKITBASE_VERSION).tar.gz -NETKITBASE_SITE = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ -NETKITBASE_LICENSE = BSD-4c - -define NETKITBASE_CONFIGURE_CMDS - # use ANSI syntax - $(SED) "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure - # don't try to run cross compiled binaries while configuring things - $(SED) "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - ./configure \ - --installroot=$(TARGET_DIR)) -endef - -define NETKITBASE_BUILD_CMDS - $(MAKE) -C $(@D) -endef - -define NETKITBASE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/inetd/inetd $(TARGET_DIR)/usr/sbin/inetd - if [ ! -f $(TARGET_DIR)/etc/inetd.conf ]; then \ - $(INSTALL) -D -m 0644 $(@D)/etc.sample/inetd.conf $(TARGET_DIR)/etc/inetd.conf; \ - $(SED) "s/^\([a-z]\)/#\1/;" $(TARGET_DIR)/etc/inetd.conf; \ - fi -endef - -$(eval $(generic-package))
package/netkittelnet/Config.in deleted +0 -13
@@ -1,13 +0,0 @@ -config BR2_PACKAGE_NETKITTELNET - bool "netkittelnet" - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on BR2_DEPRECATED - select BR2_PACKAGE_NETKITBASE - help - Standard Linux telnet client and server. - - ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ - -comment "netkittelnet needs a toolchain w/ RPC" - depends on BR2_DEPRECATED - depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
package/netkittelnet/netkittelnet-bcopy.patch deleted +0 -57
57 lines not on this page · raw message
package/netkittelnet/netkittelnet.mk deleted +0 -36
@@ -1,36 +0,0 @@ -################################################################################ -# -# netkittelnet -# -################################################################################ - -NETKITTELNET_VERSION = 0.17 -NETKITTELNET_SOURCE = netkit-telnet-$(NETKITTELNET_VERSION).tar.gz -NETKITTELNET_SITE = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ -NETKITTELNET_LICENSE = BSD-4c -NETKITTELNET_DEPENDENCIES = netkitbase - -define NETKITTELNET_CONFIGURE_CMDS - # use ANSI syntax - $(SED) "s/main()/main(void)/;" $(@D)/configure - # Disable termcap support - $(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(@D)/telnetd/telnetd.c - # C++ support not needed for telnetd - $(SED) 's/CXX/CC/g' -e 's/conftest.cc/conftest.c/g' $(@D)/configure - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - ./configure \ - --installroot=$(TARGET_DIR)) -endef - -define NETKITTELNET_BUILD_CMDS - $(MAKE) SUB=telnetd -C $(@D) -endef - -define NETKITTELNET_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/telnetd/telnetd $(TARGET_DIR)/usr/sbin/telnetd - # Enable telnet in inetd - $(SED) "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf -endef - -$(eval $(generic-package))
package/netkittelnet/netkittelnet.patch deleted +0 -182
182 lines not on this page · raw message
Signature · 1 line
1.8.3.1
PATCH 1/1 Remove deprecated package netkitbase and netkittelnet
Quoted 40 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnaud" == Arnaud Aujon <[email protected]> writes:
Signed-off-by Arnaud Aujon <[email protected]>--- Config.in.legacy | 19 +++ package/Config.in | 2 - package/netkitbase/Config.in | 13 -- package/netkitbase/netkitbase-gcc4.patch | 12 -- package/netkitbase/netkitbase-remove-bcopy.patch | 31 ---- package/netkitbase/netkitbase.mk | 35 ----- package/netkittelnet/Config.in | 13 -- package/netkittelnet/netkittelnet-bcopy.patch | 57 ------- package/netkittelnet/netkittelnet.mk | 36 ----- package/netkittelnet/netkittelnet.patch | 182 ----------------------- 10 files changed, 19 insertions(+), 381 deletions(-) delete mode 100644 package/netkitbase/Config.in delete mode 100644 package/netkitbase/netkitbase-gcc4.patch delete mode 100644 package/netkitbase/netkitbase-remove-bcopy.patch delete mode 100644 package/netkitbase/netkitbase.mk delete mode 100644 package/netkittelnet/Config.in delete mode 100644 package/netkittelnet/netkittelnet-bcopy.patch delete mode 100644 package/netkittelnet/netkittelnet.mk delete mode 100644 package/netkittelnet/netkittelnet.patchConfig.in.legacy +8
-0@@ -99,6 +99,25 @@ 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
Config.in.legacy comment "----------------------------------------------------" · line 119
Quoted 10 lines
Config.in.legacy +10
-0+ 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.
The indentation / whitespace is a bit screwed up here. The config lines should be indented with a <tab> and the help lines with <tab><space><space>.
Committed with that fixed, thanks.
Signature · 1 line
Bye, Peter Korsgaard