From patchwork Tue Sep 22 18:25:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 3486 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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BwqW35gZSz3x5y for ; Tue, 22 Sep 2020 18:25:51 +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 ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BwqVz4w20z128; Tue, 22 Sep 2020 18:25:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BwqVz3tRMz30XJ; Tue, 22 Sep 2020 18:25:47 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BwqVy4H8Hz30X3 for ; Tue, 22 Sep 2020 18:25:46 +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 ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BwqVw4756z12g; Tue, 22 Sep 2020 18:25:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1600799144; 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=4c3iQjgLpC22JFaqvVAA9q2Rh9FnhXhA/mq+rsvNFqM=; b=9eUwUeB6eM+ESki1TvFRJaa1ZdB4Bj4DsXVllEbMbVsK3xzs/0bhHHAmb1KdYsDg3YNUig e17+xXs3Cg/pU3DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1600799144; 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=4c3iQjgLpC22JFaqvVAA9q2Rh9FnhXhA/mq+rsvNFqM=; b=vGe0RxMGNmEjlJ7yc3VNTL1ySYg6+FfQ1ulmaWEWHRpOvHF63r+6cOVV3Vfyw99wzAHq8x XkC0csqqLQ5yKacBHTbF94bs/oQLpPQlc9vpf3wOUbKbVdYiRd/qqus+at5PvDG9fl7QUv HsvAfIN1yZ3IXeE1dSnD1fuYWys7QwFzNphiQM3R9S98ivbg0l3weSMCh80vw1BfzN50lK TDVdZpOow/8UqUy0O3iVxZpg4FDB5wT2Fqtwai1TCKKoqTxCZpG64Lfbvp7CtYycSIxXVX k10b5FdYrUAlzplbcNVCBw8bX039g7anqgBqE+gxnVFIhH+i+3Ohb7C1bnpcRA== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 09/11] Locale-Country: Drop package. Date: Tue, 22 Sep 2020 20:25:07 +0200 Message-Id: <20200922182509.18643-9-stefan.schantl@ipfire.org> In-Reply-To: <20200922182509.18643-1-stefan.schantl@ipfire.org> References: <20200922182509.18643-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" All used functions from this module now is done by libloc, so this package safely can be dropped. Signed-off-by: Stefan Schantl --- config/rootfiles/common/Locale-Country | 60 -------------------- lfs/Locale-Country | 77 -------------------------- make.sh | 1 - 3 files changed, 138 deletions(-) delete mode 100644 config/rootfiles/common/Locale-Country delete mode 100644 lfs/Locale-Country diff --git a/config/rootfiles/common/Locale-Country b/config/rootfiles/common/Locale-Country deleted file mode 100644 index 941c18121..000000000 --- a/config/rootfiles/common/Locale-Country +++ /dev/null @@ -1,60 +0,0 @@ -#usr/lib/perl5/site_perl/5.30.0/Locale -#usr/lib/perl5/site_perl/5.30.0/Locale/Codes -usr/lib/perl5/site_perl/5.30.0/Locale/Codes.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Codes.pod -#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Changes.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Constants.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country_Codes.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Country_Retired.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency_Codes.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Currency_Retired.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt_Codes.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangExt_Retired.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam_Codes.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangFam_Retired.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar_Codes.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/LangVar_Retired.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language_Codes.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Language_Retired.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script_Codes.pm -usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Script_Retired.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Codes/Types.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Country.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Country.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Currency.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Currency.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Language.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Language.pod -usr/lib/perl5/site_perl/5.30.0/Locale/Script.pm -#usr/lib/perl5/site_perl/5.30.0/Locale/Script.pod -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Locale -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Locale/Codes -#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Locale/Codes/.packlist -#usr/share/man/man3/Locale::Codes.3 -#usr/share/man/man3/Locale::Codes::Changes.3 -#usr/share/man/man3/Locale::Codes::Country.3 -#usr/share/man/man3/Locale::Codes::Currency.3 -#usr/share/man/man3/Locale::Codes::LangExt.3 -#usr/share/man/man3/Locale::Codes::LangFam.3 -#usr/share/man/man3/Locale::Codes::LangVar.3 -#usr/share/man/man3/Locale::Codes::Language.3 -#usr/share/man/man3/Locale::Codes::Script.3 -#usr/share/man/man3/Locale::Codes::Types.3 -#usr/share/man/man3/Locale::Country.3 -#usr/share/man/man3/Locale::Currency.3 -#usr/share/man/man3/Locale::Language.3 -#usr/share/man/man3/Locale::Script.3 diff --git a/lfs/Locale-Country b/lfs/Locale-Country deleted file mode 100644 index 1f9323ee0..000000000 --- a/lfs/Locale-Country +++ /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 = 3.62 - -THISAPP = Locale-Codes-$(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)_MD5 = d4ee6fb8b5483c54abde1aa2b94e555a - -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 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/make.sh b/make.sh index 4a9dd3cb6..ad721eeca 100755 --- a/make.sh +++ b/make.sh @@ -1336,7 +1336,6 @@ buildipfire() { lfsmake2 Archive-Tar lfsmake2 Archive-Zip lfsmake2 Text-Tabs+Wrap - lfsmake2 Locale-Country lfsmake2 XML-Parser lfsmake2 Crypt-PasswdMD5 lfsmake2 Net-Telnet