* [PATCH 1/8] make.sh: Fixes bug13640 - removal of perl modules that are now core modules
@ 2024-09-14 15:28 Adolf Belka
2024-09-14 15:28 ` [PATCH 2/8] perl-Archive-Tar: removal of module as it is now in the perl " Adolf Belka
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Adolf Belka @ 2024-09-14 15:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1427 bytes --]
- Removed
perl-Archive-Tar
perl-Compress-Zlib
perl-Digest
perl-Digest-HMAC
perl-Digest-SHA1
perl-JSON
perl-MIME-Base64
- Tested out on a vm system and no issues identified.
Fixes: bug13640
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
make.sh | 7 -------
1 file changed, 7 deletions(-)
diff --git a/make.sh b/make.sh
index 3853982f8..9382d67cd 100755
--- a/make.sh
+++ b/make.sh
@@ -1725,10 +1725,6 @@ build_system() {
lfsmake2 perl-HTML-Tagset
lfsmake2 perl-HTML-Parser
lfsmake2 perl-HTML-Template
- lfsmake2 perl-Compress-Zlib
- lfsmake2 perl-Digest
- lfsmake2 perl-Digest-SHA1
- lfsmake2 perl-Digest-HMAC
lfsmake2 perl-libwww
lfsmake2 perl-LWP-Protocol-https
lfsmake2 perl-Net-HTTP
@@ -1744,13 +1740,11 @@ build_system() {
lfsmake2 perl-Canary-Stability
lfsmake2 perl-Convert-TNEF
lfsmake2 perl-Convert-UUlib
- lfsmake2 perl-Archive-Tar
lfsmake2 perl-Archive-Zip
lfsmake2 perl-Text-Tabs+Wrap
lfsmake2 perl-XML-Parser
lfsmake2 perl-Crypt-PasswdMD5
lfsmake2 perl-Net-Telnet
- lfsmake2 perl-JSON
lfsmake2 perl-Capture-Tiny
lfsmake2 perl-Config-AutoConf
lfsmake2 perl-Object-Tiny
@@ -1895,7 +1889,6 @@ build_system() {
lfsmake2 mpc
lfsmake2 perl-Net-CIDR-Lite
lfsmake2 perl-Net-SMTP-SSL
- lfsmake2 perl-MIME-Base64
lfsmake2 perl-Authen-SASL
lfsmake2 perl-MIME-Lite
lfsmake2 perl-Email-Date-Format
--
2.46.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/8] perl-Archive-Tar: removal of module as it is now in the perl core modules
2024-09-14 15:28 [PATCH 1/8] make.sh: Fixes bug13640 - removal of perl modules that are now core modules Adolf Belka
@ 2024-09-14 15:28 ` Adolf Belka
2024-09-14 15:28 ` [PATCH 3/8] perl-Digest: " Adolf Belka
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Adolf Belka @ 2024-09-14 15:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4991 bytes --]
- Not referenced in the IPFire git repo so looks like not actively used
Fixes: bug13640
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/perl-Archive-Tar | 14 ----
lfs/perl-Archive-Tar | 81 ------------------------
2 files changed, 95 deletions(-)
delete mode 100644 config/rootfiles/common/perl-Archive-Tar
delete mode 100644 lfs/perl-Archive-Tar
diff --git a/config/rootfiles/common/perl-Archive-Tar b/config/rootfiles/common/perl-Archive-Tar
deleted file mode 100644
index 0cc523ee9..000000000
--- a/config/rootfiles/common/perl-Archive-Tar
+++ /dev/null
@@ -1,14 +0,0 @@
-#usr/bin/ptar
-#usr/bin/ptardiff
-#usr/lib/perl5/site_perl/5.36.0/Archive
-#usr/lib/perl5/site_perl/5.36.0/Archive/Tar
-usr/lib/perl5/site_perl/5.36.0/Archive/Tar.pm
-usr/lib/perl5/site_perl/5.36.0/Archive/Tar/Constant.pm
-usr/lib/perl5/site_perl/5.36.0/Archive/Tar/File.pm
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Tar
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Archive/Tar/.packlist
-#usr/share/man/man1/ptar.1
-#usr/share/man/man1/ptardiff.1
-#usr/share/man/man3/Archive::Tar.3
-#usr/share/man/man3/Archive::Tar::File.3
diff --git a/lfs/perl-Archive-Tar b/lfs/perl-Archive-Tar
deleted file mode 100644
index f66be599b..000000000
--- a/lfs/perl-Archive-Tar
+++ /dev/null
@@ -1,81 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 1.29
-
-THISAPP = Archive-Tar-$(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 = 31f2e5b6454b2b45ae93f9d7aad9011dffac67eb34399258687916f8e3ab84cf8ced891eb5a40acfdb9594501540442b34dbf230e0fccdbb6d5417329878038e
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-#dist:
-# make-packages.sh Archive-Tar $(THISAPP)-ipfire-beta-1
-
-###############################################################################
-# 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)
--
2.46.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/8] perl-Digest: removal of module as it is now in the perl core modules
2024-09-14 15:28 [PATCH 1/8] make.sh: Fixes bug13640 - removal of perl modules that are now core modules Adolf Belka
2024-09-14 15:28 ` [PATCH 2/8] perl-Archive-Tar: removal of module as it is now in the perl " Adolf Belka
@ 2024-09-14 15:28 ` Adolf Belka
2024-09-14 15:28 ` [PATCH 4/8] perl-Digest-SHA1: " Adolf Belka
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Adolf Belka @ 2024-09-14 15:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4596 bytes --]
- Not referenced in the IPFire git repo so looks like not actively used
Fixes: bug13640
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/perl-Digest | 6 ---
lfs/perl-Digest | 78 -----------------------------
2 files changed, 84 deletions(-)
delete mode 100644 config/rootfiles/common/perl-Digest
delete mode 100644 lfs/perl-Digest
diff --git a/config/rootfiles/common/perl-Digest b/config/rootfiles/common/perl-Digest
deleted file mode 100644
index 544d4dbff..000000000
--- a/config/rootfiles/common/perl-Digest
+++ /dev/null
@@ -1,6 +0,0 @@
-#usr/lib/perl5/site_perl/5.36.0/Digest
-usr/lib/perl5/site_perl/5.36.0/Digest.pm
-usr/lib/perl5/site_perl/5.36.0/Digest/base.pm
-usr/lib/perl5/site_perl/5.36.0/Digest/file.pm
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Digest
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Digest/.packlist
diff --git a/lfs/perl-Digest b/lfs/perl-Digest
deleted file mode 100644
index 892b303ca..000000000
--- a/lfs/perl-Digest
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 1.19
-
-THISAPP = Digest-$(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 = bf12784ff9a1b6ebe5404e14750b2ca65ad6ac5fb37e94f0da883a0d3bb95766f7231ea324cdec33b8c36836c635b7ddaa67b2eafa15dd9ea22255ecec3fad1f
-
-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) && sed -i "s%,'y'%,'n'%" Makefile.PL
- cd $(DIR_APP) && yes 'n' | perl Makefile.PL
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
--
2.46.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/8] perl-Digest-SHA1: removal of module as it is now in the perl core modules
2024-09-14 15:28 [PATCH 1/8] make.sh: Fixes bug13640 - removal of perl modules that are now core modules Adolf Belka
2024-09-14 15:28 ` [PATCH 2/8] perl-Archive-Tar: removal of module as it is now in the perl " Adolf Belka
2024-09-14 15:28 ` [PATCH 3/8] perl-Digest: " Adolf Belka
@ 2024-09-14 15:28 ` Adolf Belka
2024-09-14 15:28 ` [PATCH 5/8] perl-Compress-Zlib: " Adolf Belka
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Adolf Belka @ 2024-09-14 15:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4838 bytes --]
- Not referenced in the IPFire git repo so looks like not actively used
Fixes: bug13640
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/perl-Digest-SHA1 | 7 ---
lfs/perl-Digest-SHA1 | 78 ------------------------
2 files changed, 85 deletions(-)
delete mode 100644 config/rootfiles/common/perl-Digest-SHA1
delete mode 100644 lfs/perl-Digest-SHA1
diff --git a/config/rootfiles/common/perl-Digest-SHA1 b/config/rootfiles/common/perl-Digest-SHA1
deleted file mode 100644
index 45edee11f..000000000
--- a/config/rootfiles/common/perl-Digest-SHA1
+++ /dev/null
@@ -1,7 +0,0 @@
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Digest
-usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/Digest/SHA1.pm
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Digest
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Digest/SHA1
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Digest/SHA1/.packlist
-usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Digest/SHA1/SHA1.so
-#usr/share/man/man3/Digest::SHA1.3
diff --git a/lfs/perl-Digest-SHA1 b/lfs/perl-Digest-SHA1
deleted file mode 100644
index 14f47c8d3..000000000
--- a/lfs/perl-Digest-SHA1
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 2.13
-
-THISAPP = Digest-SHA1-$(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 = b83c9013a932f0c1da9a9ff57831a57de04ca57f61ee553bb7f7084cb75eb8bcd61069ab5277af2039c4ede37b8d7c34d7a5c99f434000cd14670d4b2b5ca7e4
-
-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) && sed -i "s%,'y'%,'n'%" Makefile.PL
- cd $(DIR_APP) && yes 'n' | perl Makefile.PL
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
--
2.46.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 5/8] perl-Compress-Zlib: removal of module as it is now in the perl core modules
2024-09-14 15:28 [PATCH 1/8] make.sh: Fixes bug13640 - removal of perl modules that are now core modules Adolf Belka
` (2 preceding siblings ...)
2024-09-14 15:28 ` [PATCH 4/8] perl-Digest-SHA1: " Adolf Belka
@ 2024-09-14 15:28 ` Adolf Belka
2024-09-14 15:28 ` [PATCH 6/8] perl-Digest-HMAC: " Adolf Belka
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Adolf Belka @ 2024-09-14 15:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5262 bytes --]
- 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 <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
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 <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# 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)
-
--
2.46.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 6/8] perl-Digest-HMAC: removal of module as it is now in the perl core modules
2024-09-14 15:28 [PATCH 1/8] make.sh: Fixes bug13640 - removal of perl modules that are now core modules Adolf Belka
` (3 preceding siblings ...)
2024-09-14 15:28 ` [PATCH 5/8] perl-Compress-Zlib: " Adolf Belka
@ 2024-09-14 15:28 ` Adolf Belka
2024-09-14 15:28 ` [PATCH 7/8] perl-MIME-Base64: " Adolf Belka
2024-09-14 15:28 ` [PATCH 8/8] perl-JSON: " Adolf Belka
6 siblings, 0 replies; 8+ messages in thread
From: Adolf Belka @ 2024-09-14 15:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4933 bytes --]
- 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 <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/perl-Digest-HMAC | 9 ---
lfs/perl-Digest-HMAC | 78 ------------------------
2 files changed, 87 deletions(-)
delete mode 100644 config/rootfiles/common/perl-Digest-HMAC
delete mode 100644 lfs/perl-Digest-HMAC
diff --git a/config/rootfiles/common/perl-Digest-HMAC b/config/rootfiles/common/perl-Digest-HMAC
deleted file mode 100644
index 622d6e746..000000000
--- a/config/rootfiles/common/perl-Digest-HMAC
+++ /dev/null
@@ -1,9 +0,0 @@
-#usr/lib/perl5/site_perl/5.36.0/Digest
-usr/lib/perl5/site_perl/5.36.0/Digest/HMAC.pm
-usr/lib/perl5/site_perl/5.36.0/Digest/HMAC_MD5.pm
-usr/lib/perl5/site_perl/5.36.0/Digest/HMAC_SHA1.pm
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Digest/HMAC
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/Digest/HMAC/.packlist
-#usr/share/man/man3/Digest::HMAC.3
-#usr/share/man/man3/Digest::HMAC_MD5.3
-#usr/share/man/man3/Digest::HMAC_SHA1.3
diff --git a/lfs/perl-Digest-HMAC b/lfs/perl-Digest-HMAC
deleted file mode 100644
index d95f9099f..000000000
--- a/lfs/perl-Digest-HMAC
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 1.03
-
-THISAPP = Digest-HMAC-$(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 = 4dda8519d63befc278277b03ba00fb8738913e3322b136ca751ef9c1bf9644e1fec957d9f757ae06f4f06a64e88c85227666792cea0b59ed772577a1e8128c18
-
-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) && sed -i "s%,'y'%,'n'%" Makefile.PL
- cd $(DIR_APP) && yes 'n' | perl Makefile.PL
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
--
2.46.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 7/8] perl-MIME-Base64: removal of module as it is now in the perl core modules
2024-09-14 15:28 [PATCH 1/8] make.sh: Fixes bug13640 - removal of perl modules that are now core modules Adolf Belka
` (4 preceding siblings ...)
2024-09-14 15:28 ` [PATCH 6/8] perl-Digest-HMAC: " Adolf Belka
@ 2024-09-14 15:28 ` Adolf Belka
2024-09-14 15:28 ` [PATCH 8/8] perl-JSON: " Adolf Belka
6 siblings, 0 replies; 8+ messages in thread
From: Adolf Belka @ 2024-09-14 15:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5734 bytes --]
- Used by the git addon.
- With the old separate module removed git still successfully built, installed and was
able to be run, cloning the ipfire git repo, changing to next, modifying a file and
the running a commit with the change.
Fixes: bug13640
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/perl-MIME-Base64 | 7 --
lfs/git | 4 +-
lfs/perl-MIME-Base64 | 87 ----------------------
3 files changed, 2 insertions(+), 96 deletions(-)
delete mode 100644 config/rootfiles/packages/perl-MIME-Base64
delete mode 100644 lfs/perl-MIME-Base64
diff --git a/config/rootfiles/packages/perl-MIME-Base64 b/config/rootfiles/packages/perl-MIME-Base64
deleted file mode 100644
index b4107feae..000000000
--- a/config/rootfiles/packages/perl-MIME-Base64
+++ /dev/null
@@ -1,7 +0,0 @@
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/MIME
-usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/MIME/Base64.pm
-usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/MIME/QuotedPrint.pm
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/MIME/Base64
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/MIME/Base64/.packlist
-#usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/MIME/Base64/Base64.bs
-usr/lib/perl5/site_perl/5.36.0/xxxMACHINExxx-linux-thread-multi/auto/MIME/Base64/Base64.so
diff --git a/lfs/git b/lfs/git
index c75e37df8..e209fb568 100644
--- a/lfs/git
+++ b/lfs/git
@@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = git
-PAK_VER = 34
+PAK_VER = 35
-DEPS = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
+DEPS = perl-Authen-SASL perl-Net-SMTP-SSL
SERVICES =
diff --git a/lfs/perl-MIME-Base64 b/lfs/perl-MIME-Base64
deleted file mode 100644
index 60544ffa1..000000000
--- a/lfs/perl-MIME-Base64
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-SUMMARY = Perl extension for encoding and decoding of base64 strings
-
-VER = 3.16
-
-THISAPP = MIME-Base64-$(VER)
-DL_FILE = ${THISAPP}.tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = perl-MIME-Base64
-DEPS =
-PAK_VER = 5
-
-SERVICES =
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = c9617bcadaa103657e33b0eb8a5513afe8ad021dc0200d5b59efafe5daa762160a2b931ee9f806cab86e21aa84c5f563c681f6a881b7749fb902873b8d579de5
-
-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)
--
2.46.0
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 8/8] perl-JSON: removal of module as it is now in the perl core modules
2024-09-14 15:28 [PATCH 1/8] make.sh: Fixes bug13640 - removal of perl modules that are now core modules Adolf Belka
` (5 preceding siblings ...)
2024-09-14 15:28 ` [PATCH 7/8] perl-MIME-Base64: " Adolf Belka
@ 2024-09-14 15:28 ` Adolf Belka
6 siblings, 0 replies; 8+ messages in thread
From: Adolf Belka @ 2024-09-14 15:28 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5715 bytes --]
- 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 <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
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 <info(a)ipfire.org> #
-# #
-# 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 <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-
-###############################################################################
-# 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
--
2.46.0
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-09-14 15:28 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-14 15:28 [PATCH 1/8] make.sh: Fixes bug13640 - removal of perl modules that are now core modules Adolf Belka
2024-09-14 15:28 ` [PATCH 2/8] perl-Archive-Tar: removal of module as it is now in the perl " Adolf Belka
2024-09-14 15:28 ` [PATCH 3/8] perl-Digest: " Adolf Belka
2024-09-14 15:28 ` [PATCH 4/8] perl-Digest-SHA1: " Adolf Belka
2024-09-14 15:28 ` [PATCH 5/8] perl-Compress-Zlib: " Adolf Belka
2024-09-14 15:28 ` [PATCH 6/8] perl-Digest-HMAC: " Adolf Belka
2024-09-14 15:28 ` [PATCH 7/8] perl-MIME-Base64: " Adolf Belka
2024-09-14 15:28 ` [PATCH 8/8] perl-JSON: " Adolf Belka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox