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

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 04e36969c431235d50e75519de7694e02596b974..aefcfb6878442555edc1b73cdaf5ceb8793c88ef 100644 (file)
--- 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\.\-]+$/ );

diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index a130a059bebf13e9fb2dd9bb18f88c53cd5172df..7bab5a7dc725904ce1de70e0ca494b0535fc328c 100644 (file)
--- 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/config/rootfiles/core/134/filelists/files b/config/rootfiles/core/134/filelists/files
index 25ade1735d5214a00a88b31eebd109e8e191fa31..b74ce2e5f92b3446c027270e6f6d8282ffdb29b0 100644 (file)
--- 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

diff --git a/config/rootfiles/core/134/filelists/unbound b/config/rootfiles/core/134/filelists/unbound
new file mode 120000 (symlink)
index 0000000..66adf09
--- /dev/null
+++ b/config/rootfiles/core/134/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file

diff --git a/lfs/unbound b/lfs/unbound
index 87666dfce7dc16ea938fa85186124a3504c25b76..e017dcd7813bacaf1ce433fcbb2aa605b7ab70e2 100644 (file)
--- 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)