rpms/vsftpd/devel vsftpd-2.1.1-daemonize_plus.patch, 1.6, 1.7 vsftpd.spec, 1.106, 1.107

[Jiri Skala]

Author: jskala

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

Modified Files:
	vsftpd-2.1.1-daemonize_plus.patch vsftpd.spec 
Log Message:
* Wed Apr 07 2010 Jiri Skala <jskala at redhat.com> - 2.2.2-5
- corrected daemonize_plus patch - don't try kill parent when vsftpd isn't daemonized


vsftpd-2.1.1-daemonize_plus.patch:
 standalone.c |   38 +++++++++++++++++++++++++++++++++++++-
 sysutil.c    |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sysutil.h    |    7 ++++++-
 3 files changed, 102 insertions(+), 2 deletions(-)

Index: vsftpd-2.1.1-daemonize_plus.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.1-daemonize_plus.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- vsftpd-2.1.1-daemonize_plus.patch	17 Dec 2009 13:14:17 -0000	1.6
+++ vsftpd-2.1.1-daemonize_plus.patch	7 Apr 2010 08:37:48 -0000	1.7
@@ -39,7 +39,7 @@ diff -up vsftpd-2.1.1/standalone.c.daemo
      {
        die("could not bind listening IPv4 socket");
      }
-+    else
++    if (tunable_background) {
 +    {
 +      vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1);
 +    }
@@ -50,7 +50,7 @@ diff -up vsftpd-2.1.1/standalone.c.daemo
      {
        die("could not bind listening IPv6 socket");
      }
-+    else
++    if (tunable_background) {
 +    {
 +      vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1);
 +    }


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -p -r1.106 -r1.107
--- vsftpd.spec	16 Mar 2010 09:38:59 -0000	1.106
+++ vsftpd.spec	7 Apr 2010 08:37:48 -0000	1.107
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Wed Apr 07 2010 Jiri Skala <jskala at redhat.com> - 2.2.2-5
+- corrected daemonize_plus patch - don't try kill parent when vsftpd isn't daemonized
+
 * Tue Mar 16 2010 Jiri Skala <jskala at redhat.com> - 2.2.2-4
 - fixes #544251 - /etc/rc.d/init.d/vsftpd does not start more than one daemon