Updated EAP-TLS patch to v1.101

Resolves: CVE-2018-11574

0028-Fix-logical-expression-in-eap_client_active-macro.patch

@@ -1,27 +0,0 @@
-From fcb95abad72ac043f2e5f5ddcffc42b0783a3c2d Mon Sep 17 00:00:00 2001
-From: Michal Sekletar <msekleta@redhat.com>
-Date: Wed, 10 Dec 2014 12:21:31 +0100
-Subject: [PATCH] Fix logical expression in eap_client_active macro
-
----
- pppd/eap.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/eap.h b/pppd/eap.h
-index 3fa5391..087baad 100644
---- a/pppd/eap.h
-+++ b/pppd/eap.h
-@@ -110,8 +110,8 @@ enum eap_state_code {
- 	"SRP1", "SRP2", "SRP3", "MD5Chall", "Open", "SRP4", "BadAuth"
- 
- #ifdef USE_EAPTLS
--#define	eap_client_active(esp)	((esp)->es_client.ea_state != eapInitial ||\
--				 (esp)->es_client.ea_state != eapPending ||\
-+#define	eap_client_active(esp)	((esp)->es_client.ea_state != eapInitial &&\
-+				 (esp)->es_client.ea_state != eapPending &&\
- 				 (esp)->es_client.ea_state != eapClosed)
- #else
- #define eap_client_active(esp)	((esp)->es_client.ea_state == eapListen)
--- 
-1.8.3.1
-

ppp.spec

@@ -3,7 +3,7 @@
 Summary: The Point-to-Point Protocol daemon
 Name: ppp
 Version: 2.4.7
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -38,7 +38,6 @@ Patch0013:      0013-everywhere-O_CLOEXEC-harder.patch
 Patch0014:      0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
 Patch0015:      0015-pppd-move-pppd-database-to-var-run-ppp.patch
 Patch0016:      0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
-Patch0017:      0017-pppd-rebase-EAP-TLS-patch-v0.994.patch
 Patch0018:      0018-scritps-fix-ip-up.local-sample.patch
 Patch0019:      0019-sys-linux-rework-get_first_ethernet.patch
 Patch0020:      0020-pppd-put-lock-files-in-var-lock-ppp.patch
@@ -47,9 +46,7 @@ Patch0022:      0022-build-sys-compile-pppol2tp-with-multilink-support.patch
 Patch0023:      0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
 Patch0024:      0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
 Patch0025:      0025-pppd-install-pppd-binary-using-standard-perms-755.patch
-Patch0026:      0026-Revert-pppd-rebase-EAP-TLS-patch-v0.994.patch
-Patch0027:      0027-pppd-EAP-TLS-patch-v0.997.patch
-Patch0028:      0028-Fix-logical-expression-in-eap_client_active-macro.patch
+Patch0026:      ppp-2.4.7-eaptls-mppe-1.101.patch
 Patch0029:      0029-pppoe-include-netinet-in.h-before-linux-in.h.patch
 
 BuildRequires: pam-devel, libpcap-devel, systemd, systemd-devel, glib2-devel
@@ -170,6 +167,10 @@ install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifdo
 %doc PLUGINS
 
 %changelog
+* Mon Jun 11 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.7-14
+- Updated EAP-TLS patch to v1.101
+  Resolves: CVE-2018-11574
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.7-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild