rpms/ppp/devel ppp-2.4.5-ppp_resolv.patch, NONE, 1.1 ppp-2.4.5-eaptls-mppe-0.98.patch, 1.1, 1.2 ppp.spec, 1.63, 1.64

Jiri Skala jskala at fedoraproject.org
Tue Jul 13 08:48:46 UTC 2010


Author: jskala

Update of /cvs/extras/rpms/ppp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12203

Modified Files:
	ppp-2.4.5-eaptls-mppe-0.98.patch ppp.spec 
Added Files:
	ppp-2.4.5-ppp_resolv.patch 
Log Message:
* Tue Jul 13 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-10
- fixes #613717 - Missing line in example script ip-up.local.add
- removed /usr/kerberos/include from eaptls patch


ppp-2.4.5-ppp_resolv.patch:
 ip-up.local.add |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE ppp-2.4.5-ppp_resolv.patch ---
diff -up ppp-2.4.5/scripts/ip-up.local.add.ppp_resolv ppp-2.4.5/scripts/ip-up.local.add
--- ppp-2.4.5/scripts/ip-up.local.add.ppp_resolv	2010-07-13 10:29:23.227943994 +0200
+++ ppp-2.4.5/scripts/ip-up.local.add	2010-07-13 10:32:27.729695487 +0200
@@ -18,6 +18,9 @@ if [ -n "$USEPEERDNS" -a -f /var/run/ppp
 		rscf=/var/run/ppp/resolv.new
 		grep domain /var/run/ppp/resolv.prev > $rscf
 		grep search /var/run/ppp/resolv.prev >> $rscf
+		if [ -f /var/run/ppp/resolv.conf ]; then
+			cat /var/run/ppp/resolv.conf >> $rscf
+		fi
 		change_resolv_conf $rscf
 		rm -f $rscf
 	else

ppp-2.4.5-eaptls-mppe-0.98.patch:
 README.eap-tls              |  169 ++++++
 etc.ppp/eaptls-client       |   10 
 etc.ppp/eaptls-server       |   11 
 etc.ppp/openssl.cnf         |   14 
 linux/Makefile.top          |    6 
 openssl.cnf                 |   14 
 pppd/Makefile.linux         |   12 
 pppd/auth.c                 |  411 +++++++++++++++
 pppd/ccp.c                  |   20 
 pppd/chap-md5.c             |    4 
 pppd/eap-tls.c              | 1146 ++++++++++++++++++++++++++++++++++++++++++++
 pppd/eap-tls.h              |  107 ++++
 pppd/eap.c                  |  451 +++++++++++++++++
 pppd/eap.h                  |   32 +
 pppd/md5.c                  |    4 
 pppd/md5.h                  |    3 
 pppd/options.c              |   10 
 pppd/pathnames.h            |    7 
 pppd/plugins/Makefile.linux |    3 
 pppd/plugins/passprompt.c   |    3 
 pppd/plugins/passwordfd.c   |    5 
 pppd/pppd.h                 |    9 
 22 files changed, 2444 insertions(+), 7 deletions(-)

Index: ppp-2.4.5-eaptls-mppe-0.98.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.5-eaptls-mppe-0.98.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.5-eaptls-mppe-0.98.patch	16 Jun 2010 08:10:26 -0000	1.1
+++ ppp-2.4.5-eaptls-mppe-0.98.patch	13 Jul 2010 08:48:45 -0000	1.2
@@ -278,7 +278,7 @@ diff -Naur ppp-2.4.5/pppd/Makefile.linux
  
 +# EAP-TLS
 +ifdef USE_EAPTLS
-+CFLAGS += -DUSE_EAPTLS=1 -I/usr/kerberos/include
++CFLAGS += -DUSE_EAPTLS=1
 +LIBS += -lssl -lcrypto
 +PPPDSRC += eap-tls.c
 +HEADERS += eap-tls.h


Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- ppp.spec	16 Jun 2010 08:10:26 -0000	1.63
+++ ppp.spec	13 Jul 2010 08:48:46 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: The Point-to-Point Protocol daemon
 Name: ppp
 Version: 2.4.5
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 URL: http://www.samba.org/ppp
@@ -27,6 +27,7 @@ Patch24: ppp-2.4.4-fd_leak.patch
 Patch25: ppp-2.4.5-var_run_ppp.patch
 Patch26: ppp-2.4.5-manpg.patch
 Patch27: ppp-2.4.5-eaptls-mppe-0.98.patch
+Patch28: ppp-2.4.5-ppp_resolv.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel, libpcap-devel, openssl-devel
@@ -69,10 +70,12 @@ This package contains the header files f
 %patch25 -p1 -b .var_run_ppp
 %patch26 -p1 -b .manpg
 %patch27 -p1 -b .eaptls
+%patch28 -p1 -b .ppp_resolv
 
 rm -f scripts/*.local
 rm -f scripts/*.change_resolv_conf
 rm -f scripts/*.usepeerdns-var_run_ppp_resolv
+rm -f scripts/*.ppp_resolv
 find . -type f -name "*.sample" | xargs rm -f 
 
 %build
@@ -136,6 +139,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Tue Jul 13 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-10
+- fixes #613717 - Missing line in example script ip-up.local.add
+- removed /usr/kerberos/include from eaptls patch
+
 * Wed Jun 16 2010 Jiri Skala <jskala at redhat.com> - 2.4.5-9
 - included eap-tls patch
 



More information about the scm-commits mailing list