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

Conflicts:
	community/gri/PKGBUILD
	community/multiget/PKGBUILD
	core/bash/PKGBUILD
	core/grep/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xfce4-screenshooter/PKGBUILD
	extra/xfce4-settings/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/linux-libre/dib0700-fix.patch
	libre/linux-libre/i915-fix-ghost-tv-output.patch
	libre/linux-libre/i915-fix-incorrect-error-message.patch
	libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
	libre/linux-libre/linux-libre.install
	libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch

10 files changed, 55 insertions, 49 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index efce423c7..45e458d5e 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,15 +9,15 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.1
-pkgver=${_basekernel}
-pkgrel=2
+pkgver=${_basekernel}.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz"
-        # "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz"
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2"
         # the main kernel config files
         'config.i686' 'config.x86_64'
@@ -29,14 +29,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
         'i915-fix-incorrect-error-message.patch'
-        'iwlagn-fix-NULL-pointer-dereference.patch'
-        'dib0700-fix.patch'
         'usb-add-reset-resume-quirk-for-several-webcams.patch')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
 
-#  patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
+  patch -Np1 -i "${srcdir}/patch-${_basekernel}-libre-${pkgver}-libre"
 
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
@@ -50,22 +48,11 @@ build() {
   # needed.
   patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
 
-  # In 3.1.0, a DRM_DEBUG message is falsely declared as DRM_ERROR. This
+  # In 3.1.1, a DRM_DEBUG message is falsely declared as DRM_ERROR. This
   # worries users, as this message is displayed even at loglevel 4. Fix
   # this.
   patch -Np1 -i "${srcdir}/i915-fix-incorrect-error-message.patch"
 
-  # iwlagn has a critical bug that hangs the system on 3.1.0. A patch
-  # was posted, but didn't make it into the tree in time.
-  # http://marc.info/?l=linux-wireless&m=131840748927629&w=2
-  # FS#26674
-  patch -Np1 -i "${srcdir}/iwlagn-fix-NULL-pointer-dereference.patch"
-
-  # Fix dib0700 driver
-  # http://git.linuxtv.org/pb/media_tree.git/shortlog/refs/heads/for_v3.0
-  # FS#25939
-  patch -Np1 -i "${srcdir}/dib0700-fix.patch"
-
   # Add the USB_QUIRK_RESET_RESUME for several webcams
   # FS#26528
   patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
@@ -355,17 +342,3 @@ package_linux-libre-docs() {
   # remove a file already in linux package
   rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
 }
-md5sums=('d73df15ab1d36fe3c102755d8f42117f'
-         '8fce130ed65a5958252cb4f35382d4ef'
-         'a7cbd8c216a1f4c6068625c4dc746164'
-         '616e05f7436572a7e83500b5daa7e958'
-         'a8a3843046926eb7ab81312cd438c5c5'
-         '2967cecc3af9f954ccc822fd63dca6ff'
-         '8267264d9a8966e57fdacd1fa1fc65c4'
-         '04b21c79df0a952c22d681dd4f4562df'
-         '9d3c56a4b999c8bfbd4018089a62f662'
-         '980efbecb40b90c224a904dd953e5354'
-         '2344fe139fca123ba6095968ebeb4e67'
-         '7dd579902b9d87d8d7063712ffc3e6aa'
-         '3bacb994ce2995a3e95692cde78c5879'
-         '8c83acd60ed5c33747b01532d90edd64')
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 86fe20b40..43bf1d3c3 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.1.0 Kernel Configuration
+# Linux/i386 3.1.1-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -4281,7 +4281,7 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
@@ -4413,6 +4413,7 @@ CONFIG_USB_TMC=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 4ec38fd52..6011a797a 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.1.0 Kernel Configuration
+# Linux/x86_64 3.1.1-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -4071,7 +4071,7 @@ CONFIG_USB_HIDDEV=y
 #
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
-CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
@@ -4203,6 +4203,7 @@ CONFIG_USB_TMC=m
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
 CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
diff --git a/libre/linux-libre/dib0700-fix.patch b/libre/linux-libre/dib0700-fix.patch
index 44b82b063..48f07e6fd 100644
--- a/libre/linux-libre/dib0700-fix.patch
+++ b/libre/linux-libre/dib0700-fix.patch
@@ -1485,4 +1485,3 @@ index 291b645..b693ed1 100644
  		return 0;
  	}
  
-
diff --git a/libre/linux-libre/i915-fix-ghost-tv-output.patch b/libre/linux-libre/i915-fix-ghost-tv-output.patch
index 71b15f8e5..3b631361a 100644
--- a/libre/linux-libre/i915-fix-ghost-tv-output.patch
+++ b/libre/linux-libre/i915-fix-ghost-tv-output.patch
@@ -24,5 +24,3 @@ index dc83b7a..c8f67bf 100644
  	I915_WRITE(TV_CTL, tv_ctl);
  	I915_WRITE(TV_DAC, tv_dac);
  	POSTING_READ(TV_DAC);
-
-
diff --git a/libre/linux-libre/i915-fix-incorrect-error-message.patch b/libre/linux-libre/i915-fix-incorrect-error-message.patch
index 6ef9a2af5..e1addbb05 100644
--- a/libre/linux-libre/i915-fix-incorrect-error-message.patch
+++ b/libre/linux-libre/i915-fix-incorrect-error-message.patch
@@ -20,5 +20,3 @@ index 04411ad..02d5794 100644
  				temp |= DREF_SUPERSPREAD_SOURCE_ENABLE;
  			}
  		}
-
-
diff --git a/libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch b/libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
index 906f5c776..a53a3a425 100644
--- a/libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
+++ b/libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
@@ -36,5 +36,3 @@ index ca632f9..5004342 100644
  
 -- 
 1.7.1
-
-
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 622d2bde0..772e15b24 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.1.0-3-LIBRE
+KERNEL_VERSION=3.1.2-1-LIBRE
 
 post_install () {
   # updating module dependencies
@@ -45,9 +45,8 @@ post_upgrade() {
 
   if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then
     if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then
-      echo "WARNING: /boot appears to be a seperate partition but is not mounted"
-      echo "         This is most likely not what you want.  Please mount your /boot"
-      echo "         partition and reinstall the kernel unless you are sure this is OK"
+      echo "WARNING: /boot appears to be a seperate partition but is not mounted."
+      echo "         You probably just broke your system. Congratulations."
     fi
   fi
 
diff --git a/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch b/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch
new file mode 100644
index 000000000..79be53afb
--- /dev/null
+++ b/libre/linux-libre/md-raid10-fix-bug-when-activating-a-hot-spare.patch
@@ -0,0 +1,41 @@
+From 7fcc7c8acf0fba44d19a713207af7e58267c1179 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Mon, 31 Oct 2011 12:59:44 +1100
+Subject: md/raid10:  Fix bug when activating a hot-spare.
+
+From: NeilBrown <neilb@suse.de>
+
+commit 7fcc7c8acf0fba44d19a713207af7e58267c1179 upstream.
+
+This is a fairly serious bug in RAID10.
+
+When a RAID10 array is degraded and a hot-spare is activated, the
+spare does not take up the empty slot, but rather replaces the first
+working device.
+This is likely to make the array non-functional.   It would normally
+be possible to recover the data, but that would need care and is not
+guaranteed.
+
+This bug was introduced in commit
+   2bb77736ae5dca0a189829fbb7379d43364a9dac
+which first appeared in 3.1.
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/md/raid10.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/md/raid10.c
++++ b/drivers/md/raid10.c
+@@ -1337,7 +1337,7 @@ static int raid10_add_disk(mddev_t *mdde
+ 		mirror_info_t *p = &conf->mirrors[mirror];
+ 		if (p->recovery_disabled == mddev->recovery_disabled)
+ 			continue;
+-		if (!p->rdev)
++		if (p->rdev)
+ 			continue;
+ 
+ 		disk_stack_limits(mddev->gendisk, rdev->bdev,
+
diff --git a/libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch b/libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
index 81963c20d..9e570dd3f 100644
--- a/libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
+++ b/libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
@@ -97,5 +97,3 @@ index d6a8d82..caa1991 100644
  	/* Logitech Webcam Pro 9000 */
  	{ USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
  
-
-