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

Merge remote-tracking branch 'ummeegge/lynis' into next

Browse Source 
Conflicts:
	make.sh
This commit is contained in:
Michael Tremer
2015-01-28 22:49:36 +01:00
parent 14a08a8d15 5ab875af71
commit fe53fa8dac
110 changed files with 59963 additions and 2561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29383
src/patches/backports-3.18.1-1-add_usbnet_modules.patch Normal file
View File

File diff suppressed because it is too large Load Diff

3806
src/patches/backports-3.18.1-1-grsecurity.patch Normal file
View File

File diff suppressed because it is too large Load Diff

34
src/patches/backports-3.18.1-1-ipfire-build.patch Normal file
View File

@@ -0,0 +1,34 @@
diff -Naur backports-3.18.1-1.org/Makefile backports-3.18.1-1/Makefile
--- backports-3.18.1-1.org/Makefile 2014-12-21 22:37:13.000000000 +0100
+++ backports-3.18.1-1/Makefile 2014-12-29 15:51:19.358111370 +0100
@@ -8,9 +8,9 @@
SHELL := /bin/bash
BACKPORT_PWD := $(shell pwd)
-KMODDIR ?= updates
+KMODDIR ?= kernel
ifneq ($(origin KLIB), undefined)
-KMODPATH_ARG := "INSTALL_MOD_PATH=$(KLIB)"
+KMODPATH_ARG :=
else
KLIB := /lib/modules/$(shell uname -r)/
KMODPATH_ARG :=
diff -Naur backports-3.18.1-1.org/Makefile.real backports-3.18.1-1/Makefile.real
--- backports-3.18.1-1.org/Makefile.real 2014-12-21 22:37:13.000000000 +0100
+++ backports-3.18.1-1/Makefile.real 2014-12-29 15:51:40.934780933 +0100
@@ -92,11 +92,11 @@
@$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_PWD) \
INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \
modules_install
- @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR)
+# @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR)
@./scripts/compress_modules.sh $(KLIB)/$(KMODDIR)
- @./scripts/check_depmod.sh
- @/sbin/depmod -a
- @./scripts/update-initramfs.sh $(KLIB)
+# @./scripts/check_depmod.sh
+# @/sbin/depmod -a
+# @./scripts/update-initramfs.sh $(KLIB)
@echo
@echo Your backported driver modules should be installed now.
@echo Reboot.

5058
src/patches/backports-3.18.1-1_add_libertas_uap.patch Normal file
View File

File diff suppressed because it is too large Load Diff

22
src/patches/crda-3.13-crypto_use_optional.patch Normal file
View File

@@ -0,0 +1,22 @@
Submitted By: hauke from OpenWRT
Date: 2009-04-17
Initial Package Version: 1.0.2
Origin: https://dev.openwrt.org/changeset/15405/trunk/package/crda/patches/101-make_crypto_use_optional.patch
Description: The patch was modified for version crda-3.13 by Erik Kapfer <erik.kapfer@ipfire.org>..
This patch provides the following improvements:
* Crypto usage is optional.
diff -Nur crda-3.13.orig/Makefile crda-3.13/Makefile
--- crda-3.13.orig/Makefile 2015-01-12 07:55:08.791183765 +0100
+++ crda-3.13/Makefile 2015-01-12 07:56:35.437381029 +0100
@@ -43,7 +43,9 @@
$(LIBREG): keys-ssl.c
-else
+endif
+
+ifeq ($(USE_GCRYPT),1)
CFLAGS += -DUSE_GCRYPT
LDLIBS += -lgcrypt

13
src/patches/linux-3.14.25-rt5592_no_special_txop_init.patch Normal file
View File

@@ -0,0 +1,13 @@
diff -Naur linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c
--- linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c 2014-11-21 18:23:44.000000000 +0100
+++ linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c 2014-12-03 11:30:58.813355413 +0100
@@ -4847,7 +4847,8 @@
rt2x00_set_field32(&reg, TXOP_CTRL_CFG_EXT_CWMIN, 0);
rt2800_register_write(rt2x00dev, TXOP_CTRL_CFG, reg);
- reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
+// reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
+ reg = 0x00000002;
rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
rt2800_register_read(rt2x00dev, TX_RTS_CFG, &reg);

12
src/patches/linux-3.14.25_rt2x00_fix_bss_bcn_num.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -Naur linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c
--- linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c 2014-12-03 11:30:58.000000000 +0100
+++ linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c 2014-12-03 12:15:45.743454351 +0100
@@ -1557,7 +1557,7 @@
if (!is_zero_ether_addr((const u8 *)conf->bssid)) {
reg = le32_to_cpu(conf->bssid[1]);
rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_ID_MASK, 3);
- rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 7);
+ rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 0);
conf->bssid[1] = cpu_to_le32(reg);
}

10002
src/patches/u-boot/sunxi/001-uboot-sunxi-509d96d4f1f602d62d36db660973249e16f9d088.patch Normal file
View File

File diff suppressed because it is too large Load Diff

1495
src/patches/u-boot/sunxi/002-uboot-jwrdegoede-psci-support.patch Normal file
View File

File diff suppressed because it is too large Load Diff

20
src/patches/u-boot/sunxi/003-uboot-fix-gmac-not-working-reliable-on-bananapi.patch Normal file
View File

@@ -0,0 +1,20 @@
diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
index e7ff952..f58c963 100644
--- a/board/sunxi/gmac.c
+++ b/board/sunxi/gmac.c
@@ -24,6 +24,15 @@ int sunxi_gmac_initialize(bd_t *bis)
CCM_GMAC_CTRL_GPIT_MII);
#endif
+ /*
+ * HdG: this is necessary to get GMAC to work reliable on the
+ * Bananapi. We don't know what these undocumented bits do, so this
+ * is a Bananapi specific hack for now.
+ */
+#ifdef CONFIG_BANANAPI
+ setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10);
+#endif
+
/* Configure pin mux settings for GMAC */
for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) {
#ifdef CONFIG_RGMII