diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-11-24 20:53:11 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-11-24 20:55:29 +0000 |
| commit | d5dddace1d1fd839cdffc55c9293ecf5aa6a14df (patch) | |
| tree | 85d3e422482c6b18c61bc5024b590bd755e7d7ca | |
| parent | c91bfcffaea05aaccb22ad1d1c80a23dbfb1a2d1 (diff) | |
| download | aports-d5dddace1d1fd839cdffc55c9293ecf5aa6a14df.tar.bz2 aports-d5dddace1d1fd839cdffc55c9293ecf5aa6a14df.tar.xz | |
main/linux-grsec: rebuild with makefile patched for gcc default-pie
otherwise it's non-trivial to build modules. and seems to be the
only sane way to setup flags so that the kbuild tests get it right
for stack protector tests.
| -rw-r--r-- | main/linux-grsec/APKBUILD | 8 | ||||
| -rw-r--r-- | main/linux-grsec/gcc-default-pie.patch | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index b499ea3a88..65e156b278 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -7,7 +7,7 @@ case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=2 +pkgrel=3 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs" @@ -22,6 +22,7 @@ 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 @@ -97,7 +98,7 @@ prepare() { build() { for i in $_flavors; do cd "$srcdir"/build-$i - make CC="${CC:-gcc} -fno-pie" \ + make CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ || return 1 done @@ -216,6 +217,7 @@ d25353e079ebcd14549ae56a4064a125 grsecurity-3.1-4.4.34-201604252206-alpine.patc 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 35d10d9444978dc8009e9da5e33b0f43 config-grsec.armhf @@ -227,6 +229,7 @@ c74069661985a1e053705d3817436617da6dd79a6738b2c7861b73bdee4a876d grsecurity-3.1 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 d975df937d5a82b48bba790bd50bf7ed04782d92755a6eeacedc9e2796633e7a config-grsec.armhf @@ -238,6 +241,7 @@ df146ad827b2a65189f692a2105e40ce8f3d7fb7da9bef8ec55012312deb1a9a319c43df64b49e0b 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 a19b8179cce90e5cfe0ee30c85c0e9fd67274290d7556a5f2cb530ba9ee5f6e941ff96f20cebbd0223f3febfe8b0e3f30c7c2696dd9184c1d3ca9dcb0eca6f4a config-grsec.armhf diff --git a/main/linux-grsec/gcc-default-pie.patch b/main/linux-grsec/gcc-default-pie.patch new file mode 100644 index 0000000000..7e45da65b2 --- /dev/null +++ b/main/linux-grsec/gcc-default-pie.patch @@ -0,0 +1,11 @@ +--- 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 \ |