[arch-commits] Commit in linux-grsec/trunk (0012-fix-saa7134.patch PKGBUILD)

[Daniel Micay]

    Date: Wednesday, July 2, 2014 @ 06:08:28
  Author: thestinger
Revision: 114572

upgpkg: linux-grsec 3.15.3.201407012153-1

Modified:
  linux-grsec/trunk/PKGBUILD
Deleted:
  linux-grsec/trunk/0012-fix-saa7134.patch

------------------------+
 0012-fix-saa7134.patch |   37 -------------------------------------
 PKGBUILD               |   22 ++++++++--------------
 2 files changed, 8 insertions(+), 51 deletions(-)

Deleted: 0012-fix-saa7134.patch
===================================================================
--- 0012-fix-saa7134.patch	2014-07-02 03:33:41 UTC (rev 114571)
+++ 0012-fix-saa7134.patch	2014-07-02 04:08:28 UTC (rev 114572)
@@ -1,37 +0,0 @@
---- a/drivers/media/pci/saa7134/saa7134-video.c	
-+++ a/drivers/media/pci/saa7134/saa7134-video.c	
-@@ -1243,6 +1243,7 @@ static int video_release(struct file *file)
- 		videobuf_streamoff(&dev->cap);
- 		res_free(dev, fh, RESOURCE_VIDEO);
- 		videobuf_mmap_free(&dev->cap);
-+		INIT_LIST_HEAD(&dev->cap.stream);
- 	}
- 	if (dev->cap.read_buf) {
- 		buffer_release(&dev->cap, dev->cap.read_buf);
-@@ -1254,6 +1255,7 @@ static int video_release(struct file *file)
- 		videobuf_stop(&dev->vbi);
- 		res_free(dev, fh, RESOURCE_VBI);
- 		videobuf_mmap_free(&dev->vbi);
-+		INIT_LIST_HEAD(&dev->vbi.stream);
- 	}
- 
- 	/* ts-capture will not work in planar mode, so turn it off Hac: 04.05*/
-@@ -1987,17 +1989,12 @@ int saa7134_streamoff(struct file *file, void *priv,
- 					enum v4l2_buf_type type)
- {
- 	struct saa7134_dev *dev = video_drvdata(file);
--	int err;
- 	int res = saa7134_resource(file);
- 
- 	if (res != RESOURCE_EMPRESS)
- 		pm_qos_remove_request(&dev->qos_request);
- 
--	err = videobuf_streamoff(saa7134_queue(file));
--	if (err < 0)
--		return err;
--	res_free(dev, priv, res);
--	return 0;
-+	return videobuf_streamoff(saa7134_queue(file));
- }
- EXPORT_SYMBOL_GPL(saa7134_streamoff);
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-02 03:33:41 UTC (rev 114571)
+++ PKGBUILD	2014-07-02 04:08:28 UTC (rev 114572)
@@ -5,10 +5,10 @@
 # Contributor: Thomas Dwyer http://tomd.tel
 
 pkgbase=linux-grsec
-_srcname=linux-3.15.2
-_pkgver=3.15.2
+_srcname=linux-3.15
+_pkgver=3.15.3
 _grsecver=3.0
-_timestamp=201406262058
+_timestamp=201407012153
 _grsec_patch="grsecurity-$_grsecver-$_pkgver-$_timestamp.patch"
 pkgver=$_pkgver.$_timestamp
 pkgrel=1
@@ -18,7 +18,7 @@
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("https://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
-        #"https://www.kernel.org/pub/linux/kernel/v3.x/patch-${_pkgver}.xz"
+        "https://www.kernel.org/pub/linux/kernel/v3.x/patch-${_pkgver}.xz"
         "https://grsecurity.net/test/$_grsec_patch"
         "https://grsecurity.net/test/${_grsec_patch}.sig"
         # the main kernel config files
@@ -26,17 +26,16 @@
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'change-default-console-loglevel.patch'
-        '0012-fix-saa7134.patch'
         sysctl.conf
         )
-sha256sums=('66ebc260f5699fe52224b67b60e255345888a3fbd70c6bdbe7d4d84e1046d826'
-            '6dc34077fc1115fd7dac8f3caf61758e7f8959caa0406efd1a3cc2f0b4ea290b'
+sha256sums=('c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794'
+            '82ee661b91246c77d0ef3d9d6d8dcc191d3490cad17cd295a95169059735f295'
+            '753d4983413740ca7d901724e11885462f2876caae6706463987e53b95578c2d'
             'SKIP'
             'e5c7e486a7a579532f0fec8a496d7e4ac2c88f869695809b66427892e74e89da'
             '4e47b02c8bb266f6cc3bb67dd460c7f7ada97a22e378c894bc8d2e664bc8ef55'
             'ca7e718375b3790888756cc0a64a7500cd57dddb9bf7e10a0df22c860d91f74d'
             'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
-            '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18'
             'd4d4ae0b9c510547f47d94582e4ca08a7f12e9baf324181cb54d328027305e31')
 
 _kernelname=${pkgbase#linux}
@@ -45,7 +44,7 @@
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  #patch -p1 -i "${srcdir}/patch-${_pkgver}"
+  patch -p1 -i "${srcdir}/patch-${_pkgver}"
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
@@ -55,11 +54,6 @@
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # fix saa7134 video
-  # https://bugs.archlinux.org/task/39904
-  # https://bugzilla.kernel.org/show_bug.cgi?id=73361
-  patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch"
-
   # Add grsecurity patches
   patch -Np1 -i "$srcdir/$_grsec_patch"
   rm localversion-grsec