Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/packages/pcengines-apu-firmware b/config/rootfiles/packages/pcengines-apu-firmware
index b2126e822e665879d13061d1033a258897c48aad..95b68801ef01de015df120575004f67ed7b94198 100644 (file)
--- a/config/rootfiles/packages/pcengines-apu-firmware
+++ b/config/rootfiles/packages/pcengines-apu-firmware
@@ -1,7 +1,7 @@
 #lib/firmware/pcengines
 #lib/firmware/pcengines/apu
-lib/firmware/pcengines/apu/apu1_v4.9.0.7.rom
-lib/firmware/pcengines/apu/apu2_v4.9.0.7.rom
-lib/firmware/pcengines/apu/apu3_v4.9.0.7.rom
-lib/firmware/pcengines/apu/apu4_v4.9.0.7.rom
-lib/firmware/pcengines/apu/apu5_v4.9.0.7.rom
+lib/firmware/pcengines/apu/apu1_v4.10.0.0.rom
+lib/firmware/pcengines/apu/apu2_v4.10.0.0.rom
+lib/firmware/pcengines/apu/apu3_v4.10.0.0.rom
+lib/firmware/pcengines/apu/apu4_v4.10.0.0.rom
+lib/firmware/pcengines/apu/apu5_v4.10.0.0.rom

diff --git a/config/rootfiles/packages/perl-Net-LibIDN b/config/rootfiles/packages/perl-Net-LibIDN
new file mode 100644 (file)
index 0000000..e2f7989
--- /dev/null
+++ b/config/rootfiles/packages/perl-Net-LibIDN
@@ -0,0 +1,6 @@
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Net/LibIDN.pm
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/LibIDN
+#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/LibIDN/.packlist
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/LibIDN/LibIDN.so
+usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/LibIDN/autosplit.ix
+#usr/share/man/man3/Net::LibIDN.3

diff --git a/lfs/amavisd b/lfs/amavisd
index 026e43f2fec2b5c4325c0589fca9749c4d862a3d..f87382e0e5567741664632cee30558be51222eb7 100644 (file)
--- a/lfs/amavisd
+++ b/lfs/amavisd
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = amavisd
-PAK_VER    = 2
+PAK_VER    = 3
 
-DEPS       = "clamav spamassassin"
+DEPS       = "clamav spamassassin perl-Net-LibIDN"
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/pcengines-apu-firmware b/lfs/pcengines-apu-firmware
index efc8593889f8a6e97bb01cc74b47cb074b2fd65b..8b5c994127c7e9f6cd8ef070fdc53d190649267b 100644 (file)
--- a/lfs/pcengines-apu-firmware
+++ b/lfs/pcengines-apu-firmware
@@ -24,14 +24,14 @@
 
 include Config
 
-VER        = 4.9.0.7
+VER        = 4.10.0.0
 
 THISAPP    = pcengines-apu-firmware-$(VER)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pcengines-apu-firmware
-PAK_VER    = 2
+PAK_VER    = 3
 SUP_ARCH   = i586 x86_64
 
 DEPS       = "firmware-update"
@@ -53,11 +53,11 @@ apu3_v$(VER).rom = $(DL_FROM)/apu3_v$(VER).rom
 apu4_v$(VER).rom = $(DL_FROM)/apu4_v$(VER).rom
 apu5_v$(VER).rom = $(DL_FROM)/apu5_v$(VER).rom
 
-apu1_v$(VER).rom_MD5 = c4319969ebe031d8ab04e4d758581ca0
-apu2_v$(VER).rom_MD5 = eea6483fcd473fbb38f0547aa1aaeb31
-apu3_v$(VER).rom_MD5 = 790bc3934c7429c322d04c49e0fadb95
-apu4_v$(VER).rom_MD5 = d1c9fea737d46c82bfec2a8f3bee6c46
-apu5_v$(VER).rom_MD5 = e60502e06f5e814c2845cde447aa8f6f
+apu1_v$(VER).rom_MD5 = 21c754ae5390722e04aa7ea55e339478
+apu2_v$(VER).rom_MD5 = a509bc0384ba4f368bda267b8ed1761d
+apu3_v$(VER).rom_MD5 = 6951e3c8742dab67c84ef467c69edd66
+apu4_v$(VER).rom_MD5 = 0b30b739fccd22c43a13023c2bb7e867
+apu5_v$(VER).rom_MD5 = c1b5b9f393a099f0952b4138bc71901e
 
 install : $(TARGET)
 

diff --git a/lfs/perl-Net-LibIDN b/lfs/perl-Net-LibIDN
new file mode 100644 (file)
index 0000000..70fc98c
--- /dev/null
+++ b/lfs/perl-Net-LibIDN
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# 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
+VER        = 0.12
+
+THISAPP    = Net-LibIDN-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+PROG       = perl-Net-LibIDN
+DEPS       = ""
+PAK_VER    = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = c3e4de2065009d67bcb1df0afb473e12
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+       @$(PAK)
+
+###############################################################################
+# 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 909fe2430e6a37ddd4b70fb5d18988ddccc4b825..cf2e4387420641c29502f8d43bf307b6ce154ab2 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1394,6 +1394,7 @@ buildipfire() {
   lfsmake2 clamav
   lfsmake2 perl-NetAddr-IP
   lfsmake2 spamassassin
+  lfsmake2 perl-Net-LibIDN
   lfsmake2 amavisd
   lfsmake2 dma
   lfsmake2 alsa