From patchwork Sat Sep 14 15:28:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8118 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 4X5Zp826Mhz3wyW for ; Sat, 14 Sep 2024 15:28:48 +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 "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4X5Zp61fXBz5sS; Sat, 14 Sep 2024 15:28:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4X5Zp563tgz33K6; Sat, 14 Sep 2024 15:28:45 +0000 (UTC) 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 4X5Zp02995z30JW for ; Sat, 14 Sep 2024 15:28:40 +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 4X5Znz5f5yz1sk; Sat, 14 Sep 2024 15:28:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1726327719; 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=VjWrO/2vh6iEitjAiRbtRzZrBT7B8+a1hARrlwVcgd0=; b=MtqTgMBBVRBgdGtddNyCtUI31buG36w3JRLKM3kwB3J/U8b/glIBMPxs1ACL+9VZpuH7mJ d0dg675/bc3DZYmQE/Be4/FJk9+pWRoK7tPFeWxCRfWg+edDEiwfsGEHj0UED0JY4tKQ0G dmVdCybT3uZBwy/9eLLjuw4n9nV7+T7Fd/xiT4cOzkSz1+tSYwub5qG+KvBwu7JyhCutxN /Ngz/Br9zudY+k2lsyHnXaaUBolEp2lJpjw7O6kwO089hS+aWlX+SsBtpjrHMLHpV9GwQx tMuaH49MZjOca4F3AMJ8tzbD9s0v142UYwTn8vBSDLl2ALm55GO2xkewsF/+WA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1726327719; 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=VjWrO/2vh6iEitjAiRbtRzZrBT7B8+a1hARrlwVcgd0=; b=NIVA7PRLGBlwqZtWksS6EvqGRKU+HjrzGpQFWxCYb71qfpS0ow+hYTNG6MiK5MiHixiEi3 TXBrRptr7WB03ICw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 5/8] perl-Compress-Zlib: removal of module as it is now in the perl core modules Date: Sat, 14 Sep 2024 17:28:28 +0200 Message-ID: <20240914152831.7727-5-adolf.belka@ipfire.org> In-Reply-To: <20240914152831.7727-1-adolf.belka@ipfire.org> References: <20240914152831.7727-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: N66XH7GQIECFYIIZFVHXWMFED5RK47JZ X-Message-ID-Hash: N66XH7GQIECFYIIZFVHXWMFED5RK47JZ X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Used in install-ipfire.sh script that is run by the install of vdradmin. - With the old separate module removed vdradmin still successfully built and installed. Fixes: bug13640 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/common/perl-Compress-Zlib | 9 --- lfs/perl-Compress-Zlib | 79 ---------------------- 2 files changed, 88 deletions(-) delete mode 100644 config/rootfiles/common/perl-Compress-Zlib delete mode 100644 lfs/perl-Compress-Zlib diff --git a/config/rootfiles/common/perl-Compress-Zlib b/config/rootfiles/common/perl-Compress-Zlib deleted file mode 100644 index 7e9851d82..000000000 --- a/config/rootfiles/common/perl-Compress-Zlib +++ /dev/null @@ -1,9 +0,0 @@ -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Compress -usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Compress/Zlib.pm -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Compress -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Compress/Zlib -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Compress/Zlib/.packlist -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Compress/Zlib/Zlib.bs -usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Compress/Zlib/Zlib.so -usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Compress/Zlib/autosplit.ix -#usr/share/man/man3/Compress::Zlib.3 diff --git a/lfs/perl-Compress-Zlib b/lfs/perl-Compress-Zlib deleted file mode 100644 index aaa79f3f3..000000000 --- a/lfs/perl-Compress-Zlib +++ /dev/null @@ -1,79 +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.35 - -THISAPP = Compress-Zlib-$(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 = b2f9dd29c73565ca3383dc88a5dd21458932ade85eaf218688b72094696d503d427ed3ee65d2c35d5e74a4ecd9232a00383867b41a2edef7b04433324bda4c19 - -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) && echo -e "BUILD_ZLIB = False\nINCLUDE = /usr/include\nLIB = /lib\nOLD_ZLIB = True\n" > config.in - cd $(DIR_APP) && perl Makefile.PL - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) -