tcpwrapper: remove old package

It has been in staging for more than one year.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

7 files changed, 1 insertions, 188 deletions

diff --git a/patches/tcp_wrappers_7.6/series b/patches/tcp_wrappers_7.6/series
deleted file mode 100644
index a1196b028..000000000
--- a/patches/tcp_wrappers_7.6/series
+++ /dev/null
@@ -1,2 +0,0 @@
-tcp_wrappers_7.6-ptx1.diff
-tcp_wrappers-7.6-gcc34-1.patch
diff --git a/patches/tcp_wrappers_7.6/tcp_wrappers-7.6-gcc34-1.patch b/patches/tcp_wrappers_7.6/tcp_wrappers-7.6-gcc34-1.patch
deleted file mode 100644
index 52b1e1777..000000000
--- a/patches/tcp_wrappers_7.6/tcp_wrappers-7.6-gcc34-1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Subject: [patch] fix 'conflicting types' bug
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-Fix this:
-
-scaffold.c:28: error: conflicting types for 'malloc'
-scaffold.c:28: error: conflicting types for 'malloc'
-
-This patch was taken from LFS:
-http://www.linuxfromscratch.org/patches/downloads/tcp_wrappers/tcp_wrappers-7.6-gcc34-1.patch
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-
----
- scaffold.c |    1 -
- 1 file changed, 1 deletion(-)
-
-Index: tcp_wrappers_7.6/scaffold.c
-===================================================================
---- tcp_wrappers_7.6.orig/scaffold.c
-+++ tcp_wrappers_7.6/scaffold.c
-@@ -25,7 +25,6 @@ static char sccs_id[] = "@(#) scaffold.c
- #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
- #endif
- 
--extern char *malloc();
- 
- /* Application-specific. */
- 
diff --git a/patches/tcp_wrappers_7.6/tcp_wrappers_7.6-ptx1.diff b/patches/tcp_wrappers_7.6/tcp_wrappers_7.6-ptx1.diff
deleted file mode 100644
index 41b499990..000000000
--- a/patches/tcp_wrappers_7.6/tcp_wrappers_7.6-ptx1.diff
+++ /dev/null
@@ -1,31 +0,0 @@
----
- Makefile    |    2 +-
- percent_m.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: tcp_wrappers_7.6/Makefile
-===================================================================
---- tcp_wrappers_7.6.orig/Makefile
-+++ tcp_wrappers_7.6/Makefile
-@@ -44,7 +44,7 @@ what:
- #REAL_DAEMON_DIR=/usr/etc
- #
- # SysV.4 Solaris 2.x OSF AIX
--#REAL_DAEMON_DIR=/usr/sbin
-+REAL_DAEMON_DIR=/usr/sbin
- #
- # BSD 4.4
- #REAL_DAEMON_DIR=/usr/libexec
-Index: tcp_wrappers_7.6/percent_m.c
-===================================================================
---- tcp_wrappers_7.6.orig/percent_m.c
-+++ tcp_wrappers_7.6/percent_m.c
-@@ -14,7 +14,7 @@ static char sccsid[] = "@(#) percent_m.c
- 
- extern int errno;
- #ifndef SYS_ERRLIST_DEFINED
--extern char *sys_errlist[];
-+extern __const char *__const sys_errlist[];
- extern int sys_nerr;
- #endif
- 
diff --git a/rules/syslogng.in b/rules/syslogng.in
index e75444d65..0044905db 100644
--- a/rules/syslogng.in
+++ b/rules/syslogng.in
@@ -13,20 +13,12 @@ menuconfig SYSLOGNG
 	select LIBC_RT
 	select LIBNET		if SYSLOGNG_SPOOF_SOURCE
 	select LIBPCRE
-	select TCPWRAPPER	if SYSLOGNG_TCP_WRAPPER
 	select SYSTEMD		if SYSLOGNG_SYSTEMD
 	help
 	  The next generation syslog daemon.
 
 if SYSLOGNG
 
-config SYSLOGNG_TCP_WRAPPER
-	bool
-	depends on STAGING
-	prompt "tcpwrapper support"
-	help
-	  Support /etc/hosts.deny and /etc/hosts.allow.
-
 config SYSLOGNG_SPOOF_SOURCE
 	bool
 	prompt "spoof_source feature"
diff --git a/rules/syslogng.make b/rules/syslogng.make
index feaa7bee1..d5ac92797 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -51,7 +51,7 @@ SYSLOGNG_AUTOCONF = \
 	--enable-dynamic-linking \
 	--disable-mixed-linking \
 	$(GLOBAL_IPV6_OPTION) \
-	--$(call ptx/endis, PTXCONF_SYSLOGNG_TCP_WRAPPER)-tcp-wrapper \
+	--disable-tcp-wrapper \
 	--$(call ptx/endis, PTXCONF_SYSLOGNG_SPOOF_SOURCE)-spoof-source \
 	--disable-sun-streams \
 	--disable-openbsd-system-source \
diff --git a/rules/tcpwrapper.in b/rules/tcpwrapper.in
deleted file mode 100644
index d9578b6c6..000000000
--- a/rules/tcpwrapper.in
+++ /dev/null
@@ -1,41 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=networking
-
-menuconfig TCPWRAPPER
-	tristate
-	prompt "tcpwrapper                    "
-	help
-	  With this package you can monitor and filter incoming requests for the
-	  SYSTAT, FINGER, FTP, TELNET, RLOGIN, RSH, EXEC, TFTP, TALK, and other
-	  network services.
-
-	  The package provides tiny daemon wrapper programs that can be installed
-	  without any changes to existing software or to existing configuration
-	  files.  The wrappers report the name of the client host and of the
-	  requested service; the wrappers do not exchange information with the
-	  client or server applications, and impose no overhead on the actual
-	  conversation between the client and server applications.
-
-	  STAGING: remove in ptxdist-2021.05.0
-	  Obsolete and dead for a long time.
-
-if TCPWRAPPER
-
-config	TCPWRAPPER_INSTALL_TCPD
-	bool
-	prompt "Install /usr/sbin/tcpd"
-	help
-	  The tcpd program can be set up to monitor incoming requests for telnet,
-	  finger, ftp, exec, rsh, rlogin, tftp, talk, comsat and other services
-	  that have a one-to-one mapping onto executable files.
-
-config	TCPWRAPPER_INSTALL_HOSTS_ACCESS_CONFIGS
-	bool
-	select TCPWRAPPER_INSTALL_TCPD
-	prompt "Install /etc/hosts.{allow|deny}"
-	help
-	  Install the hosts.allow and hosts.deny configs from either
-	  projectroot or from ptxdist/projectroot.
-
-endif
diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make
deleted file mode 100644
index 4bcad6e2f..000000000
--- a/rules/tcpwrapper.make
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
-#           (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_TCPWRAPPER) += tcpwrapper
-
-#
-# Paths and names
-#
-TCPWRAPPER_VERSION		:= 7.6
-TCPWRAPPER_MD5			:= e6fa25f71226d090f34de3f6b122fb5a
-TCPWRAPPER			:= tcp_wrappers_$(TCPWRAPPER_VERSION)
-TCPWRAPPER_URL			:= ftp://ftp.porcupine.org/pub/security/$(TCPWRAPPER).tar.gz
-TCPWRAPPER_SOURCE		:= $(SRCDIR)/$(TCPWRAPPER).tar.gz
-TCPWRAPPER_DIR			:= $(BUILDDIR)/$(TCPWRAPPER)
-# Regents of the University of California + Wietse Venema
-TCPWRAPPER_LICENSE		:= DISCLAIMER
-TCPWRAPPER_LICENSE_FILES	:= file://DISCLAIMER;md5=071bd69cb78b18888ea5e3da5c3127fa
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-TCPWRAPPER_PATH		:= PATH=$(CROSS_PATH)
-TCPWRAPPER_MAKE_ENV	:= $(CROSS_ENV)
-TCPWRAPPER_MAKE_OPT	:= linux
-TCPWRAPPER_CFLAGS	:= -fPIC
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/tcpwrapper.install:
-	@$(call targetinfo)
-	install -d $(SYSROOT)/include
-	install $(TCPWRAPPER_DIR)/tcpd.h $(SYSROOT)/include
-	install -d $(SYSROOT)/lib
-	install $(TCPWRAPPER_DIR)/libwrap.a $(SYSROOT)/lib
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/tcpwrapper.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, tcpwrapper)
-	@$(call install_fixup, tcpwrapper,PRIORITY,optional)
-	@$(call install_fixup, tcpwrapper,SECTION,base)
-	@$(call install_fixup, tcpwrapper,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
-	@$(call install_fixup, tcpwrapper,DESCRIPTION,missing)
-
-ifdef PTXCONF_TCPWRAPPER_INSTALL_TCPD
-	@$(call install_copy, tcpwrapper, 0, 0, 0755, $(TCPWRAPPER_DIR)/tcpd, /usr/sbin/tcpd)
-endif
-
-ifdef PTXCONF_TCPWRAPPER_INSTALL_HOSTS_ACCESS_CONFIGS
-	@$(call install_alternative, tcpwrapper, 0, 0, 0644, /etc/hosts.allow)
-	@$(call install_alternative, tcpwrapper, 0, 0, 0644, /etc/hosts.deny)
-endif
-
-	@$(call install_finish, tcpwrapper)
-	@$(call touch)
-
-# vim: syntax=make