Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

8 files changed, 58 insertions, 32 deletions

diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
index 935584aa1..80c94c16b 100644
--- a/libre/icecat-adblock-plus/PKGBUILD
+++ b/libre/icecat-adblock-plus/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 110697 2014-05-05 09:47:45Z spupykin $
+# $Id: PKGBUILD 112006 2014-05-28 09:45:57Z spupykin $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=icecat-adblock-plus
-pkgver=2.6
-_addons_file=254870
+pkgver=2.6.1
 pkgrel=1
 pkgdesc="plugin for icecat which block ads and banners"
 arch=('any')
@@ -12,21 +11,17 @@ license=('GPL')
 depends=("icecat")
 makedepends=('unzip')
 provides=(firefox-adblock-plus=$pkgver)
-noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi")
-source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi)
-md5sums=('fa3ccbbd5f9ea6718fbb8cfbb321e556')
+noextract=("adblockplus-$pkgver.xpi")
+source=("https://downloads.adblockplus.org/adblockplus-$pkgver.xpi")
+md5sums=('ad8c04f09515c92c948d384ddd3f6604')
 
 package() {
-#  _ffver=`pacman -Q firefox | cut -f2 -d\ | cut -f1-2 -d.`
-#  depends=("icecat>=${_ffver}" "icecat<=${_ffver/0/99}")
-
   cd $srcdir
-  [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi
+  unzip adblockplus-$pkgver.xpi
   local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
   local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid}
   [ -n ${emid} ] || return 1
   install -d $dstdir
-#  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf
   cp -R * $dstdir
   rm $dstdir/*.xpi
   find $pkgdir -type d -exec chmod 0755 {} \;
diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
index 3b2077b2a..c4505269b 100644
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ b/libre/iceweasel-adblock-plus/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 110697 2014-05-05 09:47:45Z spupykin $
+# $Id: PKGBUILD 112006 2014-05-28 09:45:57Z spupykin $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=iceweasel-adblock-plus
-pkgver=2.6
-_addons_file=254870
+pkgver=2.6.1
 pkgrel=1
 pkgdesc="plugin for iceweasel which block ads and banners"
 arch=('any')
@@ -12,21 +11,17 @@ license=('GPL')
 depends=("iceweasel-libre")
 makedepends=('unzip')
 provides=(firefox-adblock-plus=$pkgver)
-noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi")
-source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi)
-md5sums=('fa3ccbbd5f9ea6718fbb8cfbb321e556')
+noextract=("adblockplus-$pkgver.xpi")
+source=("https://downloads.adblockplus.org/adblockplus-$pkgver.xpi")
+md5sums=('ad8c04f09515c92c948d384ddd3f6604')
 
 package() {
-#  _ffver=`pacman -Q firefox | cut -f2 -d\ | cut -f1-2 -d.`
-#  depends=("iceweasel-libre>=${_ffver}" "iceweasel-libre<=${_ffver/0/99}")
-
   cd $srcdir
-  [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi
+  unzip adblockplus-$pkgver.xpi
   local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
   local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid}
   [ -n ${emid} ] || return 1
   install -d $dstdir
-#  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf
   cp -R * $dstdir
   rm $dstdir/*.xpi
   find $pkgdir -type d -exec chmod 0755 {} \;
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 5e0aa6eeb..582efe043 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -14,7 +14,7 @@ pkgbase=linux-libre-grsec   # Build stock -LIBRE-GRSEC kernel
 _basekernel=3.14
 _sublevel=4
 _grsecver=3.0
-_timestamp=201405271114
+_timestamp=201405281922
 _pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}.${_sublevel}.${_timestamp}
 pkgrel=1
@@ -51,10 +51,10 @@ 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.xz")
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815'
-            '76daa7e437ab5fedc51c1fec3a84b7e6901a073b083a94e3a55671bca9e67d34'
+            '5b1a2efe49736d3b0417f3b76df779de4166fe5890489491e1d0b99fed653b57'
             'SKIP'
-            'ffba30739752c6bba5ce0cf33d82748f0c35c3642ac3ca45ad3b99bf85dbb1fc'
-            '3cfcfcdb946be20cb651b331859bdd2e59947e711f690605d730ff7b75a17fc4'
+            'a82a5b673dae3f1aa8124e91c485cb8648623d560b7543da63fffab2606443d6'
+            '51e86aeeb4fadbb2ead2b4af115f0bfd04afb83c9959856e3495d704cec55db6'
             '9d2f34f1a8c514a7117b9b017a1f7312fb351f4d0b079eed102f89361534d486'
             'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b'
             '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9'
diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686
index fdf8e2d25..99ccdb5bf 100644
--- a/libre/linux-libre-grsec/config.i686
+++ b/libre/linux-libre-grsec/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.4.201405271114-1 Kernel Configuration
+# Linux/x86 3.14.4.201405281922-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -6221,7 +6221,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_DEBUG_SHIRQ is not set
 
diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64
index a1afbacc7..2e13102ee 100644
--- a/libre/linux-libre-grsec/config.x86_64
+++ b/libre/linux-libre-grsec/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.14.4.201405271114-1 Kernel Configuration
+# Linux/x86 3.14.4.201405281922-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -6002,7 +6002,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_DEBUG_SHIRQ is not set
 
diff --git a/libre/paxd-libre/10-enable-pax.conf b/libre/paxd-libre/10-enable-pax.conf
new file mode 100644
index 000000000..77e51d87c
--- /dev/null
+++ b/libre/paxd-libre/10-enable-pax.conf
@@ -0,0 +1,2 @@
+# Disable PaX soft mode (set earlier by 05-grsecurity.conf)
+kernel.pax.softmode = 0
diff --git a/libre/paxd-libre/PKGBUILD b/libre/paxd-libre/PKGBUILD
new file mode 100644
index 000000000..f4f9cda1f
--- /dev/null
+++ b/libre/paxd-libre/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer (Arch): Daniel Micay <danielmicay@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Gaming4JC <gaming4jc2@yahoo.com>
+
+_pkgname=paxd
+pkgname=paxd-libre
+pkgver=1.0.1.0
+pkgrel=1
+pkgdesc='PaX exception daemon (a libre fork of paxd)'
+arch=(i686 x86_64)
+url='https://github.com/g4jc/paxd-libre/'
+license=(MIT)
+replaces=($_pkgname linux-pax-flags)
+conflicts=($_pkgname linux-pax-flags)
+provides=($_pkgname linux-pax-flags)
+depends=(glibc)
+makedepends=(git)
+source=(git://github.com/g4jc/paxd-libre#tag=$pkgver 10-enable-pax.conf)
+md5sums=('SKIP'
+         'a40677d2cd39ada4c2560927c67e0ea2')
+backup=(etc/paxd-libre.conf)
+
+build() {
+  cd $pkgname
+  make CC=gcc
+}
+
+package() {
+  cd $pkgname
+  mkdir -p "$pkgdir/usr/lib/systemd/system/sysinit.target.wants"
+  make PREFIX=/usr DESTDIR="$pkgdir" install
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 ../10-enable-pax.conf "$pkgdir/etc/sysctl.d/10-enable-pax.conf"
+}
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD
index 3f6f01b6b..f26e026c3 100644
--- a/libre/vim-runtime/PKGBUILD
+++ b/libre/vim-runtime/PKGBUILD
@@ -12,7 +12,7 @@ _patchlevel=307
 __hgrev=54d96e3b2eec
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:vim')
 url="http://www.vim.org"
@@ -69,7 +69,7 @@ package_vim-runtime() {
 
   make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
 
-  # delete binaries and manuals files
+  # delete binaries and manual files
   rm -vr "${pkgdir}"/usr/bin
   rm -vr "${pkgdir}"/usr/share/man