diff options
author | aurelien <tek@localhost.localdomain> | 2012-11-24 09:26:36 +0100 |
---|---|---|
committer | aurelien <tek@localhost.localdomain> | 2012-11-24 09:26:36 +0100 |
commit | ab0be3de19998f413b3b1406f2efb26076abdef7 (patch) | |
tree | 56ff4526a8cb5457513710efd5a660132cababf3 | |
parent | 0a9a064dde6943f5ce78d9eb03f403326cd5b4ef (diff) | |
parent | 4591321353c89b7069c32cd0f83b36c6d825ddcc (diff) |
Merge http://projects.parabolagnulinux.org/abslibre
-rwxr-xr-x | kernels/linux-libre-grsec/PKGBUILD | 10 | ||||
-rw-r--r-- | kernels/linux-libre-grsec/config.x86_64 | 4 | ||||
-rwxr-xr-x | kernels/linux-libre-grsec/linux-libre-grsec.install | 6 | ||||
-rw-r--r-- | kernels/linux-libre-pax-flags/PKGBUILD | 27 | ||||
-rw-r--r-- | kernels/paxutils/PKGBUILD | 24 | ||||
-rwxr-xr-x | kernels/paxutils/paxutils (renamed from kernels/linux-libre-pax-flags/linux-pax-flags) | 0 | ||||
-rwxr-xr-x | libre/iceape-i18n/PKGBUILD | 50 |
7 files changed, 59 insertions, 62 deletions
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index c22a208d5..c0f1eb2a9 100755 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -11,9 +11,9 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel _basekernel=3.6 _sublevel=7 _grsecver=2.9.1 -_timestamp=201211181105 +_timestamp=201211221000 pkgver=${_basekernel}.${_sublevel} -pkgrel=3 +pkgrel=4 _lxopkgver=${_basekernel}.7 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -37,9 +37,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' 'a4e642180c7d757a642175fe32e4a264' - 'af1f2097a6e26d36801188193d3eb185' + '25ad4a2c727ae5d0fcfe30008a6cce09' '508ce60a46a36c65d847c4759ac5f6c7' - 'ec6b214e3744cc5fb38bcafb0c6218d6' + 'e0df7f5866d6d74ecc339347ac58ea3b' '5f66bed97a5c37e48eb2f71b2d354b9a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -161,7 +161,7 @@ build() { _package() { pkgdesc="The ${pkgbase} kernel and modules with grsecurity/PaX patches" [ "${pkgbase}" = "linux-libre" ] && groups=('base') - depends=('gradm' 'linux-libre-pax-flags' 'coreutils' 'linux-libre-firmware' 'kmod') + depends=('gradm' 'paxutils' 'coreutils' 'linux-libre-firmware' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64 index 281b26f47..c1729bff5 100644 --- a/kernels/linux-libre-grsec/config.x86_64 +++ b/kernels/linux-libre-grsec/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.6.1-2 Kernel Configuration +# Linux/x86_64 3.6.7-4 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -5609,6 +5609,7 @@ CONFIG_PAX_USERCOPY=y # CONFIG_GRKERNSEC_KMEM=y # CONFIG_GRKERNSEC_IO is not set +CONFIG_GRKERNSEC_JIT_HARDEN=y CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y @@ -5690,7 +5691,6 @@ CONFIG_GRKERNSEC_BLACKHOLE=y # Sysctl Support # CONFIG_GRKERNSEC_SYSCTL=y -# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set CONFIG_GRKERNSEC_SYSCTL_ON=y # diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install index ad209388f..4c65c9783 100755 --- a/kernels/linux-libre-grsec/linux-libre-grsec.install +++ b/kernels/linux-libre-grsec/linux-libre-grsec.install @@ -2,14 +2,14 @@ # arg 2: the old package version KERNEL_NAME=-grsec -KERNEL_VERSION=3.6.7-1-LIBRE-GRSEC +KERNEL_VERSION=3.6.7-4-LIBRE-GRSEC _fix_permissions() { - /usr/bin/linux-pax-flags + /usr/bin/paxutils echo echo You can repeat this process after updating or installing affected - echo binaries by running "linux-pax-flags". + echo binaries by running "paxutils". } _add_trusted_group() { diff --git a/kernels/linux-libre-pax-flags/PKGBUILD b/kernels/linux-libre-pax-flags/PKGBUILD deleted file mode 100644 index 102f5ee74..000000000 --- a/kernels/linux-libre-pax-flags/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Contributors: -# henning mueller <henning@orgizm.net> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -_pkgname=linux-pax-flags -pkgname=linux-libre-pax-flags -pkgdesc='Deactivates PaX flags for several libre binaries to work with PaX enabled kernels' -pkgver=1.0.26 -pkgrel=1 -arch=(any) -url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/linux-libre-pax-flags/' -license=(GPL2) -depends=(bash paxctl) -replaces=('linux-pax-flags') -conflicts=('linux-pax-flags') -provides=("linux-pax-flags=$pkgver") -source=($_pkgname) -sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b) - -build() { - return 0 -} - -package() { - install -D -m755 $srcdir/$_pkgname $pkgdir/usr/bin/$_pkgname -} diff --git a/kernels/paxutils/PKGBUILD b/kernels/paxutils/PKGBUILD new file mode 100644 index 000000000..3d6d1e772 --- /dev/null +++ b/kernels/paxutils/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: André Silva <emulatorman@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=paxutils +pkgdesc='PaX utilities to configure flags for several binaries to work with PaX kernels' +pkgver=0.1.0 +pkgrel=2 +arch=(any) +url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/paxutils/' +license=(GPL2) +depends=(bash paxctl) +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) + +build() { + return 0 +} + +package() { + install -D -m755 $srcdir/$pkgname $pkgdir/usr/bin/$pkgname +} diff --git a/kernels/linux-libre-pax-flags/linux-pax-flags b/kernels/paxutils/paxutils index 22f5a8171..22f5a8171 100755 --- a/kernels/linux-libre-pax-flags/linux-pax-flags +++ b/kernels/paxutils/paxutils diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD index 6aaa1aa04..815f0e340 100755 --- a/libre/iceape-i18n/PKGBUILD +++ b/libre/iceape-i18n/PKGBUILD @@ -11,7 +11,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceape -_debver=2.7.10 +_debver=2.7.11 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,7 +22,7 @@ pkgbase=iceape-i18n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -_pkgver=2.7.10 +_pkgver=2.7.11 pkgver=${_debver}.${_debrel} pkgrel=1 @@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('6499aa420d5fa855a3884c657066c443' - 'c4b98806b5a6cce75878bdf0668f5a4a' - 'ac1a19ed29bda42f66e533ca9ee79fac' - '6116bd1b7c51d9414c68e1807d264f35' - '621dc719068050b479ad0fb9060d39e6' - 'b184194c4e69dc00ee9f3b15dee71d92' - '84058513ab8884d0f279aa2990c10327' - '5be7810ca391eb31d26f5ab46c2f8fea' - '58737d11a2c0852d6701549d22f071b6' - 'ac5994cd318ca2692823f91908eee101' - '5a07c756674b24b0b33af1e26a8e59ee' - '9178d335fa9f998f157a2e7f27384b15' - '2e40229a1ef5386574d98b243260f266' - 'ff8c27d6afc9911af03737c23a0eae5d' - '611702c6dd5638154ff8a5c99e909da0' - '217fd6fd1e46eefb524457566f124074' - '09bb4d6d36403f97b923625055767884' - 'cebd80d880c87862d9a8baf97c3c5b7b' - '023750f204d9f0ac89c62987b41532f4' - '0d753213210d92a8f751b3221fe34dad' - '4b180802effa63316c54e5ec904405c7' - '8be48ada576dfd9a37e6b3c0bc55c298' - 'af08b7f96b175c560bba71ab59e1a3dc') +md5sums=('fb27360aff6250e7d483803583a5cd78' + '236c7aacd7e6416a37aff95f7bfa6a80' + 'f17d76128ab529415078cafe63b61d50' + '07a5c72158427db8c5a990be6eb2d036' + 'fddbcf27d00f1f4d92fed197ace8dd1b' + '96eb3291200c44ffdc3ab1d1446f00b7' + '04dec3bee388ae66cd434342ab03074f' + 'bdef8b38501e7d6805b5304ef2bf8425' + '90b5d0ab0ab2eb3b75e5f80cb6d289bb' + '97f940c39b84a90b0e16eaeca4fa7806' + '34644b44381ae1da46f2fa308fd1cf34' + 'a6240664344798568276dd5dbdd27fb2' + '61aedef6a89b400584dde82b5e97ff0f' + 'abe7a9172876b30c4677b1f4c2237fc9' + '60f3c543fbdb72cc12aef8f2369101ff' + 'c002da281c0d0fa357f92edd2b8cd12c' + 'c17ab30f25f05024879afdf85fa4c516' + '250a08a999d6d1d6086ffbd17d60fbb4' + '609ce8793ea0d5465da7195e4d956fef' + '060226599bac5bc8ddb64417ef1a0108' + 'eaa827909690bfa8dfdc621164e23ca8' + '3fb66893b5ea3b959de48ef16fb26c74' + '6f2d77e767efa0b0d4cb56df9ccd0a2f') |