Wed Oct 10 00:43:09 PDT 2012

13 files changed, 77 insertions, 32 deletions

diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 9827d6813..5afccbcfb 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=30
+pkgrel=31
 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
index 1c3cb4f8e..aa71a92ac 100644
--- a/libre/cdfs-libre/cdfs.install
+++ b/libre/cdfs-libre/cdfs.install
@@ -1,14 +1,14 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
new file mode 100644
index 000000000..dd43819fe
--- /dev/null
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Contributor: Márcio Silva <coadde@lavabit.com>
+
+pkgname=linux-libre-firmware
+pkgver=3.6
+pkgrel=1
+pkgdesc='Free Firmware files for Linux-libre'
+arch=('any')
+url='http://linux-libre.fsfla.org/'
+license=('GPL2')
+provides=('linux-firmware=20120625'
+          'kernel26-firmware=2.6.34.99')
+conflicts=('linux-firmware'
+           'linux-firmware-git'
+           'kernel26-firmware'
+           'ar9170-fw'
+           'iwlwifi-1000-ucode'
+           'iwlwifi-3945-ucode'
+           'iwlwifi-4965-ucode'
+           'iwlwifi-5000-ucode'
+           'iwlwifi-5150-ucode'
+           'iwlwifi-6000-ucode'
+           'rt2870usb-fw'
+           'rt2x00-rt61-fw'
+           'rt2x00-rt71w-fw')
+replaces=('linux-firmware'
+          'kernel26-firmware'
+          'ar9170-fw'
+          'iwlwifi-1000-ucode'
+          'iwlwifi-3945-ucode'
+          'iwlwifi-4965-ucode'
+          'iwlwifi-5000-ucode'
+          'iwlwifi-5150-ucode'
+          'iwlwifi-6000-ucode'
+          'rt2870usb-fw'
+          'rt2x00-rt61-fw'
+          'rt2x00-rt71w-fw')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
+md5sums=('a2312edd0265b5b07bd4b50afae2b380')
+
+package() {
+  cd $srcdir/linux-$pkgver
+  
+  make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
+
+  # move WHENCE file to linux-libre-firmware license folder
+  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+  mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
+}
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index ec283afce..4feb1ac6f 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -154,7 +154,7 @@ build() {
 _package() {
   pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
-  depends=('coreutils' 'kmod')
+  depends=('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/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index bf8eb577a..61ba504a7 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -29,9 +29,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'alsa-powersave-3.5.x.patch'
-        'watchdog-3.5.x.patch'
-        'i915-i2c-crash-3.5.x.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          '62d272c8ec79bd2eb9cc56001aaf1042'
@@ -143,7 +140,7 @@ build() {
 _package() {
   pkgdesc="The ${pkgbase} kernel and modules"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
-  depends=('coreutils' 'kmod')
+  depends=('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/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index e8f6ff5a1..d4d91c412 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,14 +6,14 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=30
+pkgrel=31
 epoch=1
-_extramodules=extramodules-3.5-LIBRE
+_extramodules=extramodules-3.6-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.5' 'linux-libre-headers<3.6' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
@@ -56,7 +56,7 @@ build() {
 
 package_lirc-libre() {
   pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre"
-  depends=('lirc-utils-libre' 'linux-libre>=3.4' 'linux-libre<3.5')
+  depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index b39282da6..976f5ab8a 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.5-LIBRE
+EXTRAMODULES=extramodules-3.6-LIBRE
 
 post_install() {
   # updating module dependencies
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 19d1b8908..4c8910c2b 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,13 +11,13 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=11
+pkgrel=9
 pkgdesc="Modules for ThinkPad's SMAPI functionality"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-depends=('linux-libre>=3.5' 'linux-libre<3.6')
-makedepends=('linux-libre-headers>=3.5' 'linux-libre-headers<3.6')
+depends=('linux-libre>=3.6' 'linux-libre<3.7')
+makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 5fe1bab90..3662e7f34 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.5-ARCH
+extramodules=/usr/lib/modules/extramodules-3.6-ARCH
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 6448d0a4e..f35ba99c9 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -2,17 +2,18 @@
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
-_extramodules=extramodules-3.5-LIBRE
-pkgrel=11
+_extramodules=extramodules-3.6-LIBRE
+pkgrel=12
 pkgdesc="Kernel libre module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.5' 'linux-libre<3.6')
+depends=('linux-libre>=3.6' 'linux-libre<3.7')
 makedepends=('linux-libre-headers')
 options=(!makeflags)
 install=$_pkgname.install
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index b2a49a261..8bd740943 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
 _updatemod() {
   echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 270e14af9..3bd4616eb 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.0
-pkgrel=5.3
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -32,15 +32,14 @@ build() {
 
 package_virtualbox-libre-host-modules(){
   pkgdesc='Host kernel libre modules for VirtualBox'
-  depends=('linux-libre>=3.5' 'linux-libre<3.6')
+  depends=('linux-libre>=3.6' 'linux-libre<3.7')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   install=virtualbox-libre-host-modules.install
 
   _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  #_extraver=extramodules-${_kernver%.*}-LIBRE
-  _extraver=extramodules-3.5-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
@@ -52,15 +51,14 @@ package_virtualbox-libre-host-modules(){
 package_virtualbox-libre-guest-modules(){
   pkgdesc='Guest kernel libre modules for VirtualBox'
   license=('GPL')
-  depends=('linux-libre>=3.5' 'linux-libre<3.6')
+  depends=('linux-libre>=3.6' 'linux-libre<3.7')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   install=virtualbox-libre-guest-modules.install
 
   _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  #_extraver=extramodules-${_kernver%.*}-LIBRE
-  _extraver=extramodules-3.5-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index c3419c991..caf59aa13 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.6-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.6-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.6-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }