webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2018-08-29 07:43:06 +02:00
parent aa61d769b7 574a71177b
commit fd313a1ae6
6 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/oldcore/123/filelists/files
View File

@@ -13,6 +13,8 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/local/bin/backupiso
usr/lib/libssp.so.0
usr/lib/libssp.so.0.0.0
usr/sbin/dhclient
usr/share/GeoIP/GeoIP.dat
var/ipfire/backup/bin/backup.pl

1
config/rootfiles/oldcore/123/filelists/i586/openssl-sse2 Symbolic link
View File

@@ -0,0 +1 @@
../../../../common/i586/openssl-sse2

1
config/rootfiles/oldcore/123/filelists/xtables-addons Symbolic link
View File

@@ -0,0 +1 @@
../../../common/xtables-addons

3
config/rootfiles/oldcore/123/update.sh
View File

@@ -34,6 +34,9 @@ done
# Stop services
/etc/init.d/squid stop
# remove old xtables modules / some are renamend
rm -rf /lib/xtables
# Extract files
extract_files

6
lfs/intel-microcode
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 20180807
VER = 20180807a
THISAPP = microcode-$(VER)
DL_FILE = $(THISAPP).tgz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 49f534f1079d3c5bc178a150c1c105aa
$(DL_FILE)_MD5 = b12f8680d87c81a302e8c85712ed1a80
install : $(TARGET)

2
lfs/linux
View File

@@ -194,7 +194,7 @@ else
ifeq "$(BUILD_PLATFORM)" "arm"
cd $(DIR_APP) && make $(MAKETUNING) dtbs
mkdir -p /boot/dtb-$(VER)-$(VERSUFIX)
cd $(DIR_APP)/arch/$(HEADERS_ARCH)/boot/dts && for f in $$(find -name *.dtb); do \
cd $(DIR_APP)/arch/$(KERNEL_ARCH)/boot/dts && for f in $$(find -name "*.dtb"); do \
cp -v --parents $$f /boot/dtb-$(VER)-$(VERSUFIX)/ ; \
chmod 644 /boot/dtb-$(VER)-$(VERSUFIX)/$$f ; \
done