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

Merge branch 'master' into next

Browse Source
This commit is contained in:
Michael Tremer
2015-07-09 13:16:45 +02:00
parent ec2285c811 8c8383e55e
commit c972b1c467
4 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/rootfiles/oldcore/91/update.sh
View File

@@ -54,6 +54,11 @@ if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start /etc/init.d/ipsec start
fi fi
# Update grub config to display new core version
if [ -e /boot/grub/grub.cfg ]; then
grub-mkconfig > /boot/grub/grub.cfg
fi
# This update need a reboot... # This update need a reboot...
touch /var/run/need_reboot touch /var/run/need_reboot

4
lfs/openssl
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 1.0.2b VER = 1.0.2c
THISAPP = openssl-$(VER) THISAPP = openssl-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -82,7 +82,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 7729b259e2dea7d60b32fc3934d6984b $(DL_FILE)_MD5 = 8c8d81a9ae7005276e486702edbcd4b6
install : $(TARGET) install : $(TARGET)

6
lfs/strongswan
View File

@@ -24,7 +24,7 @@
include Config include Config
VER = 5.3.1 VER = 5.3.2
THISAPP = strongswan-$(VER) THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2 DL_FILE = $(THISAPP).tar.bz2
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 66f258901a3d6c271da1a0c7fb3e5013 $(DL_FILE)_MD5 = fab014be1477ef4ebf9a765e10f8802c
install : $(TARGET) install : $(TARGET)
@@ -78,10 +78,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.1-build-timeattack.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP) && ./configure \ cd $(DIR_APP) && ./configure \
--prefix="/usr" \ --prefix="/usr" \
--sysconfdir="/etc" \ --sysconfdir="/etc" \

11
src/patches/strongswan-5.3.1-build-timeattack.patch
View File

@@ -1,11 +0,0 @@
--- strongswan-5.3.1/scripts/Makefile.am.old 2015-06-04 17:20:43.539244145 +0000
+++ strongswan-5.3.1/scripts/Makefile.am 2015-06-04 17:20:51.760510631 +0000
@@ -42,7 +42,7 @@
dnssec_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
aes_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
settings_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
-timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la
+timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(RTLIB)
key2keyid.o : $(top_builddir)/config.status