From 8458fa9dff0527a2ee14bfdbf91bda3fd953048f Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: Dec 17 2009 13:14:17 +0000
Subject: - corrected two patches due to fuzz 0


---

diff --git a/vsftpd-2.1.0-configuration.patch b/vsftpd-2.1.0-configuration.patch
index eb8fb59..4f95607 100644
--- a/vsftpd-2.1.0-configuration.patch
+++ b/vsftpd-2.1.0-configuration.patch
@@ -433,7 +433,7 @@ diff -up vsftpd-2.2.0/vsftpd.conf.configuration vsftpd-2.2.0/vsftpd.conf
  # You may activate the "-R" option to the builtin ls. This is disabled by
  # default to avoid remote users being able to cause excessive I/O on large
 @@ -112,3 +112,7 @@ listen=YES
- # sockets, you must run two copies of vsftpd whith two configuration files.
+ # sockets, you must run two copies of vsftpd with two configuration files.
  # Make sure, that one of the listen options is commented !!
  #listen_ipv6=YES
 +
diff --git a/vsftpd-2.1.1-daemonize_plus.patch b/vsftpd-2.1.1-daemonize_plus.patch
index d57949d..37049ea 100644
--- a/vsftpd-2.1.1-daemonize_plus.patch
+++ b/vsftpd-2.1.1-daemonize_plus.patch
@@ -105,8 +105,8 @@ diff -up vsftpd-2.1.1/sysutil.c.daemonize_plus vsftpd-2.1.1/sysutil.c
  vsf_sysutil_fork(void)
  {
 @@ -2807,3 +2816,53 @@ vsf_sysutil_set_no_fds()
- {
-   s_current_pid = -1;
+     s_sig_details[i].pending = 0;
+   }
  }
 +
 +static struct sigaction sigalr, sigusr1;
diff --git a/vsftpd.spec b/vsftpd.spec
index 4747587..1f0ffab 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Thu Dec 17 2009 Jiri Skala <jskala@redhat.com> - 2.2.2-2
+- corrected two patches due to fuzz 0
+
 * Thu Dec 17 2009 Jiri Skala <jskala@redhat.com> - 2.2.2-1
 - update to latest upstream