Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/catalyst-dkms/PKGBUILD
	community-testing/catalyst-dkms/catalyst.install
	community-testing/lxdm/PKGBUILD
	community-testing/lxdm/lxdm-pam
	extra/tdb/PKGBUILD
	extra/usbview/PKGBUILD
	multilib/lib32-libldap/PKGBUILD
	testing/bison/PKGBUILD
	testing/ekiga/PKGBUILD
	testing/evince/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/nautilus/PKGBUILD
	testing/opal/PKGBUILD
	testing/opal/opal-ffmpeg.patch
	testing/openssh/PKGBUILD
	testing/openssh/sshd.service
	testing/openssh/sshd.socket
	testing/openssh/sshdgenkeys.service
	testing/yelp/PKGBUILD

6 files changed, 11 insertions, 11 deletions

diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index c94d23b3d..90bc2061a 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.47
+_kernver=3.0.48
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _pkgver=2012-10-03
 pkgver=20121003
-pkgrel=2
+pkgrel=3
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://linuxwireless.org/'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 65e5e55b0..79a5a3478 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=47
+_sublevel=48
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.46 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.47 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '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'
-         '6ad7f8f5b7230d1425dcb2c0bc336cf8'
+         'f3c64c1baf467178872287842d98008c'
          'aed25ab047e1c0b020a1516c235c6a74'
          '7d37e8ce0f4bd5a957172b12ae742ea0'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '546d9b9893e49bddf13a106f890caf94')
+         '38e4df6e10a2f47243155ccf3313c46f')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 3dc3be117..257356678 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.47-1-LIBRE-LTS
+KERNEL_VERSION=3.0.48-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 0b2250069..539685452 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@ _basekernel=3.6
 _sublevel=3
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -43,7 +43,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '34508a324c3704662e9fc115d07735a3')
+         '656c0ceb21fe98a3d18e35201755efd1')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 18b474d64..fbff59b80 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
 pkgver=0.41
-pkgrel=9.1
+pkgrel=9.2
 pkgdesc="linux-libre-lts modules for ThinkPad's SMAPI functionality"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 3067a780e..238121c0c 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
 pkgver=4.2.2
-pkgrel=1.1
+pkgrel=1.2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')