From 6a89a3b830e75d1e8d686f02cd33a3914d4dd33a Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 5 Sep 2021 08:57:23 +0200 Subject: [PATCH] package/vsftpd: bump to 3.0.5 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- 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 95ad017a1c..657af289cb 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 0732c5f632..6056193779 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 751faf61ca..485e5ba2f0 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 8daf07c62a..3e7b233e48 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