[ppp/f16] Fixed ppp-2.4.5-eaptls-mppe-0.99.patch, #817011

[Michal Sekletar]

commit 4d0eb5ddc04f1df1fff41231e0f53caba3cf897f
Author: Michal Sekletar <msekleta at redhat.com>
Date:   Tue May 29 13:05:45 2012 +0200

    Fixed ppp-2.4.5-eaptls-mppe-0.99.patch, #817011
    
    Added definition of global variable, function pointer (eaptls_check_hook)

 ppp-2.4.5-eaptls-mppe-0.99.patch |    3 ++-
 ppp.spec                         |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ppp-2.4.5-eaptls-mppe-0.99.patch b/ppp-2.4.5-eaptls-mppe-0.99.patch
index 04d6b26..e0f78d4 100644
--- a/ppp-2.4.5-eaptls-mppe-0.99.patch
+++ b/ppp-2.4.5-eaptls-mppe-0.99.patch
@@ -283,13 +283,14 @@ diff -Naur ppp-2.4.5/pppd/auth.c ppp-2.4.5-eaptls-mppe-0.99/pppd/auth.c
  #ifdef CBCP_SUPPORT
  #include "cbcp.h"
  #endif
-@@ -183,6 +186,11 @@
+@@ -183,6 +186,12 @@
  /* Hook for a plugin to get the CHAP password for authenticating us */
  int (*chap_passwd_hook) __P((char *user, char *passwd)) = NULL;
  
 +#ifdef USE_EAPTLS
 +/* Hook for a plugin to get the EAP-TLS password for authenticating us */
 +int (*eaptls_passwd_hook) __P((char *user, char *passwd)) = NULL;
+++int (*eaptls_check_hook) __P((void)) = NULL;
 +#endif
 +
  /* Hook for a plugin to say whether it is OK if the peer
diff --git a/ppp.spec b/ppp.spec
index 64cf21c..7872663 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,7 +1,7 @@
 Summary: The Point-to-Point Protocol daemon
 Name: ppp
 Version: 2.4.5
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -58,7 +58,6 @@ This package contains the header files for building plugins for ppp.
 %patch0 -p1 -b .make
 %patch1 -p1 -b .sample
 # patch 2 depends on the -lutil in patch 0
-%patch2 -p1 -b .libutil
 %patch3 -p1 -b .varargs
 # patch 4 depends on the -lutil in patch 0
 %patch4 -p1 -b .lib64
@@ -159,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Tue May 29 2012 Michal Sekletar <msekleta at redhat.com>
+- Resolves: #817011 - fixed ppp-2.4.5-eaptls-mppe-0.99 patch, added variable definition
+
 * Mon May 21 2012 Michal Sekletar <msekleta at redhat.com>
 - Resolves: #817013 - fixed support for multilink channels in pppol2tp plugin