Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Michal Sekletar | abee906a12 | |
Michal Sekletar | 4d0eb5ddc0 | |
Michal Sekletar | eb64d99509 | |
Michal Sekletar | 29305e4277 |
|
@ -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
|
||||
|
@ -400,9 +401,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))
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
diff -up ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux.l2tp-multilink ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux
|
||||
--- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux.l2tp-multilink 2012-05-19 22:27:43.554642987 +0200
|
||||
+++ ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2012-05-19 22:28:08.807407341 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
#CC = gcc
|
||||
-COPTS = -O2 -g
|
||||
+COPTS = -DHAVE_MULTILINK -O2 -g
|
||||
CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
|
||||
LDFLAGS = -shared
|
||||
INSTALL = install
|
14
ppp.spec
14
ppp.spec
|
@ -1,7 +1,7 @@
|
|||
Summary: The Point-to-Point Protocol daemon
|
||||
Name: ppp
|
||||
Version: 2.4.5
|
||||
Release: 18%{?dist}
|
||||
Release: 21%{?dist}
|
||||
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
|
||||
Group: System Environment/Daemons
|
||||
URL: http://www.samba.org/ppp
|
||||
|
@ -32,6 +32,7 @@ Patch28: ppp-2.4.5-ppp_resolv.patch
|
|||
Patch29: ppp-2.4.5-man.patch
|
||||
Patch30: ppp-2.4.5-eth.patch
|
||||
Patch31: ppp-2.4.5-lock.patch
|
||||
Patch32: ppp-2.4.5-l2tp-multilink.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: pam-devel, libpcap-devel, openssl-devel
|
||||
|
@ -57,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
|
||||
|
@ -81,6 +81,7 @@ This package contains the header files for building plugins for ppp.
|
|||
%patch30 -p1 -b .eth
|
||||
# fixes bz#708260 - SELinux is preventing access on the file LCK..ttyUSB3
|
||||
%patch31 -p1 -b .lock
|
||||
%patch32 -p1 -b .l2tp-multilink
|
||||
|
||||
rm -f scripts/*.local
|
||||
rm -f scripts/*.change_resolv_conf
|
||||
|
@ -157,6 +158,15 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc PLUGINS
|
||||
|
||||
%changelog
|
||||
* Tue May 29 2012 Michal Sekletar <msekleta@redhat.com>
|
||||
- Resolves: #817011 - fixed ppp-2.4.5-eaptls-mppe-0.99 patch, added variable definition
|
||||
|
||||
* Mon May 21 2012 Michal Sekletar <msekleta@redhat.com>
|
||||
- Resolves: #817013 - fixed support for multilink channels in pppol2tp plugin
|
||||
|
||||
* Thu May 17 2012 Michal Sekletar <msekleta@redhat.com>
|
||||
- Resolves: #771340 - fixed compilation of pppd without USE_EAPTLS
|
||||
|
||||
* Mon May 30 2011 Jiri Skala <jskala@redhat.com> - 2.4.5-18
|
||||
- fixes #682381 - hardcodes eth0
|
||||
- fixes #708260 - SELinux is preventing access on the file LCK..ttyUSB3
|
||||
|
|
Loading…
Reference in New Issue