rpms/ppp/F-12 ppp-2.4.4-fd_leak.patch,1.1,1.2 ppp.spec,1.54,1.55

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/ppp/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19396

Modified Files:
	ppp-2.4.4-fd_leak.patch ppp.spec 
Log Message:
* Thu Feb 04 2010 Jiri Skala <jskala at redhat.com> 2.4.5-4
- fixed one line in fd_leak patch


ppp-2.4.4-fd_leak.patch:
 auth.c      |   20 +++++------
 eap.c       |    2 -
 main.c      |  105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 options.c   |    6 +--
 pppd.h      |    4 ++
 sys-linux.c |   34 +++++++++----------
 tdb.c       |    4 +-
 tty.c       |    7 ++--
 utils.c     |    6 +--
 9 files changed, 147 insertions(+), 41 deletions(-)

Index: ppp-2.4.4-fd_leak.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp-2.4.4-fd_leak.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.4-fd_leak.patch	3 Feb 2010 22:36:34 -0000	1.1
+++ ppp-2.4.4-fd_leak.patch	4 Feb 2010 08:46:24 -0000	1.2
@@ -219,7 +219,7 @@ diff -up ppp-2.4.4/pppd/main.c.fd_leak p
 +    FILE *f;
 +
 +#if defined(O_CLOEXEC) && defined(SOCK_CLOEXEC)
-+    if (cloexec_exec != -1) {
++    if (cloexec_works != -1) {
 +        f = fopen(path, "re");
 +        if (f != NULL) {
 +            check_cloexec(fileno(f));


Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/F-12/ppp.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- ppp.spec	3 Feb 2010 22:36:34 -0000	1.54
+++ ppp.spec	4 Feb 2010 08:46:24 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD and LGPLv2+ and GPLv2+ and Public Domain
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc PLUGINS
 
 %changelog
+* Thu Feb 04 2010 Jiri Skala <jskala at redhat.com> 2.4.5-4
+- fixed one line in fd_leak patch
+
 * Wed Feb 03 2010 Jiri Skala <jskala at redhat.com> 2.4.5-3
 - fixes #541107 fd_leak patch