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 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

Browse Source
This commit is contained in:
Michael Tremer
2013-09-26 16:12:15 +02:00
parent 90e4ec2a88 0a379f8fe6
commit ec9f81be0c
5 changed files with 17 additions and 110793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/kernel/kernel.config.i586-ipfire
View File

@@ -390,7 +390,7 @@ CONFIG_CPU_SUP_UMC_32=y
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y
CONFIG_NR_CPUS=4
CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
CONFIG_PREEMPT_NONE=y

8
config/rootfiles/packages/clamav
View File

@@ -10,15 +10,15 @@ usr/bin/sigtool
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.6
usr/lib/libclamav.so.6.1.17
usr/lib/libclamav.so.6.1.18
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.6
usr/lib/libclamunrar.so.6.1.17
usr/lib/libclamunrar.so.6.1.18
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.6
usr/lib/libclamunrar_iface.so.6.1.17
usr/lib/libclamunrar_iface.so.6.1.18
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
usr/share/clamav
@@ -36,7 +36,9 @@ usr/share/clamav
#usr/share/man/man8/clamd.8
#var/ipfire/clamav
var/ipfire/clamav/clamd.conf
var/ipfire/clamav/clamd.conf.sample
var/ipfire/clamav/freshclam.conf
var/ipfire/clamav/freshclam.conf.sample
var/run/clamav
etc/rc.d/init.d/clamav
usr/local/bin/clamavctrl

6
lfs/clamav
View File

@@ -24,7 +24,7 @@
include Config
VER = 0.97.8
VER = 0.98
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
PAK_VER = 22
PAK_VER = 23
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ac52bcbad3ea72eac08fedb9772f648b
$(DL_FILE)_MD5 = ca0b8c930efcb8be1d47592d268006c5
install : $(TARGET)

13
lfs/linux
View File

@@ -24,9 +24,10 @@
include Config
VER = 3.10.11
VER = 3.10.12
RPI_PATCHES = linux-3.10.10-c1af7c6
GRS_PATCHES = grsecurity-2.9.1-3.10.12-ipfire1.patch.xz
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -65,15 +66,17 @@ endif
# Top-level Rules
###############################################################################
objects =$(DL_FILE) \
rpi-patches-$(RPI_PATCHES).patch.xz
rpi-patches-$(RPI_PATCHES).patch.xz \
$(GRS_PATCHES)
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
$(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)
$(DL_FILE)_MD5 = 79e33380a4a74f35aabb6ae4713adab1
$(DL_FILE)_MD5 = 16e43b3c9957cf5af44863d6809efe38
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = ef9274b3ff5d05daaaa4bdbe86ad00fc
$(GRS_PATCHES)_MD5 = 563b6ff05687289cfebc07f2a66ded92
install : $(TARGET)
@@ -120,7 +123,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Grsecurity-patches
ifneq "$(KCFG)" "-headers"
ifneq "$(KCFG)" "-rpi"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grsecurity-2.9.1-3.10.10-201308292131.patch
cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1
cd $(DIR_APP) && rm localversion-grsec
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
endif

110781
src/patches/grsecurity-2.9.1-3.10.10-201308292131.patch
View File

File diff suppressed because it is too large Load Diff