From 3e9a56be93b6cf7b80ab45896bd84727f83e1d4f Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy@fedoraproject.org>
Date: Dec 04 2007 08:02:50 +0000
Subject: - Removed use_localtime patch (#243087).


---

diff --git a/vsftpd-2.0.1-use_localtime.patch b/vsftpd-2.0.1-use_localtime.patch
deleted file mode 100644
index e2ac952..0000000
--- a/vsftpd-2.0.1-use_localtime.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- vsftpd-2.0.1/sysutil.c.use_localtime	2005-01-10 10:05:06.000000000 +0100
-+++ vsftpd-2.0.1/sysutil.c	2005-01-10 10:11:18.172815304 +0100
-@@ -2372,7 +2372,7 @@
- }
- 
- const char*
--vsf_sysutil_get_current_date(void)
-+vsf_sysutil_get_current_date(int use_localtime)
- {
-   static char datebuf[64];
-   time_t curr_time;
-@@ -2380,7 +2380,11 @@
-   int i = 0;
-   vsf_sysutil_update_cached_time();
-   curr_time = vsf_sysutil_get_cached_time_sec();
--  p_tm = localtime(&curr_time);
-+  if (!use_localtime) {  
-+    p_tm = gmtime(&curr_time);
-+  } else {
-+    p_tm = localtime(&curr_time);
-+  }
-   if (strftime(datebuf, sizeof(datebuf), "%a %b!%d %H:%M:%S %Y", p_tm) == 0)
-   {
-     die("strftime");
---- vsftpd-2.0.1/logging.c.use_localtime	2004-07-02 13:23:26.000000000 +0200
-+++ vsftpd-2.0.1/logging.c	2005-01-10 10:11:05.716708920 +0100
-@@ -171,7 +171,7 @@
-   long delta_sec;
-   enum EVSFLogEntryType what = (enum EVSFLogEntryType) p_sess->log_type;
-   /* Date - vsf_sysutil_get_current_date updates cached time */
--  str_alloc_text(p_str, vsf_sysutil_get_current_date());
-+  str_alloc_text(p_str, vsf_sysutil_get_current_date(tunable_use_localtime));
-   str_append_char(p_str, ' ');
-   /* Transfer time (in seconds) */
-   delta_sec = vsf_sysutil_get_cached_time_sec() - p_sess->log_start_sec;
-@@ -241,7 +241,7 @@
-                              const struct mystr* p_log_str)
- {
-   /* Date - vsf_sysutil_get_current_date updates cached time */
--  str_alloc_text(p_str, vsf_sysutil_get_current_date());
-+  str_alloc_text(p_str, vsf_sysutil_get_current_date(tunable_use_localtime));
-   /* Pid */
-   str_append_text(p_str, " [pid ");
-   str_append_ulong(p_str, vsf_sysutil_getpid());
---- vsftpd-2.0.1/sysutil.h.use_localtime	2004-06-04 12:11:52.000000000 +0200
-+++ vsftpd-2.0.1/sysutil.h	2005-01-10 10:11:23.252043144 +0100
-@@ -288,7 +288,7 @@
- void vsf_sysutil_set_umask(unsigned int umask);
- void vsf_sysutil_make_session_leader(void);
- void vsf_sysutil_tzset(void);
--const char* vsf_sysutil_get_current_date(void);
-+const char* vsf_sysutil_get_current_date(int use_localtime);
- void vsf_sysutil_qsort(void* p_base, unsigned int num_elem,
-                        unsigned int elem_size,
-                        int (*p_compar)(const void *, const void *));
diff --git a/vsftpd.spec b/vsftpd.spec
index a03e2a7..9de4d40 100644
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -23,7 +23,6 @@ Patch6: vsftpd-1.2.1-conffile.patch
 Patch7: vsftpd-2.0.1-build_ssl.patch
 Patch8: vsftpd-2.0.1-server_args.patch
 Patch9: vsftpd-2.0.1-dir.patch
-Patch10: vsftpd-2.0.1-use_localtime.patch
 Patch11: vsftpd-1.2.1-nonrootconf.patch
 Patch13: vsftpd-2.0.3-background.patch
 Patch14: vsftpd-2.0.3-daemonize_fds.patch
@@ -84,7 +83,6 @@ cp %{SOURCE1} .
 %patch7 -p1 -b .build_ssl
 %patch8 -p1 -b .server_args
 %patch9 -p1 -b .dir
-%patch10 -p1 -b .use_localtime
 %patch11 -p1 -b .nonrootconf
 %patch13 -p1 -b .background
 %patch14 -p1 -b .fds
@@ -177,6 +175,7 @@ fi
 - Fix nonrootconf patch (#400921).
 - Increase maximum length of allowed username (#236326).
 - Fix file listing issue with wildcard (#392181).
+- Removed use_localtime patch (#243087).
 
 * Thu Nov 08 2007 Martin Nagy <mnagy@redhat.com> - 2.0.5-20
 - Correct calling of pam_end (#235843).