Fri Aug 17 00:02:30 UTC 2012

10 files changed, 34 insertions, 40 deletions

diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 065ca3fc0..028899f13 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,7 +9,7 @@ pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 _basekernel=3.0
 _sublevel=40
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=1
+pkgrel=1.2
 _lxopkgver=${_basekernel}.39 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -219,10 +219,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE-LTS}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index 1422f451f..e6cc4238c 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id$
+# $Id: PKGBUILD 142395 2011-11-08 23:03:12Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=linux-libre-manpages
 pkgver=3.1
-pkgrel=1
-pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel."
+pkgrel=1.2
+pkgdesc="Kernel libre hackers manual - Section 9 manpages that comes with the linux-libre kernel"
 arch=('any')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
-replaces=('kernel26-manpages' 'linux-manpages')
-conflicts=('kernel26-manpages' 'linux-manpages')
+replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
+conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
 provides=('kernel26-manpages' 'linux-manpages')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz")
 md5sums=('38703cdbb0b9107e7220bc094c5e36b1')
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 21a5a68d4..012492f94 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,7 +10,7 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.5
-_sublevel=1
+_sublevel=2
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 _lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
@@ -29,13 +29,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'avmfritz-only-few-bytes-are-transfered-on-a-conn.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE
 md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         '67b650dd355fbca16035510df063420b'
+         'b081f37b73c652cbb0d5193174092709'
          '7f0b7950bc9d2a20cdb6b850e6e4eb5a'
          'a796ea383eb136cb38fab0a52b6d2f52'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,7 +42,6 @@ md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         '2afcc001cc178be72e3a19d95f4bd5eb'
          'eb25429666af638b01baa663eca74d08')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
@@ -67,11 +65,6 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # fix avmfritz capi20 functionallity
-  # will be added to 3.5.2
-  # https://bugzilla.kernel.org/show_bug.cgi?id=45271
-  patch -Np1 -i "${srcdir}/avmfritz-only-few-bytes-are-transfered-on-a-conn.patch"
-
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
@@ -213,10 +206,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version"
 
   # move module tree /lib -> /usr/lib
   mv "$pkgdir/lib" "$pkgdir/usr"
@@ -377,7 +370,7 @@ _package-headers() {
 }
 
 _package-docs() {
-  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel"
+  pkgdesc="Kernel libre hackers manual - HTML documentation that comes with the ${pkgbase} kernel"
   provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
   conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
   replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 9d56698c6..dc313170a 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.5.1-1-LIBRE
+KERNEL_VERSION=3.5.2-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'
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index 385790ccd..7a95abd0b 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
 pkgname=parabola-keyring
-pkgver=20120723
+pkgver=20120816
 pkgrel=1
 pkgdesc='Parabola GNU/Linux-libre PGP keyring'
 arch=('any')
@@ -16,5 +16,5 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make PREFIX=/usr DESTDIR=${pkgdir} install
 }
-md5sums=('f9ab13c8c969c3bf136e302a666e32d9'
-         '5c27394f0575ab9fb27bf3ab9cb212e3')
+md5sums=('4163ebfce3ccc32e2398e18c19158fc1'
+         'b4b1b532657eb754ef2e9f7cf4d0a09a')
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 9b86cc51e..5e5b3411f 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -7,8 +7,8 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
 _extramodules=extramodules-3.5-LIBRE
-pkgrel=7
-pkgdesc="Kernel module that emulates SCSI devices"
+pkgrel=7.1
+pkgdesc="Kernel libre module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 588f72271..1758bc305 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-modules-lts' 'virtualbox-libre-parabola-modules-lts')
 pkgver=4.1.18
-pkgrel=4.1
+pkgrel=4.2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -101,7 +101,7 @@ build() {
 }
 
 package_virtualbox-libre-parabola-modules-lts(){
-    pkgdesc="Additions only for Parabola guests (long-term supported kernel modules)"
+    pkgdesc="Additions only for Parabola guests (long-term supported kernel libre modules)"
     license=('GPL')
     install=virtualbox-libre-parabola-modules-lts.install
     depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
@@ -125,7 +125,7 @@ package_virtualbox-libre-parabola-modules-lts(){
 }
 
 package_virtualbox-libre-modules-lts(){
-    pkgdesc="Long-term supported kernel modules for VirtualBox"
+    pkgdesc="Long-term supported kernel libre modules for VirtualBox"
     license=('GPL')
     install=virtualbox-libre-modules-lts.install
     depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
diff --git a/libre/virtualbox-libre-modules/.directory b/libre/virtualbox-libre-modules/.directory
index 7486c78f1..9f6471595 100644
--- a/libre/virtualbox-libre-modules/.directory
+++ b/libre/virtualbox-libre-modules/.directory
@@ -1,2 +1,3 @@
 [Dolphin]
-Timestamp=2012,3,20,12,36,27
+Timestamp=2012,8,16,6,34,39
+Version=3
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index d1b6f5fae..11f78dfab 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,7 +6,7 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules')
 pkgver=4.1.18
-pkgrel=6
+pkgrel=6.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -104,7 +104,7 @@ build() {
 }
 
 package_virtualbox-libre-parabola-modules(){
-    pkgdesc="Additions only for Parabola guests (kernel modules)"
+    pkgdesc="Additions only for Parabola guests (kernel libre modules)"
     license=('GPL')
     install=virtualbox-libre-parabola-modules.install
     depends=('linux-libre>=3.5' 'linux-libre<3.6')
@@ -130,7 +130,7 @@ package_virtualbox-libre-parabola-modules(){
 }
 
 package_virtualbox-libre-modules(){
-    pkgdesc="Kernel modules for VirtualBox"
+    pkgdesc="Kernel libre modules for VirtualBox"
     license=('GPL')
     install=virtualbox-libre-modules.install
     depends=('linux-libre>=3.5' 'linux-libre<3.6')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 80de2315f..f2fa1adba 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-source'
          'virtualbox-libre-parabola-source')
 pkgver=4.1.18
-pkgrel=5
+pkgrel=5.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -84,7 +84,7 @@ package_virtualbox-libre() {
     optdepends=('qt: for VirtualBox GUI'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-libre-sdk: developer kit'
-                'virtualbox-libre-source: host kernel source modules for non-stock kernels'
+                'virtualbox-libre-source: host kernel libre source modules for non-stock kernels'
                 'net-tools: for host-only or bridged networking')
 
     backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
@@ -164,7 +164,7 @@ package_virtualbox-libre() {
 }
 
 package_virtualbox-libre-source() {
-    pkgdesc="VirtualBox kernel modules source"
+    pkgdesc="VirtualBox kernel libre modules source"
     depends=(dkms gcc make)
     replaces=('virtualbox-source')
     conflicts=('virtualbox-source')
@@ -240,7 +240,7 @@ package_virtualbox-libre-parabola-additions(){
 }
 
 package_virtualbox-libre-parabola-source() {
-    pkgdesc='VirtualBox Additions kernel modules source'
+    pkgdesc='VirtualBox Additions kernel libre modules source'
     depends=(dkms gcc make)
     replaces=('virtualbox-archlinux-source')
     conflicts=('virtualbox-archlinux-source')