From c5f7ae87f65cb31fdfa3a88cb160acd9878a7829 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 17 Sep 2025 08:49:35 +0000 Subject: [PATCH] libhtp: Drop package This is no longer required in the distribution as Suricata has switched to htp-rs now. I am not aware of any other users. Signed-off-by: Michael Tremer --- config/rootfiles/common/libhtp | 25 --------- config/rootfiles/core/198/update.sh | 2 + lfs/libhtp | 80 ----------------------------- lfs/suricata | 1 - make.sh | 1 - 5 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 config/rootfiles/common/libhtp delete mode 100644 lfs/libhtp diff --git a/config/rootfiles/common/libhtp b/config/rootfiles/common/libhtp deleted file mode 100644 index a99aa940e2..0000000000 --- a/config/rootfiles/common/libhtp +++ /dev/null @@ -1,25 +0,0 @@ -#usr/include/htp -#usr/include/htp/bstr.h -#usr/include/htp/bstr_builder.h -#usr/include/htp/htp.h -#usr/include/htp/htp_base64.h -#usr/include/htp/htp_config.h -#usr/include/htp/htp_connection_parser.h -#usr/include/htp/htp_core.h -#usr/include/htp/htp_decompressors.h -#usr/include/htp/htp_hooks.h -#usr/include/htp/htp_list.h -#usr/include/htp/htp_multipart.h -#usr/include/htp/htp_table.h -#usr/include/htp/htp_transaction.h -#usr/include/htp/htp_urlencoded.h -#usr/include/htp/htp_utf8_decoder.h -#usr/include/htp/htp_version.h -#usr/include/htp/lzma -#usr/include/htp/lzma/7zTypes.h -#usr/include/htp/lzma/LzmaDec.h -#usr/lib/libhtp.la -#usr/lib/libhtp.so -usr/lib/libhtp.so.2 -usr/lib/libhtp.so.2.0.0 -#usr/lib/pkgconfig/htp.pc diff --git a/config/rootfiles/core/198/update.sh b/config/rootfiles/core/198/update.sh index afd2c65d0f..e258f65d7f 100644 --- a/config/rootfiles/core/198/update.sh +++ b/config/rootfiles/core/198/update.sh @@ -34,6 +34,8 @@ done # Stop services # Remove files +rm -rfv \ + /usr/lib/libhtp.so.2* # Extract files extract_files diff --git a/lfs/libhtp b/lfs/libhtp deleted file mode 100644 index 7175a7e1e6..0000000000 --- a/lfs/libhtp +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2025 IPFire Team # -# # -# 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 = 0.5.52 - -THISAPP = libhtp-$(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)_BLAKE2 = e56d0d28fd76bcc6118403800f5858658a67b2a4a6c712f205214b50d5d31b198284bda2b4c77956e9a4a0cea52b7c8acb05f86eb283df3ff7586d5c066948ea - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./autogen.sh - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --disable-static - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/suricata b/lfs/suricata index 05b708f1b9..f30c8aa06a 100644 --- a/lfs/suricata +++ b/lfs/suricata @@ -77,7 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --localstatedir=/var \ --enable-gccprotect \ --disable-gccmarch-native \ - --enable-non-bundled-htp \ --enable-nfqueue \ --disable-static \ --disable-python \ diff --git a/make.sh b/make.sh index dd0ec075ea..e841f5b4ee 100755 --- a/make.sh +++ b/make.sh @@ -1796,7 +1796,6 @@ build_system() { lfsmake2 setup lfsmake2 jansson lfsmake2 yaml - lfsmake2 libhtp lfsmake2 colm lfsmake2 ragel lfsmake2 vectorscan -- 2.47.3