From 29305e42779f27559140fc473e9520fb51eb1b69 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Thu, 17 May 2012 16:11:58 +0200 Subject: [PATCH] Fixed compilation of pppd without USE_EAPTLS --- ppp-2.4.5-eaptls-mppe-0.99.patch | 4 ++-- ppp.spec | 5 ++++- 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 eb6c2a6..04d6b26 100644 --- a/ppp-2.4.5-eaptls-mppe-0.99.patch +++ b/ppp-2.4.5-eaptls-mppe-0.99.patch @@ -400,9 +400,9 @@ diff -Naur ppp-2.4.5/pppd/auth.c ppp-2.4.5-eaptls-mppe-0.99/pppd/auth.c - have_srp_secret(user, (explicit_remote? remote_name: NULL), 0, NULL)); + have_srp_secret(user, (explicit_remote? remote_name: NULL), 0, NULL) +#ifdef USE_EAPTLS -+ || have_eaptls_secret_client(user, (explicit_remote? remote_name: NULL))) ++ || have_eaptls_secret_client(user, (explicit_remote? remote_name: NULL)) +#endif -+ ; ++ ); hadchap = -1; if (go->neg_upap && !uselogin && !have_pap_secret(NULL)) diff --git a/ppp.spec b/ppp.spec index 0883d25..1d62753 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: 18%{?dist} +Release: 19%{?dist} License: BSD and LGPLv2+ and GPLv2+ and Public Domain Group: System Environment/Daemons URL: http://www.samba.org/ppp @@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %doc PLUGINS %changelog +* Thu May 17 2012 Michal Sekletar +- Resolves: #771340 - fixed compilation of pppd without USE_EAPTLS + * Mon May 30 2011 Jiri Skala - 2.4.5-18 - fixes #682381 - hardcodes eth0 - fixes #708260 - SELinux is preventing access on the file LCK..ttyUSB3