3.14.16-100.fc19.gnu

5 files changed, 15 insertions, 72 deletions

diff --git a/freed-ora/current/f19/kernel.spec b/freed-ora/current/f19/kernel.spec
index 7ca2760d7..f2dd54ea6 100644
--- a/freed-ora/current/f19/kernel.spec
+++ b/freed-ora/current/f19/kernel.spec
@@ -112,7 +112,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 15
+%define stable_update 16
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -820,9 +820,6 @@ Patch25109: revert-input-wacom-testing-result-shows-get_report-is-unnecessary.pa
 Patch25110: 0001-ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch
 Patch25111: 0002-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
 
-#CVE-2014-4943 rhbz 1119458 1120542
-Patch25115: net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch
-
 #rhbz 1117942
 Patch25118: sched-fix-sched_setparam-policy-1-logic.patch
 
@@ -1592,9 +1589,6 @@ ApplyPatch revert-input-wacom-testing-result-shows-get_report-is-unnecessary.pat
 ApplyPatch 0001-ideapad-laptop-Blacklist-rfkill-control-on-the-Lenov.patch
 ApplyPatch 0002-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
 
-#CVE-2014-4943 rhbz 1119458 1120542
-ApplyPatch net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch
-
 #rhbz 1117942
 ApplyPatch sched-fix-sched_setparam-policy-1-logic.patch
 
@@ -2424,6 +2418,12 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 11 2014 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 3.14.16-gnu.
+
+* Mon Aug 11 2014 Justin M. Forbes <jforbes@fedoraproject.org> - 3.14.16-100
+- Linux v3.14.16
+
 * Fri Aug  1 2014 Alexandre Oliva <lxoliva@fsfla.org> -libre
 - GNU Linux-libre 3.14.15-gnu.
 
diff --git a/freed-ora/current/f19/net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch b/freed-ora/current/f19/net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch
deleted file mode 100644
index 141048a36..000000000
--- a/freed-ora/current/f19/net-l2tp-don-t-fall-back-on-UDP-get-set-sockopt.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Bugzilla: 1120542
-Upstream-status: 3.16 and CC'd to stable
-
-From 3cf521f7dc87c031617fd47e4b7aa2593c2f3daf Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sasha.levin@oracle.com>
-Date: Mon, 14 Jul 2014 17:02:31 -0700
-Subject: [PATCH] net/l2tp: don't fall back on UDP [get|set]sockopt
-
-The l2tp [get|set]sockopt() code has fallen back to the UDP functions
-for socket option levels != SOL_PPPOL2TP since day one, but that has
-never actually worked, since the l2tp socket isn't an inet socket.
-
-As David Miller points out:
-
-  "If we wanted this to work, it'd have to look up the tunnel and then
-   use tunnel->sk, but I wonder how useful that would be"
-
-Since this can never have worked so nobody could possibly have depended
-on that functionality, just remove the broken code and return -EINVAL.
-
-Reported-by: Sasha Levin <sasha.levin@oracle.com>
-Acked-by: James Chapman <jchapman@katalix.com>
-Acked-by: David Miller <davem@davemloft.net>
-Cc: Phil Turnbull <phil.turnbull@oracle.com>
-Cc: Vegard Nossum <vegard.nossum@oracle.com>
-Cc: Willy Tarreau <w@1wt.eu>
-Cc: stable@vger.kernel.org
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- net/l2tp/l2tp_ppp.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
-index 950909f04ee6..13752d96275e 100644
---- a/net/l2tp/l2tp_ppp.c
-+++ b/net/l2tp/l2tp_ppp.c
-@@ -1365,7 +1365,7 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname,
- 	int err;
- 
- 	if (level != SOL_PPPOL2TP)
--		return udp_prot.setsockopt(sk, level, optname, optval, optlen);
-+		return -EINVAL;
- 
- 	if (optlen < sizeof(int))
- 		return -EINVAL;
-@@ -1491,7 +1491,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,
- 	struct pppol2tp_session *ps;
- 
- 	if (level != SOL_PPPOL2TP)
--		return udp_prot.getsockopt(sk, level, optname, optval, optlen);
-+		return -EINVAL;
- 
- 	if (get_user(len, optlen))
- 		return -EFAULT;
--- 
-1.9.3
-
diff --git a/freed-ora/current/f19/patch-3.14-gnu-3.14.15-gnu.xz.sign b/freed-ora/current/f19/patch-3.14-gnu-3.14.15-gnu.xz.sign
deleted file mode 100644
index 2e51d9a34..000000000
--- a/freed-ora/current/f19/patch-3.14-gnu-3.14.15-gnu.xz.sign
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEABECAAYFAlPbdfsACgkQvLfPh359R6dSqQCgh4F5iALbkNbwgOsVovBCXbJL
-R34AoKd30duyOYa4Wby5fySCkREjBvjH
-=JWhB
------END PGP SIGNATURE-----
diff --git a/freed-ora/current/f19/patch-3.14-gnu-3.14.16-gnu.xz.sign b/freed-ora/current/f19/patch-3.14-gnu-3.14.16-gnu.xz.sign
new file mode 100644
index 000000000..88349b42c
--- /dev/null
+++ b/freed-ora/current/f19/patch-3.14-gnu-3.14.16-gnu.xz.sign
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEABECAAYFAlPkXAAACgkQvLfPh359R6fSvQCgml8vIcuLI+T5Pg45OMLIfXTX
+PFYAoKwvja8ZKsRWiKR/1jEwAP7PWFi0
+=EwLM
+-----END PGP SIGNATURE-----
diff --git a/freed-ora/current/f19/sources b/freed-ora/current/f19/sources
index af2089866..582391ccf 100644
--- a/freed-ora/current/f19/sources
+++ b/freed-ora/current/f19/sources
@@ -1,2 +1,2 @@
 c108ec52eeb2a9b9ddbb8d12496ff25f  linux-libre-3.14-gnu.tar.xz
-e3984cb1836de29af950a15c79aafbbc  patch-3.14-gnu-3.14.15-gnu.xz
+a29c790d888e679aaf348a9f7ec6b1a6  patch-3.14-gnu-3.14.16-gnu.xz