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

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

Browse Source
This commit is contained in:
Matthias Fischer
2015-05-02 22:19:21 +02:00
parent fa0203f78e 0ee35ce0ca
commit 07c09125e1
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/90/filelists/squid Symbolic link
View File

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

3
config/rootfiles/core/90/update.sh
View File

@@ -195,6 +195,9 @@ fcrontab -z &>/dev/null
# Generate ddns configuration file # Generate ddns configuration file
sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
# Regenerate IPsec configuration
sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
# Update Language cache # Update Language cache
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

4
html/cgi-bin/vpnmain.cgi
View File

@@ -3017,7 +3017,7 @@ sub make_algos($$$$$) {
if ($mode eq "ike") { if ($mode eq "ike") {
push(@algo, $int); push(@algo, $int);
if ($grp =~ m/^e(\d+)/) { if ($grp =~ m/^e(.*)$/) {
push(@algo, "ecp$1"); push(@algo, "ecp$1");
} else { } else {
push(@algo, "modp$grp"); push(@algo, "modp$grp");
@@ -3030,7 +3030,7 @@ sub make_algos($$$$$) {
push(@algo, $int); push(@algo, $int);
} }
if ($grp =~ m/^e(\d+)/) { if ($grp =~ m/^e(.*)$/) {
push(@algo, "ecp$1"); push(@algo, "ecp$1");
} else { } else {
push(@algo, "modp$grp"); push(@algo, "modp$grp");

6
lfs/squid
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 3.4.9 VER = 3.4.13
THISAPP = squid-$(VER) THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 497e5be7b3430d12667628296760beca $(DL_FILE)_MD5 = a5f6c978b2d7a99b161c8275e1acb470
install : $(TARGET) install : $(TARGET)
@@ -78,12 +78,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--libexecdir=/usr/lib/squid \ --libexecdir=/usr/lib/squid \
--localstatedir=/var \ --localstatedir=/var \
--disable-ipv6 \ --disable-ipv6 \
--disable-ssl \
--enable-poll \ --enable-poll \
--disable-icmp \ --disable-icmp \
--disable-wccp \ --disable-wccp \
--enable-ident-lookups \ --enable-ident-lookups \
--enable-storeio="aufs,diskd,ufs" \ --enable-storeio="aufs,diskd,ufs" \
--enable-ssl \
--enable-underscores \ --enable-underscores \
--enable-http-violations \ --enable-http-violations \
--enable-removal-policies="heap,lru" \ --enable-removal-policies="heap,lru" \