webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2019-06-18 18:42:02 +02:00
parent 82c279a518 7516e8b7f1
commit 15ca18a3d9
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/cfgroot/general-functions.pl
View File

@@ -784,7 +784,7 @@ sub validemail {
return 0 if ( substr($parts[1],-1,1) eq '.' ); return 0 if ( substr($parts[1],-1,1) eq '.' );
#check first addresspart (before '@' sign) #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) #check second addresspart (after '@' sign)
return 0 if ( $parts[1] !~ m/^[a-zA-Z0-9\.\-]+$/ ); return 0 if ( $parts[1] !~ m/^[a-zA-Z0-9\.\-]+$/ );

2
config/rootfiles/common/unbound
View File

@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
#usr/lib/libunbound.la #usr/lib/libunbound.la
#usr/lib/libunbound.so #usr/lib/libunbound.so
usr/lib/libunbound.so.8 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/lib/pkgconfig/libunbound.pc
usr/sbin/unbound usr/sbin/unbound
usr/sbin/unbound-anchor usr/sbin/unbound-anchor

1
config/rootfiles/core/134/filelists/files
View File

@@ -2,4 +2,5 @@ etc/system-release
etc/issue etc/issue
etc/rc.d/init.d/unbound etc/rc.d/init.d/unbound
srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/general-functions.pl
var/ipfire/langs var/ipfire/langs

1
config/rootfiles/core/134/filelists/unbound Symbolic link
View File

@@ -0,0 +1 @@
../../../common/unbound

4
lfs/unbound
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 1.9.1 VER = 1.9.2
THISAPP = unbound-$(VER) THISAPP = unbound-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 5d954920d192b33f7c88f015dd969940 $(DL_FILE)_MD5 = 244e10977d1453dff669caa3c0efba18
install : $(TARGET) install : $(TARGET)