From patchwork Tue May 6 14:10:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8706 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4ZsKzs0BSZz3x4T for ; Tue, 6 May 2025 14:10:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E5" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZsKzl4n3rz6YW for ; Tue, 6 May 2025 14:10:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZsKzl0wn9z33gL for ; Tue, 6 May 2025 14:10:27 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZsKzh0R57z33gS for ; Tue, 6 May 2025 14:10:24 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4ZsKzg0BY9z34s; Tue, 6 May 2025 14:10:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746540623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6vgSV3f2tJmALpZYEXyxTOhe2M54p6gduR/QjLNUyn0=; b=m2O498DUAdwwJfZTqFGDljuHTRelNLVv5CL/ZpYOYKm8k/Ai/+UG9tXp4/30DKSeBexBF8 XDz9mxE+lkgnJgBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746540623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6vgSV3f2tJmALpZYEXyxTOhe2M54p6gduR/QjLNUyn0=; b=mDWhfhmDComCZlZabxi4dxAyEjgICZllhN0TdAE7GdZNGK6HvaiHlBqIw1kXrC8r8fVTlQ BqNXowxomT28wcYjgX9Nqy8cHkkA1alcz3Ry9RjkjTnRJwONkxaWFMqecb/UcfqoZgWsNO 69gmzM020ittZRtt7gFIX0FrMiIapcVArjkUwlQs1qlqNyyuRbocDLbH1OF4MdXGpvpfyX GjqQJ9kn19/dz6wXWmsnsABF01Swh1PW/n+wMRMcsVf9jTU7t1dR2x35OpRXQKfhdMymnR PMP0PSVIVA9xCuqETO+fmHdQW/RSuQtPkkIyQP0jrmorosud30+v7XlMybivSQ== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 4/5] perl-Apache_Htpasswd: remove module from IPFire Date: Tue, 6 May 2025 16:10:12 +0200 Message-ID: <20250506141013.15292-4-adolf.belka@ipfire.org> In-Reply-To: <20250506141013.15292-1-adolf.belka@ipfire.org> References: <20250506141013.15292-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - This module was only used for the proxy.cgi and chpasswd.cgi files for the local authentication option. - As this module was last updated in Nov 2012 its use has been replaced by direct use of htpasswd. This is dealt with by other patches in this set. - With those changes this module is no longer required. Signed-off-by: Adolf Belka --- config/rootfiles/common/perl-Apache-Htpasswd | 6 -- lfs/perl-Apache-Htpasswd | 77 -------------------- make.sh | 1 - 3 files changed, 84 deletions(-) delete mode 100644 config/rootfiles/common/perl-Apache-Htpasswd delete mode 100644 lfs/perl-Apache-Htpasswd diff --git a/config/rootfiles/common/perl-Apache-Htpasswd b/config/rootfiles/common/perl-Apache-Htpasswd deleted file mode 100644 index bd19e73a9..000000000 --- a/config/rootfiles/common/perl-Apache-Htpasswd +++ /dev/null @@ -1,6 +0,0 @@ -#usr/lib/perl5/site_perl/5.36.0/Apache -usr/lib/perl5/site_perl/5.36.0/Apache/Htpasswd.pm -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Apache -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Apache/Htpasswd -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Apache/Htpasswd/.packlist -#usr/share/man/man3/Apache::Htpasswd.3 diff --git a/lfs/perl-Apache-Htpasswd b/lfs/perl-Apache-Htpasswd deleted file mode 100644 index 14421fba2..000000000 --- a/lfs/perl-Apache-Htpasswd +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 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 = 1.9 - -THISAPP = Apache-Htpasswd-$(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 = abf3bd699f0db8c818f3b590d040bece213078127836f29984b4d7c9db26cbdac9c7f4572b17f526f60ad48ee7d3680d2b1d426bcc3b0b4646d42a9461cddd4d - -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) && perl Makefile.PL - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index ab3867a8f..61921fee6 100755 --- a/make.sh +++ b/make.sh @@ -1713,7 +1713,6 @@ build_system() { lfsmake2 perl-GD-TextUtil lfsmake2 perl-Device-SerialPort lfsmake2 perl-Device-Modem - lfsmake2 perl-Apache-Htpasswd lfsmake2 perl-Parse-Yapp lfsmake2 perl-Data-UUID lfsmake2 perl-Try-Tiny