Merge branch 'master' of vparabola:abslibre

12 files changed, 129 insertions, 41 deletions

diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 292be2408..a1e90b3b6 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -6,23 +6,23 @@
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-pkgver=${_basekernel}.10
+pkgver=${_basekernel}.11
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 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"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
-md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         'fd9713a31ee671a9dec8ad0e65996c84'
+md5sums=('5c7787be882c343e41fb49136ff60aec'
+         'c0ccd5624a61eaae1a00a349e90b5a26'
          '6294513cfa9830d48ad1915ff7053a98'
          'f302c931bd85309da9d9792b4cc96467'
          '04b21c79df0a952c22d681dd4f4562df'
@@ -35,7 +35,7 @@ prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1"
   fi
 
   # Add freedo as boot logo
diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install
index a4f59e9b3..76fa87eb8 100644
--- a/kernels/linux-libre-pae/linux-libre-pae.install
+++ b/kernels/linux-libre-pae/linux-libre-pae.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-pae
-KERNEL_VERSION=3.8.10-1-LIBRE-PAE
+KERNEL_VERSION=3.8.11-1-LIBRE-PAE
 
 # 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'
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 19e0233a8..2d2ba5338 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -6,23 +6,23 @@
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-pkgver=${_basekernel}.10
+pkgver=${_basekernel}.11
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 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"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
         'change-default-console-loglevel.patch')
-md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         'fd9713a31ee671a9dec8ad0e65996c84'
+md5sums=('5c7787be882c343e41fb49136ff60aec'
+         'c0ccd5624a61eaae1a00a349e90b5a26'
          '2708b6f03f827e2c94ecbd050df4286d'
          'b7c2805bb287a644c0a303bf7721e534'
          '04b21c79df0a952c22d681dd4f4562df'
@@ -35,7 +35,7 @@ prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1"
   fi
 
   # Add freedo as boot logo
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 905244477..dbbd5e8fd 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.8.10-1-LIBRE-XEN
+KERNEL_VERSION=3.8.11-1-LIBRE-XEN
 
 # 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'
diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD
new file mode 100644
index 000000000..88960ddba
--- /dev/null
+++ b/libre-testing/libretools/PKGBUILD
@@ -0,0 +1,60 @@
+# Maintainer: Joshua Haase <hahj87@gmail.com
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+
+pkgbase=libretools
+pkgname=(libretools libretools-mips64el)
+pkgdesc="Programs for Parabola development"
+url="https://projects.parabolagnulinux.org/packages/libretools.git/"
+license=('GPL3+' 'GPL2')
+
+pkgver=20130503
+_libretools_commit=0db5eebebe64db0d8c3b29b629b066a3909aa61d
+_devtools_commit=a1a79ff77bb19166bd5631953a71e3d3222e5f1c
+
+pkgrel=1
+arch=('any')
+
+_packages_url=https://projects.parabolagnulinux.org/packages
+source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
+	$_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
+
+build() {
+  cd "$srcdir"
+  ln -sf devtools-par-$_devtools_commit devtools-par
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make build-libretools build-libretools-mips64el build-doc
+}
+
+package_libretools() {
+  backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
+  install=libretools.install
+  groups=(base-devel)
+
+  depends=(
+    arch-install-scripts # `archroot` uses `pacstrap`
+    git # `createworkdir`
+    openssh # `librerelease`
+    rsync # `librerelease` and `makechrootpkg.sh`
+    subversion # `diff-unfree`
+    tokyocabinet # `treepkg`
+    wget # `aur` and `pkgbuild-check-nonfree`
+  )
+  optdepends=('namcap: to check package files')
+  makedepends=(emacs) # emacs --batch is used during the build to process text
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libretools install-doc DESTDIR="$pkgdir"
+}
+
+package_libretools-mips64el() {
+  pkgdesc="Scripts for Parabola development (for mips64el architecture)"
+  backup=('etc/libretools.d/mips64el.conf')
+  depends=("$pkgbase=$pkgver")
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libretools-mips64el DESTDIR="$pkgdir"
+}
+
+md5sums=('dabae9bb6040431e8e2b84871a027237'
+         'c5cd04723119762701db766cb8f6e5ef')
diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install
new file mode 100644
index 000000000..ff6a238fe
--- /dev/null
+++ b/libre-testing/libretools/libretools.install
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+
+# arg 1:  the new package version
+post_install() {
+	if grep -q 'libre::' etc/makepkg.conf; then
+		libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
+	else
+		libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf"
+		printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf
+	fi
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
+		libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
+		sed -i '/libre::/d'
+	else
+		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
+	fi
+}
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD
index efe1c3371..75bcfdc6a 100644
--- a/libre/linux-libre-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.8.10
+_kernver=3.8.11
 _kernrel=1
 pkgname=('linux-libre-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=15
+pkgrel=16
 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -22,7 +22,7 @@ source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_versi
 md5sums=('3a1c7f870ff2fb96534b0d69245a4dab')
 
 
-build() {
+package() {
 	# current extramodules version
 	_extraver=extramodules-3.8-LIBRE
 
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index ec552b834..c8c40e338 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.75
+_kernver=3.0.76
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _version=v3.8-rc7
 _pkgver=3.8-rc7-1-u
 pkgver=3.8rc7.1
-pkgrel=13
+pkgrel=14
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
@@ -22,7 +22,7 @@ source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_versi
 md5sums=('3a1c7f870ff2fb96534b0d69245a4dab')
 
 
-build() {
+package() {
 	# current extramodules version
 	_extraver=extramodules-3.0-LIBRE-LTS
 
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index a4f2d18ee..bb72f209f 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183699 2013-04-27 07:33:10Z tpowa $
+# $Id: PKGBUILD 184141 2013-05-02 15:29:52Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,17 +7,17 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=75
+_sublevel=76
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.74 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.76 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils')
 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"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -30,9 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         'module-symbol-waiting-3.0.patch'
         'module-init-wait-3.0.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '13ae458b95cc12f1fcf7e37e91206cbe'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('f30a562307b6f71204370fcd33756466'
+         'e405de6581d02d44c2c06a81a1d93f93'
          'fe0e9b4415b82f306fc1b63eb9a742a4'
          '69a689019ea0b6ed46b387907f14bc8a'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '8e9b3e526d0d339004e141fddf2390dc')
+         '5b330cc23071e1250b7e0a1613a25952')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -58,7 +58,7 @@ prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1"
   fi
 
   # Add freedo as boot logo
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 9f7b9706d..d4fbc8398 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.75-1-LIBRE-LTS
+KERNEL_VERSION=3.0.76-1-LIBRE-LTS
 
 # 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'
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 67bbcdc5d..2be94b22d 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,17 +10,17 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
-_sublevel=10
+_sublevel=11
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 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"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
@@ -29,9 +29,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
-         'fd9713a31ee671a9dec8ad0e65996c84'
+        "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('5c7787be882c343e41fb49136ff60aec'
+         'c0ccd5624a61eaae1a00a349e90b5a26'
          '9b425f069f920cdd6798b3adab79d3af'
          '9316ebdb21ea9948ae5c83795a3dcf61'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          'f3def2cefdcbb954c21d8505d23cc83c'
-         '259774469ac9b2b1f41cf2f978743055')
+         '8c00187e43a678a1db821974a1c0a39c')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -53,7 +53,7 @@ prepare() {
   cd "${srcdir}/linux-${_basekernel}"
 
   if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1"
   fi
 
   # Add freedo as boot logo
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index fd8297ddf..e34d8347f 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.8.10-1-LIBRE
+KERNEL_VERSION=3.8.11-1-LIBRE
 
 # 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'