0001-Fix-timestamp-handling-in-MDTM.patch

@@ -1,151 +0,0 @@
-From 6a4dc470e569df38b8a7ea09ee6aace3c73b7353 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
-Date: Wed, 28 Mar 2018 09:06:34 +0200
-Subject: [PATCH 1/2] Fix timestamp handling in MDTM
-
-There were two problems with the timestamp handling with MDTM:
-
-1. In vsf_sysutil_parse_time(), the `the_time.tm_isdst` attribute was
-   always set to 0, regardless of whether DST (daylight saving time)
-   is active on the given date or not.
-
-   This made glibc shift the timestamp when DST was in fact active on
-   the given date, in an attempt to correct the discrepancy between
-   the given timestamp and the `tm_isdst` attribute. The shifting
-   produced incorrect results however.
-
-   We fix this by setting `tm_isdst` to -1 to let glibc decide if DST
-   is active or not at the time of the timestamp. glibc won't touch
-   the timestamp then.
-
-2. vsftpd used to record the offset from UTC of the current timezone
-   in the global variable `s_timezone`. This variable was then
-   subtracted from the variable `the_time` in vsf_sysutil_setmodtime()
-   when the config option use_localtime=NO was set. This was done to
-   compensate for the fact that mktime(), used in
-   vsf_sysutil_parse_time(), expects a timestamp expressed as local
-   time, whereas vsftpd is dealing with universal time.
-
-   However, this did not work in the case when the offset stored in
-   `s_timezone` did not match the timezone of the timestamp given to
-   mktime() - this happens when DST is active at the current time, but
-   DST is not active at the time of the timestamp, or vice versa.
-
-   We fix this by subtracting the real timezone offset directly in
-   vsf_sysutil_parse_time().
-
-   Note that the `tm_gmtoff` attribute, used in this fix, is a
-   BSD/glic extension. However, using `tm_gmtoff` seems like the
-   simplest solution and we need to make this work only with glibc
-   anyway.
-
-The fix was tested in the following way. We checked that the timestamp
-given to the MDTM command when setting modification time exactly
-matches the timestamp received as response from MDTM when reading back
-the modification time. Additionally, we checked that the modification
-time was set correctly on the given file on disk.
-
-These two checks were performed under various conditions - all the
-combinations of DST/non-DST system time, DST/non-DST modification
-time, use_localtime=YES/NO.
-
-Note that (I think) this will still not work if the rules for when DST
-is active change. For example, if DST is ever completely cancelled in
-the Europe/Prague timezone, and vsftpd is dealing with a timestamp
-from a time when DST was active, it will produce incorrect results. I
-think we would need the full zone file to fix this, but the zone file
-is hard to provide when we're chroot-ed.
-
-Resolves: rhbz#1567855
----
- postlogin.c |  5 +++--
- sysutil.c   | 17 ++++++++++-------
- sysutil.h   |  4 ++--
- 3 files changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/postlogin.c b/postlogin.c
-index 7c749ef..8a3d9d2 100644
---- a/postlogin.c
-+++ b/postlogin.c
-@@ -1788,7 +1788,8 @@ handle_mdtm(struct vsf_session* p_sess)
-   if (do_write != 0)
-   {
-     str_split_char(&p_sess->ftp_arg_str, &s_filename_str, ' ');
--    modtime = vsf_sysutil_parse_time(str_getbuf(&p_sess->ftp_arg_str));
-+    modtime = vsf_sysutil_parse_time(
-+      str_getbuf(&p_sess->ftp_arg_str), tunable_use_localtime);
-     str_copy(&p_sess->ftp_arg_str, &s_filename_str);
-   }
-   resolve_tilde(&p_sess->ftp_arg_str, p_sess);
-@@ -1809,7 +1810,7 @@ handle_mdtm(struct vsf_session* p_sess)
-     else
-     {
-       retval = vsf_sysutil_setmodtime(
--        str_getbuf(&p_sess->ftp_arg_str), modtime, tunable_use_localtime);
-+        str_getbuf(&p_sess->ftp_arg_str), modtime);
-       if (retval != 0)
-       {
-         vsf_cmdio_write(p_sess, FTP_FILEFAIL,
-diff --git a/sysutil.c b/sysutil.c
-index e847650..66d4c5e 100644
---- a/sysutil.c
-+++ b/sysutil.c
-@@ -2819,11 +2819,13 @@ vsf_sysutil_syslog(const char* p_text, int severe)
- }
- 
- long
--vsf_sysutil_parse_time(const char* p_text)
-+vsf_sysutil_parse_time(const char* p_text, int is_localtime)
- {
-+  long res;
-   struct tm the_time;
-   unsigned int len = vsf_sysutil_strlen(p_text);
-   vsf_sysutil_memclr(&the_time, sizeof(the_time));
-+  the_time.tm_isdst = -1;
-   if (len >= 8)
-   {
-     char yr[5];
-@@ -2848,17 +2850,18 @@ vsf_sysutil_parse_time(const char* p_text)
-     the_time.tm_min = vsf_sysutil_atoi(mins);
-     the_time.tm_sec = vsf_sysutil_atoi(sec);
-   }
--  return mktime(&the_time);
-+  res = mktime(&the_time);
-+  if (!is_localtime)
-+  {
-+    res += the_time.tm_gmtoff;
-+  }
-+  return res;
- }
- 
- int
--vsf_sysutil_setmodtime(const char* p_file, long the_time, int is_localtime)
-+vsf_sysutil_setmodtime(const char* p_file, long the_time)
- {
-   struct utimbuf new_times;
--  if (!is_localtime)
--  {
--    the_time -= s_timezone;
--  }
-   vsf_sysutil_memclr(&new_times, sizeof(new_times));
-   new_times.actime = the_time;
-   new_times.modtime = the_time;
-diff --git a/sysutil.h b/sysutil.h
-index 7a59f13..b90f6ca 100644
---- a/sysutil.h
-+++ b/sysutil.h
-@@ -349,9 +349,9 @@ void vsf_sysutil_chroot(const char* p_root_path);
-  */
- long vsf_sysutil_get_time_sec(void);
- long vsf_sysutil_get_time_usec(void);
--long vsf_sysutil_parse_time(const char* p_text);
-+long vsf_sysutil_parse_time(const char* p_text, int is_localtime);
- void vsf_sysutil_sleep(double seconds);
--int vsf_sysutil_setmodtime(const char* p_file, long the_time, int is_localtime);
-+int vsf_sysutil_setmodtime(const char* p_file, long the_time);
- 
- /* Limits */
- void vsf_sysutil_set_address_space_limit(unsigned long bytes);
--- 
-2.24.1
-

0001-Move-closing-standard-FDs-after-listen.patch

@@ -1,46 +0,0 @@
-From 40fea4552377504ce69935149e64e39a595f4600 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
-Date: Sat, 3 Aug 2019 17:50:14 +0200
-Subject: [PATCH 1/2] Move closing standard FDs after listen()
-
-The vsf_sysutil_close() calls need to be moved a bit further so that
-die() works properly in case listen() fails.
-
-I see no reason the calls should be placed before listen()
-specifically, as they are now. My guess is that the author who added
-the calls thought that listen() is a blocking call, which is not the
-case. The only thing we need to satisfy is that close() is called
-before accept, because that is a blocking call. That's all that is
-needed to fix the bug that was fixed by adding the close() calls.
-
-Resolves: rhbz#1666380
----
- standalone.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/standalone.c b/standalone.c
-index 3f35e9e..b358ca1 100644
---- a/standalone.c
-+++ b/standalone.c
-@@ -152,15 +152,15 @@ vsf_standalone_main(void)
-       vsf_sysutil_kill(vsf_sysutil_getppid(), kVSFSysUtilSigUSR1);
-     }
-   }
--  vsf_sysutil_close(0);
--  vsf_sysutil_close(1);
--  vsf_sysutil_close(2);
-   retval = vsf_sysutil_listen(listen_sock, VSFTP_LISTEN_BACKLOG);
-   if (vsf_sysutil_retval_is_error(retval))
-   {
-     die("could not listen");
-   }
-   vsf_sysutil_sockaddr_alloc(&p_accept_addr);
-+  vsf_sysutil_close(0);
-+  vsf_sysutil_close(1);
-+  vsf_sysutil_close(2);
-   while (1)
-   {
-     struct vsf_client_launch child_info;
--- 
-2.20.1
-

0001-Remove-a-hint-about-the-ftp_home_dir-SELinux-boolean.patch

@@ -1,25 +0,0 @@
-From ab797dcffc855b05c9e7c8db4e5be2fc7510831b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
-Date: Tue, 17 Mar 2020 12:57:36 +0100
-Subject: [PATCH] Remove a hint about the ftp_home_dir SELinux boolean
-
-The boolean has been removed from SELinux.
----
- vsftpd.conf | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/vsftpd.conf b/vsftpd.conf
-index 6b8eebb..ea20a72 100644
---- a/vsftpd.conf
-+++ b/vsftpd.conf
-@@ -12,7 +12,6 @@
- anonymous_enable=NO
- #
- # Uncomment this to allow local users to log in.
--# When SELinux is enforcing check for SE bool ftp_home_dir
- local_enable=YES
- #
- # Uncomment this to enable any form of FTP write command.
--- 
-2.25.1
-

0001-Repeat-pututxline-until-it-succeeds-if-it-fails-with.patch

@@ -1,108 +0,0 @@
-From 7957425ef5ab365fc96ea0615f99705581c6dbd8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
-Date: Mon, 12 Aug 2019 18:15:36 +0200
-Subject: [PATCH] Repeat pututxline() until it succeeds if it fails with EINTR
-
-Since the pututxline() bug rhbz#1749439 is now fixed in glibc in
-Fedora and RHEL-8, we can implement a complete solution for the stale
-utmp entries issue originally reported as rhbz#1688848.
-
-This patch is a followup to commit 896b3694ca062d7.
-
-Resolves: rhbz#1688852
-Resolves: rhbz#1737433
----
- sysdeputil.c | 53 +++++++++++++---------------------------------------
- 1 file changed, 13 insertions(+), 40 deletions(-)
-
-diff --git a/sysdeputil.c b/sysdeputil.c
-index 4fbcca7..75be680 100644
---- a/sysdeputil.c
-+++ b/sysdeputil.c
-@@ -1203,7 +1203,7 @@ void
- vsf_insert_uwtmp(const struct mystr* p_user_str,
-                  const struct mystr* p_host_str)
- {
--  int attempts;
-+  struct utmpx* p_res;
- 
-   if (sizeof(s_utent.ut_line) < 16)
-   {
-@@ -1233,34 +1233,21 @@ vsf_insert_uwtmp(const struct mystr* p_user_str,
-   vsf_sysutil_strcpy(s_utent.ut_host, str_getbuf(p_host_str),
-                      sizeof(s_utent.ut_host));
-   s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();
--  for (attempts = 2; attempts > 0; --attempts)
-+  setutxent();
-+  do
-   {
--    struct utmpx* p_res;
--    setutxent();
-     p_res = pututxline(&s_utent);
-     /* For now we'll ignore errors other than EINTR and EAGAIN */
--    if (p_res != NULL || (errno != EINTR && errno != EAGAIN))
--    {
--      break;
--    }
--  }
--  if (attempts == 0)
--  {
--    /* This makes us skip pututxline() in vsf_remove_uwtmp() */
--    s_uwtmp_inserted = -1;
--  }
--  else
--  {
--    s_uwtmp_inserted = 1;
--    endutxent();
--  }
-+  } while (p_res == NULL && (errno == EINTR || errno == EAGAIN));
-+  s_uwtmp_inserted = 1;
-+  endutxent();
-   updwtmpx(WTMPX_FILE, &s_utent);
- }
- 
- void
- vsf_remove_uwtmp(void)
- {
--  int attempts;
-+  struct utmpx* p_res;
- 
-   if (!s_uwtmp_inserted)
-   {
-@@ -1270,27 +1257,13 @@ vsf_remove_uwtmp(void)
-   vsf_sysutil_memclr(s_utent.ut_user, sizeof(s_utent.ut_user));
-   vsf_sysutil_memclr(s_utent.ut_host, sizeof(s_utent.ut_host));
-   s_utent.ut_tv.tv_sec = 0;
--  if (s_uwtmp_inserted == 1)
-+  setutxent();
-+  do
-   {
--    for (attempts = 2; attempts > 0; --attempts)
--    {
--      struct utmpx* p_res;
--      setutxent();
--      p_res = pututxline(&s_utent);
--      /* For now we'll ignore errors other than EINTR and EAGAIN */
--      if (p_res != NULL || (errno != EINTR && errno != EAGAIN))
--      {
--        break;
--      }
--    }
--    if (attempts != 0)
--    {
--      endutxent();
--    }
--  }
--  /* Set s_uwtmp_inserted to 0 regardless of the result of
--   * pututxline() to make sure we won't run this function twice.
--   */
-+    p_res = pututxline(&s_utent);
-+    /* For now we'll ignore errors other than EINTR and EAGAIN */
-+  } while (p_res == NULL && (errno == EINTR || errno == EAGAIN));
-+  endutxent();
-   s_uwtmp_inserted = 0;
-   s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();
-   updwtmpx(WTMPX_FILE, &s_utent);
--- 
-2.20.1
-

0001-Set-s_uwtmp_inserted-only-after-record-insertion-rem.patch

@@ -1,53 +0,0 @@
-From 96698a525784ad91cb27b572dd5f871c183fdfa5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
-Date: Sun, 28 Jul 2019 12:25:35 +0200
-Subject: [PATCH 1/2] Set s_uwtmp_inserted only after record insertion/removal
-
-pututxline() is the function that actually inserts the new record, so
-setting 's_uwtmp_inserted' before calling pututxline() doesn't make
-sense.
-
-We'll need this change for other fixes.
----
- sysdeputil.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sysdeputil.c b/sysdeputil.c
-index 4fe56c2..bd1e8c9 100644
---- a/sysdeputil.c
-+++ b/sysdeputil.c
-@@ -1224,7 +1224,6 @@ vsf_insert_uwtmp(const struct mystr* p_user_str,
-                        sizeof(s_utent.ut_line));
-     str_free(&line_str);
-   }
--  s_uwtmp_inserted = 1;
-   s_utent.ut_type = USER_PROCESS;
-   s_utent.ut_pid = vsf_sysutil_getpid();
-   vsf_sysutil_strcpy(s_utent.ut_user, str_getbuf(p_user_str),
-@@ -1235,6 +1234,7 @@ vsf_insert_uwtmp(const struct mystr* p_user_str,
-   setutxent();
-   (void) pututxline(&s_utent);
-   endutxent();
-+  s_uwtmp_inserted = 1;
-   updwtmpx(WTMPX_FILE, &s_utent);
- }
- 
-@@ -1245,7 +1245,6 @@ vsf_remove_uwtmp(void)
-   {
-     return;
-   }
--  s_uwtmp_inserted = 0;
-   s_utent.ut_type = DEAD_PROCESS;
-   vsf_sysutil_memclr(s_utent.ut_user, sizeof(s_utent.ut_user));
-   vsf_sysutil_memclr(s_utent.ut_host, sizeof(s_utent.ut_host));
-@@ -1253,6 +1252,7 @@ vsf_remove_uwtmp(void)
-   setutxent();
-   (void) pututxline(&s_utent);
-   endutxent();
-+  s_uwtmp_inserted = 0;
-   s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();
-   updwtmpx(WTMPX_FILE, &s_utent);
- }
--- 
-2.20.1
-

0002-Drop-an-unused-global-variable.patch

@@ -1,56 +0,0 @@
-From d0045e35674d64d166d17c3c079ae03e8c2e6361 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
-Date: Thu, 13 Feb 2020 17:29:06 +0100
-Subject: [PATCH 2/2] Drop an unused global variable
-
-The global variable `s_timezone` is not used anymore, so we can drop
-it.
----
- sysutil.c | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
-
-diff --git a/sysutil.c b/sysutil.c
-index 66d4c5e..0ccf551 100644
---- a/sysutil.c
-+++ b/sysutil.c
-@@ -72,8 +72,6 @@ static struct timeval s_current_time;
- static int s_current_pid = -1;
- /* Exit function */
- static exitfunc_t s_exit_func;
--/* Difference in timezone from GMT in seconds */
--static long s_timezone;
- 
- /* Our internal signal handling implementation details */
- static struct vsf_sysutil_sig_details
-@@ -2661,7 +2659,6 @@ char* vsf_sysutil_get_tz()
- void
- vsf_sysutil_tzset(void)
- {
--  int retval;
-   char *tz=NULL, tzbuf[sizeof("+HHMM!")];
-   time_t the_time = time(NULL);
-   struct tm* p_tm;
-@@ -2681,17 +2678,9 @@ vsf_sysutil_tzset(void)
-   {
-     die("localtime");
-   }
--  retval = strftime(tzbuf, sizeof(tzbuf), "%z", p_tm);
--  tzbuf[sizeof(tzbuf) - 1] = '\0';
--  if (retval == 5)
--  {
--    s_timezone = ((tzbuf[1] - '0') * 10 + (tzbuf[2] - '0')) * 60 * 60;
--    s_timezone += ((tzbuf[3] - '0') * 10 + (tzbuf[4] - '0')) * 60;
--    if (tzbuf[0] == '+')
--    {
--      s_timezone *= -1;
--    }
--  }
-+  /* Not sure if the following call to strftime() has any desired side
-+     effects, so I'm keeping it to be safe. */
-+  (void) strftime(tzbuf, sizeof(tzbuf), "%z", p_tm);
-   /* Call in to the time subsystem again now that TZ is set, trying to force
-    * caching of the actual zoneinfo for the timezone.
-    */
--- 
-2.24.1
-

0002-Prevent-recursion-in-bug.patch

@@ -1,107 +0,0 @@
-From e679a3ce0f2cf1558da31e0bccd9e2398b89c7e9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
-Date: Tue, 30 Jul 2019 16:07:01 +0200
-Subject: [PATCH 2/2] Prevent recursion in bug()
-
-Resolves: rhbz#1666380
----
- sysutil.c | 35 +++++++++++++++++++++++++++++++----
- sysutil.h |  1 +
- utility.c | 12 +++++++-----
- 3 files changed, 39 insertions(+), 9 deletions(-)
-
-diff --git a/sysutil.c b/sysutil.c
-index fd07d99..e2df671 100644
---- a/sysutil.c
-+++ b/sysutil.c
-@@ -774,21 +774,48 @@ vsf_sysutil_deactivate_linger_failok(int fd)
-   (void) setsockopt(fd, SOL_SOCKET, SO_LINGER, &the_linger, sizeof(the_linger));
- }
- 
--void
--vsf_sysutil_activate_noblock(int fd)
-+static int
-+vsf_sysutil_activate_noblock_internal(int fd, int return_err)
- {
-   int retval;
-   int curr_flags = fcntl(fd, F_GETFL);
-   if (vsf_sysutil_retval_is_error(curr_flags))
-   {
--    die("fcntl");
-+    if (return_err)
-+    {
-+      return -1;
-+    }
-+    else
-+    {
-+      die("fcntl");
-+    }
-   }
-   curr_flags |= O_NONBLOCK;
-   retval = fcntl(fd, F_SETFL, curr_flags);
-   if (retval != 0)
-   {
--    die("fcntl");
-+    if (return_err)
-+    {
-+      return -1;
-+    }
-+    else
-+    {
-+      die("fcntl");
-+    }
-   }
-+  return 0;
-+}
-+
-+void
-+vsf_sysutil_activate_noblock(int fd)
-+{
-+  (void) vsf_sysutil_activate_noblock_internal(fd, 0);
-+}
-+
-+int
-+vsf_sysutil_activate_noblock_no_die(int fd)
-+{
-+  return vsf_sysutil_activate_noblock_internal(fd, 1);
- }
- 
- void
-diff --git a/sysutil.h b/sysutil.h
-index 2df14ed..0772423 100644
---- a/sysutil.h
-+++ b/sysutil.h
-@@ -281,6 +281,7 @@ void vsf_sysutil_activate_oobinline(int fd);
- void vsf_sysutil_activate_linger(int fd);
- void vsf_sysutil_deactivate_linger_failok(int fd);
- void vsf_sysutil_activate_noblock(int fd);
-+int vsf_sysutil_activate_noblock_no_die(int fd);
- void vsf_sysutil_deactivate_noblock(int fd);
- /* This does SHUT_RDWR */
- void vsf_sysutil_shutdown_failok(int fd);
-diff --git a/utility.c b/utility.c
-index 75e5bdd..5619a04 100644
---- a/utility.c
-+++ b/utility.c
-@@ -47,11 +47,13 @@ bug(const char* p_text)
-   {
-     vsf_log_die(p_text);
-   }
--  vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD);
--  (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);
--  (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, p_text,
--                                vsf_sysutil_strlen(p_text));
--  (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "\r\n", 2);
-+  if (vsf_sysutil_activate_noblock_no_die(VSFTP_COMMAND_FD) == 0)
-+  {
-+    (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);
-+    (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, p_text,
-+				  vsf_sysutil_strlen(p_text));
-+    (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "\r\n", 2);
-+  }
-   if (tunable_log_die)
-   {
-     /* Workaround for https://github.com/systemd/systemd/issues/2913 */
--- 
-2.20.1
-

0002-Repeat-pututxline-if-it-fails-with-EINTR.patch

@@ -1,105 +0,0 @@
-From 896b3694ca062d747cd67e9e9ba246adb3fc706b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
-Date: Mon, 5 Aug 2019 13:55:37 +0200
-Subject: [PATCH 2/2] Repeat pututxline() if it fails with EINTR
-
-This is a partial fix for rhbz#1688848. We cannot resolve it
-completely until glibc bug rhbz#1734791 is fixed. See
-https://bugzilla.redhat.com/show_bug.cgi?id=1688848#c13.
-
-The maximum number of attempts is currently 2, which might seem
-low. However setting it to 2 was a decision based on data - see
-https://bugzilla.redhat.com/show_bug.cgi?id=1688848#c16.
-
-Resolves: rhbz#1688848
----
- sysdeputil.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 46 insertions(+), 7 deletions(-)
-
-diff --git a/sysdeputil.c b/sysdeputil.c
-index bd1e8c9..4fbcca7 100644
---- a/sysdeputil.c
-+++ b/sysdeputil.c
-@@ -1203,6 +1203,8 @@ void
- vsf_insert_uwtmp(const struct mystr* p_user_str,
-                  const struct mystr* p_host_str)
- {
-+  int attempts;
-+
-   if (sizeof(s_utent.ut_line) < 16)
-   {
-     return;
-@@ -1231,16 +1233,35 @@ vsf_insert_uwtmp(const struct mystr* p_user_str,
-   vsf_sysutil_strcpy(s_utent.ut_host, str_getbuf(p_host_str),
-                      sizeof(s_utent.ut_host));
-   s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();
--  setutxent();
--  (void) pututxline(&s_utent);
--  endutxent();
--  s_uwtmp_inserted = 1;
-+  for (attempts = 2; attempts > 0; --attempts)
-+  {
-+    struct utmpx* p_res;
-+    setutxent();
-+    p_res = pututxline(&s_utent);
-+    /* For now we'll ignore errors other than EINTR and EAGAIN */
-+    if (p_res != NULL || (errno != EINTR && errno != EAGAIN))
-+    {
-+      break;
-+    }
-+  }
-+  if (attempts == 0)
-+  {
-+    /* This makes us skip pututxline() in vsf_remove_uwtmp() */
-+    s_uwtmp_inserted = -1;
-+  }
-+  else
-+  {
-+    s_uwtmp_inserted = 1;
-+    endutxent();
-+  }
-   updwtmpx(WTMPX_FILE, &s_utent);
- }
- 
- void
- vsf_remove_uwtmp(void)
- {
-+  int attempts;
-+
-   if (!s_uwtmp_inserted)
-   {
-     return;
-@@ -1249,9 +1270,27 @@ vsf_remove_uwtmp(void)
-   vsf_sysutil_memclr(s_utent.ut_user, sizeof(s_utent.ut_user));
-   vsf_sysutil_memclr(s_utent.ut_host, sizeof(s_utent.ut_host));
-   s_utent.ut_tv.tv_sec = 0;
--  setutxent();
--  (void) pututxline(&s_utent);
--  endutxent();
-+  if (s_uwtmp_inserted == 1)
-+  {
-+    for (attempts = 2; attempts > 0; --attempts)
-+    {
-+      struct utmpx* p_res;
-+      setutxent();
-+      p_res = pututxline(&s_utent);
-+      /* For now we'll ignore errors other than EINTR and EAGAIN */
-+      if (p_res != NULL || (errno != EINTR && errno != EAGAIN))
-+      {
-+        break;
-+      }
-+    }
-+    if (attempts != 0)
-+    {
-+      endutxent();
-+    }
-+  }
-+  /* Set s_uwtmp_inserted to 0 regardless of the result of
-+   * pututxline() to make sure we won't run this function twice.
-+   */
-   s_uwtmp_inserted = 0;
-   s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();
-   updwtmpx(WTMPX_FILE, &s_utent);
--- 
-2.20.1
-

fix-str_open.patch

@@ -1,28 +0,0 @@
-diff -ruN vsftpd-3.0.3.orig/sysstr.c vsftpd-3.0.3/sysstr.c
---- vsftpd-3.0.3.orig/sysstr.c	2020-11-17 09:47:03.872923383 +0100
-+++ vsftpd-3.0.3/sysstr.c	2020-11-17 09:48:41.219754145 +0100
-@@ -74,19 +74,11 @@
- int
- str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode)
- {
--  enum EVSFSysUtilOpenMode open_mode = kVSFSysStrOpenUnknown;
--  switch (mode)
--  {
--    case kVSFSysStrOpenReadOnly:
--      open_mode = kVSFSysUtilOpenReadOnly;
--      break;
--    case kVSFSysStrOpenUnknown:
--      /* Fall through */
--    default:
--      bug("unknown mode value in str_open");
--      break;
--  }
--  return vsf_sysutil_open_file(str_getbuf(p_str), open_mode);
-+  if (mode == kVSFSysStrOpenReadOnly)
-+    return vsf_sysutil_open_file(str_getbuf(p_str), kVSFSysUtilOpenReadOnly);
-+
-+  bug("unknown mode value in str_open");
-+  return -1;
- }
- 
- int

vsftpd.spec

@@ -2,7 +2,7 @@
 
 Name:          vsftpd
 Version:       3.0.3
-Release:       33
+Release:       30
 Summary:       It is a secure FTP server for Unix-like systems
 # OpenSSL link exception
 License:       GPLv2 with exceptions
@@ -18,9 +18,10 @@ Source7:       vsftpd@.service
 Source8:       vsftpd.target
 Source9:       vsftpd-generator
 Source10:      vsftpd.default.log
-BuildRequires: pam-devel libcap-devel openssl-devel systemd vim make gcc
+BuildRequires: pam-devel libcap-devel openssl-devel systemd
 Requires:      logrotate
 
+#patches from redhat see descriptions in each patch file for detailed information
 Patch1:        0001-Don-t-use-the-provided-script-to-locate-libraries.patch
 Patch2:        0002-Enable-build-with-SSL.patch
 Patch3:        0003-Enable-build-with-TCP-Wrapper.patch
@@ -80,15 +81,6 @@ Patch56:       0056-Log-die-calls-to-syslog.patch
 Patch57:       0057-Improve-error-message-when-max-number-of-bind-attemp.patch
 Patch58:       0058-Make-the-max-number-of-bind-retries-tunable.patch
 Patch59:       0059-Fix-SEGFAULT-when-running-in-a-container-as-PID-1.patch
-Patch61:       0001-Move-closing-standard-FDs-after-listen.patch
-Patch62:       0002-Prevent-recursion-in-bug.patch
-Patch63:       0001-Set-s_uwtmp_inserted-only-after-record-insertion-rem.patch
-Patch64:       0002-Repeat-pututxline-if-it-fails-with-EINTR.patch
-Patch65:       0001-Repeat-pututxline-until-it-succeeds-if-it-fails-with.patch
-Patch67:       0001-Fix-timestamp-handling-in-MDTM.patch
-Patch68:       0002-Drop-an-unused-global-variable.patch
-Patch69:       0001-Remove-a-hint-about-the-ftp_home_dir-SELinux-boolean.patch
-Patch70:       fix-str_open.patch
 
 Patch9000:     bugfix-change-the-default-value-of-tunable_reverse_lookup_e.patch
 
@@ -107,7 +99,7 @@ This package contains man directory manuals.
 %autosetup -p1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe -Wextra" LINK="-pie -lssl" %{?_smp_mflags}
+make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe -Wextra -Werror" LINK="-pie -lssl" %{?_smp_mflags}
 
 %install
 install -d %{buildroot}{%{_unitdir},%{generator_dir},%{_var}/ftp/pub}
@@ -155,21 +147,6 @@ cp -f %{SOURCE1} ./
 %{_mandir}/man8/vsftpd.*
 
 %changelog
-* Tue Jan 26 2021 orange-snn <songnannan2@huawei.com> - 3.0.3-33
-- remove Werror in build flags to fix building error.
-
-* Tue Dec 15 2020 xihaochen <xihaochen@huawei.com> - 3.0.3-32
-- Type:requirement
-- ID:NA
-- SUG:NA
-- DESC:remove redhat keyword
-
-* Sat Sep 05 2020 zengwefeng<zwfeng@huawei.com> - 3.0.3-31
-- Type:NA
-- Id:NA
-- SUG:NA
-- DESC: add yaml file
-
 * Fri Dec 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 3.0.3-30
 - Type:bugfix
 - Id:NA

vsftpd.yaml

@@ -1,4 +1,4 @@
 version_control: github
-src_repo: dagwieers/vsftpd
+src_repo: djarosz/vsftpd
-tag_prefix: ^v
+tag_prefix: vsftpd-
-separator: .
+seperator: .