- updated to 3.10.5

- remove svcrpc patch - included upstream

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 48bb4ab577ae414e747a6dcd9f463c76bdcbbf24..392d1212b54690cc4ea01e399c80095dce704114 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -46,38 +46,3 @@ index 7a0c800..ec5ebbb 100644
        SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
        dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
  
-commit 8efb88340e29293e05f6b498b60596884c05a8a8
-Author: J. Bruce Fields <bfields@redhat.com>
-Date:   Mon Jul 8 13:44:45 2013 -0400
-
-    svcrpc: fix failures to handle -1 uid's
-    
-    As of f025adf191924e3a75ce80e130afcd2485b53bb8 "sunrpc: Properly decode
-    kuids and kgids in RPC_AUTH_UNIX credentials" any rpc containing a -1
-    (0xffff) uid or gid would fail with a badcred error.
-    
-    Commit afe3c3fd5392b2f0066930abc5dbd3f4b14a0f13 "svcrpc: fix failures to
-    handle -1 uid's and gid's" fixed part of the problem, but overlooked the
-    gid upcall--the kernel can request supplementary gid's for the -1 uid,
-    but mountd's attempt write a response will get -EINVAL.
-    
-    Symptoms were nfsd failing to reply to the first attempt to use a newly
-    negotiated krb5 context.
-    
-    Reported-by: Sven Geggus <lists@fuchsschwanzdomain.de>
-    Tested-by: Sven Geggus <lists@fuchsschwanzdomain.de>
-    Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-
-diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
-index a98853d..621ca7b 100644
---- a/net/sunrpc/svcauth_unix.c
-+++ b/net/sunrpc/svcauth_unix.c
-@@ -493,8 +493,6 @@ static int unix_gid_parse(struct cache_detail *cd,
-       if (rv)
-               return -EINVAL;
-       uid = make_kuid(&init_user_ns, id);
--      if (!uid_valid(uid))
--              return -EINVAL;
-       ug.uid = uid;
- 
-       expiry = get_expiry(&mesg);

diff --git a/kernel.spec b/kernel.spec
index 3c2ee87601e2e35cea55a52dec6d3495894054d7..e9001c95bf910e7c4220932b9ed70a54c04afb7b 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@
 
 %define                rel             0.1
 %define                basever         3.10
-%define                postver         .4
+%define                postver         .5
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -112,7 +112,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  2e46ab138670b3171b52b849568cb42f
+# Patch0-md5:  6366a8d4b0429ab6836c296ba298fb0e
 %endif
 Source1:       kernel.sysconfig