diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-21 09:17:24 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-21 10:33:20 +0000 |
| commit | 5e2534f37fc5cd4b3cac129448cd32c81f23f70e (patch) | |
| tree | a6cfd5cd75327eca256ced933179e5927767dbd1 | |
| parent | 530c2056922ca5f8abc401b289c8a1f54f56027b (diff) | |
| download | aports-5e2534f37fc5cd4b3cac129448cd32c81f23f70e.tar.bz2 aports-5e2534f37fc5cd4b3cac129448cd32c81f23f70e.tar.xz | |
main/linux-grsec: enable GPIO_CS5535 and GPIO_UCB1400
| -rw-r--r-- | main/linux-grsec/APKBUILD | 18 | ||||
| -rw-r--r-- | main/linux-grsec/config-grsec.x86 | 7 | ||||
| -rw-r--r-- | main/linux-grsec/config-grsec.x86_64 | 2 | ||||
| -rw-r--r-- | main/linux-grsec/gcc-default-pie.patch | 11 |
4 files changed, 12 insertions, 26 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 43bced5e60..d09846b18b 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=0 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs" @@ -22,7 +22,6 @@ source="http://ftp.kernel.org/pub/linux/kernel/v4.x/linux-$_kernver.tar.xz fix-spi-nor-namespace-clash.patch imx6q-no-unclocked-sleep.patch gcc6.patch - gcc-default-pie.patch config-grsec.x86 config-grsec.x86_64 @@ -217,9 +216,8 @@ md5sums="9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz c32f1d7517a095a2645fc1c7dec5db8f fix-spi-nor-namespace-clash.patch b11c29ee88f7f537973191036d48bee7 imx6q-no-unclocked-sleep.patch 90e0fca6cb7bca277394b0db7f605098 gcc6.patch -736b1cec515210eee8ec243c910a4be2 gcc-default-pie.patch -6e423679bf1b0cbbe7ba31bc86b0f4da config-grsec.x86 -5caf44f1505b39e83206b8feeb4c45a7 config-grsec.x86_64 +44e32def365b8931c7ffa4e5245d23c0 config-grsec.x86 +8fb3ce67434f2ba66366cecb93d0e61c config-grsec.x86_64 35d10d9444978dc8009e9da5e33b0f43 config-grsec.armhf b8ee8bcd0b53d0d661bf9aac06150dd2 config-virtgrsec.x86 a2e1de5edbc62606a6642b83c61b4d7b config-virtgrsec.x86_64" @@ -229,9 +227,8 @@ fc2b60d221aeaf3eafec4f36f299e4002be81da85117c3f59963fdcb6facb929 patch-4.4.39.x b8ce28c61663dbd92f7e1c862c042c88c4d0459ce15f6e6ea121e20705b66212 fix-spi-nor-namespace-clash.patch 7e8a954750139a421a76e414e19a3b57645c9ec70e6c14a6b7708a3fa0cfd5e4 imx6q-no-unclocked-sleep.patch 21640b417cb9a389bf7be6a11dc71a481ec76fcfcc758992a9be158ab6a643e8 gcc6.patch -bc2a20a2fb42480cf09f1b240435396707fd08ae2cf9ec16be9953e922a40187 gcc-default-pie.patch -2dcd3db2342d1a9600563ed52c4371668dd885d2ffb9a723be42cccfb0c88baf config-grsec.x86 -fb3d8067be53c3fa056a0c260997715e4902a2d3c96d6d459052fd221b7d96f2 config-grsec.x86_64 +9e752142a7f32eaf7a71a7b9e03f930e3a8c84109a3e90a7bf59fc9860c78b5c config-grsec.x86 +a81e65a4f703d1111a540ef4a4a6eae13a4fa91ee0c711b2986d143a4f4bf4de config-grsec.x86_64 d975df937d5a82b48bba790bd50bf7ed04782d92755a6eeacedc9e2796633e7a config-grsec.armhf 4f31314b11df0a3881aa44f29ac87dddd36974303a0ccf919e50e1ffa971edd3 config-virtgrsec.x86 7cc143f2061b65c835683f19fddaef4ef046f39bb17e4ba3bd8bc7b8245fae60 config-virtgrsec.x86_64" @@ -241,9 +238,8 @@ c4ab325bb4d49bc3fd12d55bb3c98aecdcd165aee6146afe4548607188bcb4f3ca18c8bf0c6f77fd 410fe7dae27cb4998d17a441a5b2a19dd350636ead2de97d4ef5317501d9e82e2550bfca0f022c9be6296907c076c381e1e13060d1900ff26ee7d47f234fb104 fix-spi-nor-namespace-clash.patch 9980eb10f529bc5ce482ab0a0037febbc982b528c3e4d02fc4547e6dd45dc529a7b1711d0c89f942b1ae27842c3794b68a6b8959ef80f6fd00183d3a591cea07 imx6q-no-unclocked-sleep.patch edcebc229956a05621ec1c89039b56aa61b468c74b54420ff72bd08658b65d29d6af385a7d78d1ce4b39889b407106b99efe7309f8a82974a74eb9edb9e89b64 gcc6.patch -e0ce6bee9bca8bc6486df3f88e38c3177983be176249146e7e1135ef322e25357b12cbe67bf8cec9bab88911ec866a100b2e623337175bdeb94ea05fa14bd714 gcc-default-pie.patch -04c978fa501987176486d1ac7a16a01468c060ce134e779ce7fa3145d2e994bc8ab431d51c154f717897dd8c989954a66076dded8d628c633832bcd42cce172a config-grsec.x86 -3fbbe5f0bb599dd7418b545dcce29115e71b16b8d2ef60c1e27161392e2ebe73ed62570d28a7c65fb8c1ab7368ccb56fb9b536c8074a90f96a9593053e884c4c config-grsec.x86_64 +bdda2a1d8dc9868f594cb1eff52bc5b0eb39bb02e682bbecbc19daed2dd49243d0cf57ef138c951b604ea9fc23fdf48e0264bb256b81c182b23b779c52d2fa7a config-grsec.x86 +a546c6a05c507eec1c8bf0d9cada7f7572e6c8a58e4d0e245a25753a3e30eda6ab4bf00565892173402d575af81b5ca0845805ff59e4482541d6f189078f68ed config-grsec.x86_64 a19b8179cce90e5cfe0ee30c85c0e9fd67274290d7556a5f2cb530ba9ee5f6e941ff96f20cebbd0223f3febfe8b0e3f30c7c2696dd9184c1d3ca9dcb0eca6f4a config-grsec.armhf c07523775446c6cac6e2c8bd740d2647cf099a4b11aae0787259ccdf667571832185781257534657039773d68a21079b25f8e32bd32797bbbffe26d82f634bcb config-virtgrsec.x86 b8c285676251c47e3ca69c5d7075585cc0199408a9567c6da132f8a3b34ec948821a5759e7e7b9a67666df08bf4ef0587f32433dc93387217ceeb832a6c1566a config-virtgrsec.x86_64" diff --git a/main/linux-grsec/config-grsec.x86 b/main/linux-grsec/config-grsec.x86 index 8dc0537464..07d71d52a2 100644 --- a/main/linux-grsec/config-grsec.x86 +++ b/main/linux-grsec/config-grsec.x86 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.34 Kernel Configuration +# Linux/x86 4.4.39 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3477,9 +3477,9 @@ CONFIG_GPIO_PCF857X=m # # MFD GPIO expanders # -# CONFIG_GPIO_CS5535 is not set +CONFIG_GPIO_CS5535=m CONFIG_GPIO_JANZ_TTL=m -# CONFIG_GPIO_UCB1400 is not set +CONFIG_GPIO_UCB1400=m # # PCI GPIO expanders @@ -4648,6 +4648,7 @@ CONFIG_BACKLIGHT_PCF50633=m # CONFIG_BACKLIGHT_LM3630A is not set # CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_OT200 is not set # CONFIG_BACKLIGHT_GPIO is not set # CONFIG_BACKLIGHT_LV5207LP is not set # CONFIG_BACKLIGHT_BD6107 is not set diff --git a/main/linux-grsec/config-grsec.x86_64 b/main/linux-grsec/config-grsec.x86_64 index 9dba153d90..64f7838a9a 100644 --- a/main/linux-grsec/config-grsec.x86_64 +++ b/main/linux-grsec/config-grsec.x86_64 @@ -3421,7 +3421,7 @@ CONFIG_GPIO_PCF857X=m # MFD GPIO expanders # CONFIG_GPIO_JANZ_TTL=m -# CONFIG_GPIO_UCB1400 is not set +CONFIG_GPIO_UCB1400=m # # PCI GPIO expanders diff --git a/main/linux-grsec/gcc-default-pie.patch b/main/linux-grsec/gcc-default-pie.patch deleted file mode 100644 index 7e45da65b2..0000000000 --- a/main/linux-grsec/gcc-default-pie.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-4.4/Makefile.orig 2016-11-24 14:37:19.135375272 +0200 -+++ linux-4.4/Makefile 2016-11-24 22:14:22.692932731 +0200 -@@ -391,7 +391,7 @@ - -Iinclude \ - $(USERINCLUDE) - --KBUILD_CPPFLAGS := -D__KERNEL__ -+KBUILD_CPPFLAGS := -D__KERNEL__ -fno-pie - - KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common \ |