From 94ec507e8da40d5c622d6d3cd1f890268b35d87c Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta@redhat.com>
Date: Mon, 11 Aug 2014 14:32:34 +0200
Subject: [PATCH] Rebase to 2.4.7

Includes fix for CVE-2014-3158.

Resolves: #1128716
---
 .gitignore | 1 +
 ppp.spec   | 7 +++++--
 sources    | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f432f90..aa03936 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 ppp-2.4.5.tar.gz
 /ppp-2.4.6.tar.gz
 /ppp-watch.tar.xz
+/ppp-2.4.7.tar.gz
diff --git a/ppp.spec b/ppp.spec
index eb6def4..284d933 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -2,8 +2,8 @@
 
 Summary: The Point-to-Point Protocol daemon
 Name: ppp
-Version: 2.4.6
-Release: 6%{?dist}
+Version: 2.4.7
+Release: 1%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -166,6 +166,9 @@ install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifdo
 %doc PLUGINS
 
 %changelog
+* Mon Aug 11 2014 Michal Sekletar <msekleta@redhat.com> - 2.4.7-1
+- rebase to 2.4.7. Includes fix for CVE-2014-3158 (#1128716)
+
 * Fri Jun 20 2014 Michal Sekletar <msekleta@redhat.com> - 2.4.6-6
 - version 0.997 of EAP-TLS patch
 
diff --git a/sources b/sources
index 21fd763..80f60dc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3434d2cc9327167a0723aaaa8670083b  ppp-2.4.6.tar.gz
-166cdfbce3391746fde60e86752c7bc7  ppp-watch.tar.xz
+78818f40e6d33a1d1de68a1551f6595a  ppp-2.4.7.tar.gz