perl-JSON: removal of module as it is now in the perl core modules

- 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@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/perl-JSON b/config/rootfiles/packages/perl-JSON
deleted file mode 100644 (file)
index c4de95d..0000000
--- 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 (file)
index 629726a..0000000
--- a/lfs/perl-JSON
+++ /dev/null
@@ -1,88 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@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 f8812d6784f64ba2c07686c0153563c0f8320a4e..8d2c6a3a3b3a458b55585dce8d7284b199d00bf2 100644 (file)
--- 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