From patchwork Sat Sep 14 15:28:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8121 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 4X5ZpB4S9gz3wyW for ; Sat, 14 Sep 2024 15:28:50 +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 4X5Zp84FCGz66x; Sat, 14 Sep 2024 15:28:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4X5Zp83jBDz30Mg; Sat, 14 Sep 2024 15:28:48 +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 4X5Zp06sLqz33hc 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 4X5Zp05JXBz2RJ; Sat, 14 Sep 2024 15:28:40 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1726327720; 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=sFaku0Oyi7oE0QYu6oPtRb9/P4baqJCE5NyInx6bb/U=; b=F1JYDLP/TFZ9nurtfSKvlg2GpgQE1wVOn2yPwWO6C19KZdiZf3zMxLumVbpKJuzUpQ4o+I IPhQVE2QN9+I8LAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1726327720; 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=sFaku0Oyi7oE0QYu6oPtRb9/P4baqJCE5NyInx6bb/U=; b=IXNFSX8sSloLOb/3KC3TRpx4L60wxNTo2yFgpImeFDWS9aRfuZkkVvaAxq30obsi3Ys66S bGc1PPc+c4cC/YUsBCPOD84fotvuVMtP73kyp0oSyOrBGyqxExfrHRGy325370Fg5O7Lex XJXDZ4GjAvkKWWpqVQZig7bV8R6p1HMdiOtBjyt5dPJtcOAeZj1wRwZKLvLwrPLHzYc/9k QMKpDRQ/5yayYZ12/FfyDSiUTkgoNEg0ui+w+HdD4lxtNRyTbHWtTBXLAssCMFxEzXPgQV w/9XDF3jSRMLGG8Hnht/R6hEFsPZyw9MuPexHgHyUWn5p09OL7Q1oIgLNkVIsQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 8/8] perl-JSON: removal of module as it is now in the perl core modules Date: Sat, 14 Sep 2024 17:28:31 +0200 Message-ID: <20240914152831.7727-8-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: RZUTSDWTZEP7TLMY3C4B54AV3HYEZ6HB X-Message-ID-Hash: RZUTSDWTZEP7TLMY3C4B54AV3HYEZ6HB 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 the samba addon. - With the old separate module removed samba still successfully built, installed and was able to be run from the WUI. Fixes: bug13640 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/packages/perl-JSON | 14 ----- lfs/perl-JSON | 88 ----------------------------- lfs/samba | 4 +- 3 files changed, 2 insertions(+), 104 deletions(-) delete mode 100644 config/rootfiles/packages/perl-JSON delete mode 100644 lfs/perl-JSON diff --git a/config/rootfiles/packages/perl-JSON b/config/rootfiles/packages/perl-JSON deleted file mode 100644 index c4de95df9..000000000 --- a/config/rootfiles/packages/perl-JSON +++ /dev/null @@ -1,14 +0,0 @@ -#usr/lib/perl5/site_perl/5.36.0/JSON -usr/lib/perl5/site_perl/5.36.0/JSON.pm -#usr/lib/perl5/site_perl/5.36.0/JSON/backportPP -usr/lib/perl5/site_perl/5.36.0/JSON/backportPP.pm -usr/lib/perl5/site_perl/5.36.0/JSON/backportPP/Boolean.pm -usr/lib/perl5/site_perl/5.36.0/JSON/backportPP/Compat5005.pm -usr/lib/perl5/site_perl/5.36.0/JSON/backportPP/Compat5006.pm -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/JSON -#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/JSON/.packlist -#usr/share/man/man3/JSON.3 -#usr/share/man/man3/JSON::backportPP.3 -#usr/share/man/man3/JSON::backportPP::Boolean.3 -#usr/share/man/man3/JSON::backportPP::Compat5005.3 -#usr/share/man/man3/JSON::backportPP::Compat5006.3 diff --git a/lfs/perl-JSON b/lfs/perl-JSON deleted file mode 100644 index 629726a01..000000000 --- a/lfs/perl-JSON +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 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 - -SUMMARY = JSON (JavaScript Object Notation) encoder/decoder - -VER = 4.05 - -THISAPP = JSON-$(VER) -DL_FILE = ${THISAPP}.tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -PROG = perl-JSON -DEPS = -PAK_VER = 2 - -SERVICES = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 0ecf27b15a780833fe6cb12bece6eaa5a75de92a02f901014105d1435857867d86ccad94e2666195fc66ed41f45f8f91061a06b1e5e05f3a332803b46bb4b53e - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/samba b/lfs/samba index f8812d678..8d2c6a3a3 100644 --- a/lfs/samba +++ b/lfs/samba @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 104 +PAK_VER = 105 -DEPS = avahi cups perl-Parse-Yapp perl-JSON wsdd +DEPS = avahi cups perl-Parse-Yapp wsdd SERVICES = samba