diff options
Diffstat (limited to 'kernels')
-rwxr-xr-x | kernels/linux-libre-grsec/PKGBUILD | 26 | ||||
-rwxr-xr-x | kernels/linux-libre-grsec/linux-libre-grsec.install | 2 | ||||
-rwxr-xr-x | kernels/linux-libre-lts-grsec/PKGBUILD | 18 | ||||
-rwxr-xr-x | kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install | 4 | ||||
-rw-r--r-- | kernels/paxutils/PKGBUILD | 6 | ||||
-rwxr-xr-x | kernels/paxutils/paxutils | 26 |
6 files changed, 40 insertions, 42 deletions
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index d586f77f7..873b96b91 100755 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -9,12 +9,12 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=8 +_sublevel=9 _grsecver=2.9.1 -_timestamp=201212011309 +_timestamp=201212061820 pkgver=${_basekernel}.${_sublevel} pkgrel=3 -_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,13 +31,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - #'module-symbol-waiting-3.6.patch' - #'module-init-wait-3.6.patch' - #'irq_cfg_pointer-3.6.6.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '3f4d630f49a12079598a3601dd2adb24' - '404f94ed95983191b673f3462715bd64' + '2127e118d09154c7a44dd2dfed2cfecd' + '5a7ac3d736bda40cd459865a13263e7d' '9b4ec887671d9242eba16be5cba4f9dc' '55695d7853abe483f4db189877fd5e36' '5f66bed97a5c37e48eb2f71b2d354b9a' @@ -45,10 +42,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '8267264d9a8966e57fdacd1fa1fc65c4' '86d3c12bdb77173617d2b9e170522ee0' '9d3c56a4b999c8bfbd4018089a62f662' - #'670931649c60fcb3ef2e0119ed532bd4' - #'8a71abc4224f575008f974a099b5cf6f' - #'4909a0271af4e5f373136b382826717f' - 'acc79d1934fe9710acd9039dcd4e8b30') + '2f3ae0624acb4a4b12ea2c008b964bd2') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -77,14 +71,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" -# # fix module initialisation -# # https://bugs.archlinux.org/task/32122 -# patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch" -# patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch" - -# # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt -# patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install index 4c65c9783..640b32e25 100755 --- a/kernels/linux-libre-grsec/linux-libre-grsec.install +++ b/kernels/linux-libre-grsec/linux-libre-grsec.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-grsec -KERNEL_VERSION=3.6.7-4-LIBRE-GRSEC +KERNEL_VERSION=3.6.9-3-LIBRE-GRSEC _fix_permissions() { /usr/bin/paxutils diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index 9e3ef91ce..e6ea24827 100755 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -10,9 +10,9 @@ pkgbase=linux-libre-lts-grsec # Build stock -LIBRE-LTS-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.2 _grsecver=2.9.1 -_timestamp=201211251859 -pkgver=${_basekernel}.34 -pkgrel=3 +_timestamp=201212061818 +pkgver=${_basekernel}.35 +pkgrel=1 _lxopkgver=${_basekernel}.34 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -20,7 +20,7 @@ license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" "http://grsecurity.net/stable/grsecurity-$_grsecver-$pkgver-$_timestamp.patch" # the main kernel config files 'config.i686' 'config.x86_64' @@ -34,14 +34,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('65c669b6e4888db84a80882461851867' - 'cb77e85201da7df05a1c0609e5c91740' - '31b0af1369d602537bcce58141f37645' + '11cd72c1febacfa98e3c6162fee86ba9' + '27c45c7b29406bea785a8bef77ebfaf2' '9cdc3506425c2f5ca4a05493c0c8dec9' '969fb7ac31e86521d1d854b7d5a3fa18' '243221bb1898f996dcf2020c015f6fd0' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' + '86d3c12bdb77173617d2b9e170522ee0' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' @@ -60,11 +60,11 @@ build() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${_pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi # Add grsecurity patches - patch -Np1 -i $srcdir/grsecurity-$_grsecver-$pkgver-$_timestamp.patch + patch -Np1 -i ${srcdir}/grsecurity-${_grsecver}-${pkgver}-${_timestamp}.patch rm localversion-grsec # Add freedo as boot logo diff --git a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install index 87abae14c..18b408248 100755 --- a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install +++ b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-grsec -KERNEL_VERSION=3.2.34-1-LIBRE-LTS-GRSEC +KERNEL_VERSION=3.2.35-1-LIBRE-LTS-GRSEC # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' @@ -17,7 +17,7 @@ post_install () { fi # compat symlinks for the official kernels only - if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts-rt" ]; then + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts-grsec" ]; then loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then diff --git a/kernels/paxutils/PKGBUILD b/kernels/paxutils/PKGBUILD index 3d6d1e772..66896a32a 100644 --- a/kernels/paxutils/PKGBUILD +++ b/kernels/paxutils/PKGBUILD @@ -3,8 +3,8 @@ pkgname=paxutils pkgdesc='PaX utilities to configure flags for several binaries to work with PaX kernels' -pkgver=0.1.0 -pkgrel=2 +pkgver=0.1.1 +pkgrel=1 arch=(any) url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/paxutils/' license=(GPL2) @@ -13,7 +13,7 @@ replaces=('linux-pax-flags' 'linux-libre-pax-flags') conflicts=('linux-pax-flags' 'linux-libre-pax-flags') provides=('linux-pax-flags' 'linux-libre-pax-flags') source=($pkgname) -sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b) +sha256sums=(a47ebcde9ecb0a5d16825cdca3710ea8ab4fd111abae72216d44e1b0294e043a) build() { return 0 diff --git a/kernels/paxutils/paxutils b/kernels/paxutils/paxutils index 22f5a8171..69662a646 100755 --- a/kernels/paxutils/paxutils +++ b/kernels/paxutils/paxutils @@ -1,14 +1,25 @@ #!/bin/bash -[ "$UID" = "0" ] || { - sudo $0 - exit $! +function usage() { + echo $(basename $0) \[options\] >&2 + echo + echo ' -h This help.' + echo ' -y Do not ask before changes.' + echo + exit 1 } function homedir() { egrep ^$1 /etc/passwd | cut -d: -f 6 } +[ "$1" = '-h' ] && usage + +[ "$UID" = "0" ] || { + sudo $0 $@ + exit $! +} + declare -A perms perms=( @@ -19,6 +30,7 @@ perms=( # MPROTECT and RANDMMAP off ['cPSmXEr']=' /usr/bin/elinks + /usr/bin/gnome-shell /usr/bin/pyrogenesis /usr/lib/iceweasel/iceweasel /usr/lib/iceweasel/plugin-container @@ -148,22 +160,22 @@ echo configuration for the following binaries: for perm in ${!perms[@]}; do for path in ${perms[$perm]}; do - [ -f $path ] && echo " * $path" + [ -f "$path" ] && echo " * $path" done done echo echo Continue writing PaX headers? \[Y/n\] -read a +[ "$1" = '-y' ] && a=y || read a case $a in "Y"|"y"|"") for perm in ${!perms[@]}; do for path in ${perms[$perm]}; do - [ -f $path ] && { + [ -f "$path" ] && { echo $perm $path - paxctl -$perm $path + paxctl -$perm "$path" } done done |