All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/vsftpd: bump to 3.0.5
@ 2021-09-05  6:57 Francois Perrad
  2021-09-05 13:58 ` Thomas Petazzoni
  2021-09-10 11:20 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Francois Perrad @ 2021-09-05  6:57 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/vsftpd/0002-fix-CVE-2015-1419.patch               | 4 ++--
 package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch | 4 ++--
 package/vsftpd/vsftpd.hash                                | 2 +-
 package/vsftpd/vsftpd.mk                                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/vsftpd/0002-fix-CVE-2015-1419.patch b/package/vsftpd/0002-fix-CVE-2015-1419.patch
index 95ad017a1..657af289c 100644
--- a/package/vsftpd/0002-fix-CVE-2015-1419.patch
+++ b/package/vsftpd/0002-fix-CVE-2015-1419.patch
@@ -73,7 +73,7 @@ Index: vsftpd-3.0.2/str.c
 ===================================================================
 --- vsftpd-3.0.2.orig/str.c
 +++ vsftpd-3.0.2/str.c
-@@ -770,3 +770,14 @@ str_replace_unprintable(struct mystr* p_
+@@ -711,3 +711,14 @@ str_replace_unprintable(struct mystr* p_
    }
  }
  
@@ -92,7 +92,7 @@ Index: vsftpd-3.0.2/str.h
 ===================================================================
 --- vsftpd-3.0.2.orig/str.h
 +++ vsftpd-3.0.2/str.h
-@@ -101,6 +101,7 @@ void str_replace_unprintable(struct myst
+@@ -100,6 +100,7 @@ void str_replace_unprintable(struct myst
  int str_atoi(const struct mystr* p_str);
  filesize_t str_a_to_filesize_t(const struct mystr* p_str);
  unsigned int str_octal_to_uint(const struct mystr* p_str);
diff --git a/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch b/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch
index 0732c5f63..605619377 100644
--- a/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch
+++ b/package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch
@@ -21,7 +21,7 @@ diff --git a/sysutil.c b/sysutil.c
 index 6d7cb3f..099748f 100644
 --- a/sysutil.c
 +++ b/sysutil.c
-@@ -608,13 +608,13 @@ vsf_sysutil_exit(int exit_code)
+@@ -592,13 +592,13 @@ vsf_sysutil_exit(int exit_code)
  }
  
  struct vsf_sysutil_wait_retval
@@ -41,7 +41,7 @@ diff --git a/sysutil.h b/sysutil.h
 index c145bdf..13153cd 100644
 --- a/sysutil.h
 +++ b/sysutil.h
-@@ -177,7 +177,7 @@ struct vsf_sysutil_wait_retval
+@@ -175,7 +175,7 @@ struct vsf_sysutil_wait_retval
    int PRIVATE_HANDS_OFF_syscall_retval;
    int PRIVATE_HANDS_OFF_exit_status;
  };
diff --git a/package/vsftpd/vsftpd.hash b/package/vsftpd/vsftpd.hash
index 751faf61c..485e5ba2f 100644
--- a/package/vsftpd/vsftpd.hash
+++ b/package/vsftpd/vsftpd.hash
@@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256  6b9421bd27e8a6cdeed5b31154f294a20b003a11a26c09500715a0a6b1b86a26  vsftpd-3.0.4.tar.gz
+sha256  26b602ae454b0ba6d99ef44a09b6b9e0dfa7f67228106736df1f278c70bc91d3  vsftpd-3.0.5.tar.gz
 # Locally computed
 sha256  c9cf119e2f9dbcf187fb805ba5aded105db26a693803636fb7228c98460ffbf2  COPYING
diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk
index 8daf07c62..3e7b233e4 100644
--- a/package/vsftpd/vsftpd.mk
+++ b/package/vsftpd/vsftpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-VSFTPD_VERSION = 3.0.4
+VSFTPD_VERSION = 3.0.5
 VSFTPD_SITE = https://security.appspot.com/downloads
 VSFTPD_LIBS = -lcrypt
 VSFTPD_LICENSE = GPL-2.0
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH] package/vsftpd: bump to 3.0.5
  2021-09-05  6:57 [Buildroot] [PATCH] package/vsftpd: bump to 3.0.5 Francois Perrad
@ 2021-09-05 13:58 ` Thomas Petazzoni
  2021-09-10 11:20 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2021-09-05 13:58 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

On Sun,  5 Sep 2021 08:57:23 +0200
Francois Perrad <fperrad@gmail.com> wrote:

> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/vsftpd/0002-fix-CVE-2015-1419.patch               | 4 ++--
>  package/vsftpd/0003-Prevent-hang-in-SIGCHLD-handler.patch | 4 ++--
>  package/vsftpd/vsftpd.hash                                | 2 +-
>  package/vsftpd/vsftpd.mk                                  | 2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH] package/vsftpd: bump to 3.0.5
  2021-09-05  6:57 [Buildroot] [PATCH] package/vsftpd: bump to 3.0.5 Francois Perrad
  2021-09-05 13:58 ` Thomas Petazzoni
@ 2021-09-10 11:20 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2021-09-10 11:20 UTC (permalink / raw)
  To: Francois Perrad; +Cc: buildroot

>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:

 > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

Looks to be purely bugfixes, so committed to 2021.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-09-10 11:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-05  6:57 [Buildroot] [PATCH] package/vsftpd: bump to 3.0.5 Francois Perrad
2021-09-05 13:58 ` Thomas Petazzoni
2021-09-10 11:20 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.