From e3e17107ba76e7e787bd86bf058c8ac06ea26054 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 12 Feb 2018 11:42:47 +0000 Subject: [PATCH] Drop tcpwrapper This library has been unused for quite a while Signed-off-by: Michael Tremer --- config/rootfiles/common/tcpwrapper | 21 -------- config/rootfiles/core/119/update.sh | 3 +- lfs/tcpwrapper | 79 ----------------------------- make.sh | 1 - 4 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 config/rootfiles/common/tcpwrapper delete mode 100644 lfs/tcpwrapper diff --git a/config/rootfiles/common/tcpwrapper b/config/rootfiles/common/tcpwrapper deleted file mode 100644 index febe49722e..0000000000 --- a/config/rootfiles/common/tcpwrapper +++ /dev/null @@ -1,21 +0,0 @@ -#usr/include/tcpd.h -#usr/lib/libwrap.a -usr/lib/libwrap.so -usr/lib/libwrap.so.0 -usr/lib/libwrap.so.0.7.6 -#usr/sbin/safe_finger -#usr/sbin/tcpd -#usr/sbin/tcpdchk -#usr/sbin/tcpdmatch -#usr/sbin/try-from -#usr/share/man/man3/hosts_access.3 -#usr/share/man/man3/hosts_ctl.3 -#usr/share/man/man3/request_init.3 -#usr/share/man/man3/request_set.3 -#usr/share/man/man5/hosts_access.5 -#usr/share/man/man5/hosts_options.5 -#usr/share/man/man8/safe_finger.8 -#usr/share/man/man8/tcpd.8 -#usr/share/man/man8/tcpdchk.8 -#usr/share/man/man8/tcpdmatch.8 -#usr/share/man/man8/try-from.8 diff --git a/config/rootfiles/core/119/update.sh b/config/rootfiles/core/119/update.sh index 83c0c6f02b..5a1805d4ca 100644 --- a/config/rootfiles/core/119/update.sh +++ b/config/rootfiles/core/119/update.sh @@ -43,7 +43,8 @@ rm -vf \ /usr/bin/msidn_* \ /usr/lib/libmisdn* \ /usr/sbin/misdn_* \ - /etc/rc.d/init.d/mISDN + /etc/rc.d/init.d/mISDN \ + /usr/lib/libwrap* # Extract files extract_files diff --git a/lfs/tcpwrapper b/lfs/tcpwrapper deleted file mode 100644 index 4640229785..0000000000 --- a/lfs/tcpwrapper +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 7.6 - -THISAPP = tcp_wrappers_$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = e6fa25f71226d090f34de3f6b122fb5a - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i /usr/src/src/patches/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch - cd $(DIR_APP) && sed -i -e "s,^extern char \*malloc();,/* & */," scaffold.c - cd $(DIR_APP) && make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 0713c6fadb..2e7f7c00e6 100755 --- a/make.sh +++ b/make.sh @@ -1332,7 +1332,6 @@ buildipfire() { lfsmake2 cmake lfsmake2 gnump3d lfsmake2 rsync - lfsmake2 tcpwrapper lfsmake2 libtirpc lfsmake2 rpcbind lfsmake2 nfs -- 2.39.5