From 2f278de868f0a62f03bf6f32d76309a0c1d8f9fe Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Mon, 17 Jun 2019 21:11:00 +0200 Subject: [PATCH 1/4] unbound: Update to 1.9.2 For details see: https://nlnetlabs.nl/pipermail/unbound-users/2019-June/011632.html Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- config/rootfiles/common/unbound | 2 +- lfs/unbound | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound index a130a059b..7bab5a7dc 100644 --- a/config/rootfiles/common/unbound +++ b/config/rootfiles/common/unbound @@ -11,7 +11,7 @@ etc/unbound/unbound.conf #usr/lib/libunbound.la #usr/lib/libunbound.so usr/lib/libunbound.so.8 -usr/lib/libunbound.so.8.1.1 +usr/lib/libunbound.so.8.1.2 #usr/lib/pkgconfig/libunbound.pc usr/sbin/unbound usr/sbin/unbound-anchor diff --git a/lfs/unbound b/lfs/unbound index 87666dfce..e017dcd78 100644 --- a/lfs/unbound +++ b/lfs/unbound @@ -24,7 +24,7 @@ include Config -VER = 1.9.1 +VER = 1.9.2 THISAPP = unbound-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5d954920d192b33f7c88f015dd969940 +$(DL_FILE)_MD5 = 244e10977d1453dff669caa3c0efba18 install : $(TARGET) From 82899ad1ce895d3b2348b6c7eb6179096e3724aa Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 17 Jun 2019 17:40:37 +0100 Subject: [PATCH 2/4] core134: Ship updated unbound Signed-off-by: Michael Tremer --- config/rootfiles/core/134/filelists/unbound | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/134/filelists/unbound diff --git a/config/rootfiles/core/134/filelists/unbound b/config/rootfiles/core/134/filelists/unbound new file mode 120000 index 000000000..66adf0924 --- /dev/null +++ b/config/rootfiles/core/134/filelists/unbound @@ -0,0 +1 @@ +../../../common/unbound \ No newline at end of file From cc724c142aa71d9e33d923599f31ec19bd2072e2 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Tue, 18 Jun 2019 09:55:35 +0200 Subject: [PATCH 3/4] BUG12070: Its not possible to use the underscore in email addresses Using IPFire's Mailservice does not allow to enter a senders mail address with the underscore. The function used to verify that is used from general-functions.pl. Now the function 'validemail' allows the underscore in the address. Fixes: #12070 Signed-off-by: Michael Tremer --- config/cfgroot/general-functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 04e36969c..aefcfb687 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -784,7 +784,7 @@ sub validemail { return 0 if ( substr($parts[1],-1,1) eq '.' ); #check first addresspart (before '@' sign) - return 0 if ( $parts[0] !~ m/^[a-zA-Z0-9\.!\-\+#]+$/ ); + return 0 if ( $parts[0] !~ m/^[a-zA-Z0-9\.!\-\_\+#]+$/ ); #check second addresspart (after '@' sign) return 0 if ( $parts[1] !~ m/^[a-zA-Z0-9\.\-]+$/ ); From 7516e8b7f1edff1ff59c1e8ac3f342c66bada85d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 18 Jun 2019 09:13:21 +0100 Subject: [PATCH 4/4] core134: Ship changed general-functions.pl Signed-off-by: Michael Tremer --- config/rootfiles/core/134/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/134/filelists/files b/config/rootfiles/core/134/filelists/files index 25ade1735..b74ce2e5f 100644 --- a/config/rootfiles/core/134/filelists/files +++ b/config/rootfiles/core/134/filelists/files @@ -2,4 +2,5 @@ etc/system-release etc/issue etc/rc.d/init.d/unbound srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/general-functions.pl var/ipfire/langs