From bdc235b59aac86e3fc962c792e6a22bda733e956 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 12 Feb 2021 11:51:45 +0000
Subject: [PATCH] Drop pcre-compat

This version of the library is outdated for a long time and we have been
shipping newer versions for long enough so that everyone should have
been migrated by now.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/common/pcre-compat |  2 -
 config/rootfiles/core/155/update.sh |  3 ++
 lfs/pcre-compat                     | 80 -----------------------------
 make.sh                             |  1 -
 4 files changed, 3 insertions(+), 83 deletions(-)
 delete mode 100644 config/rootfiles/common/pcre-compat
 delete mode 100644 lfs/pcre-compat

diff --git a/config/rootfiles/common/pcre-compat b/config/rootfiles/common/pcre-compat
deleted file mode 100644
index ff1b776438..0000000000
--- a/config/rootfiles/common/pcre-compat
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/libpcre.so.0
-lib/libpcre.so.0.0.1
diff --git a/config/rootfiles/core/155/update.sh b/config/rootfiles/core/155/update.sh
index 975cf05081..7984dcdd88 100644
--- a/config/rootfiles/core/155/update.sh
+++ b/config/rootfiles/core/155/update.sh
@@ -32,6 +32,9 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Remove files
+rm -vf \
+	/lib/libpcre.so.0 \
+	/lib/libpcre.so.0.0.1
 
 # Stop services
 
diff --git a/lfs/pcre-compat b/lfs/pcre-compat
deleted file mode 100644
index 5709a477b0..0000000000
--- a/lfs/pcre-compat
+++ /dev/null
@@ -1,80 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
-#                                                                             #
-# 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 <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 7.7
-
-THISAPP    = pcre-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-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 = 4b2e9cde1f7227448dddba59843efa0b
-
-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 jxf $(DIR_DL)/$(DL_FILE)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --enable-utf8
-	cd $(DIR_APP) && make $(MAKETUNING)
-
-	install -m 755 $(DIR_APP)/.libs/libpcre.so.0.0.1 /lib
-	ln -svf libpcre.so.0.0.1 /lib/libpcre.so.0
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 0bd67e808a..cca77eeded 100755
--- a/make.sh
+++ b/make.sh
@@ -1101,7 +1101,6 @@ buildbase() {
 	lfsmake2 xz
 	lfsmake2 lzip
 	lfsmake2 pcre
-	lfsmake2 pcre-compat
 	lfsmake2 pcre2
 	lfsmake2 gettext
 	lfsmake2 attr
-- 
2.39.5