From 026265bf7e09e0348aefa79e7a1f32add925f23b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 9 Oct 2022 23:49:45 +0200 Subject: [PATCH] package/gesftpserver: bump to version 2 - Drop patch (already in version) - Replace rjk_cv_python24 by rjk_cv_python3 due to https://github.com/ewxrjk/sftpserver/commit/6c0b4852a3654747e88f457a37b20530c5e426ca http://www.chiark.greenend.org.uk/pipermail/sgo-software-announce/2022/000070.html https://github.com/ewxrjk/sftpserver/blob/2/CHANGES.md Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...v3-attributes-according-to-draft-iet.patch | 30 ------------------- package/gesftpserver/gesftpserver.hash | 2 +- package/gesftpserver/gesftpserver.mk | 4 +-- 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch diff --git a/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch b/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch deleted file mode 100644 index 3697d0e525..0000000000 --- a/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4b5c7eb63894bd2b1fedeb2a8e9bd16bf3c8c555 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bernd=20Holzm=C3=BCller?= - -Date: Mon, 11 Feb 2019 23:57:01 +0100 -Subject: [PATCH] Change order of v3-attributes according to - draft-ietf-secsh-filexfer-00/02 - -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: "Yann E. MORIN" ---- - v3.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/v3.c b/v3.c -index 57cc31e..1fd86ad 100644 ---- a/v3.c -+++ b/v3.c -@@ -121,8 +121,8 @@ static void v3_sendattrs(struct sftpjob *job, const struct sftpattr *attrs) { - fatal("sending out-of-range mtime"); - if(a != attrs->atime.seconds) - fatal("sending out-of-range mtime"); -- sftp_send_uint32(job->worker, m); - sftp_send_uint32(job->worker, a); -+ sftp_send_uint32(job->worker, m); - } - /* Note that we just discard unknown bits rather than reporting errors. */ - } --- -2.14.1 - diff --git a/package/gesftpserver/gesftpserver.hash b/package/gesftpserver/gesftpserver.hash index 790cbe97c2..6d910a84dd 100644 --- a/package/gesftpserver/gesftpserver.hash +++ b/package/gesftpserver/gesftpserver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4963b85787de3485085a5356c671c58b8b33125f528ff1b2fe8b534ed8a0c1bd sftpserver-1.tar.gz +sha256 b18b10405ef2b05c45450aafd6803f69efb4d2138e4e07fd186c1618027ee169 sftpserver-2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 20ad92d25a..b47ec1c5d3 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -4,7 +4,7 @@ # ################################################################################ -GESFTPSERVER_VERSION = 1 +GESFTPSERVER_VERSION = 2 GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz GESFTPSERVER_SITE = http://www.greenend.org.uk/rjk/sftpserver GESFTPSERVER_LICENSE = GPL-2.0+ @@ -25,7 +25,7 @@ GESFTPSERVER_DEPENDENCIES += \ # Python on the host is only used for tests, which we don't use in # Buildroot -GESFTPSERVER_CONF_ENV += rjk_cv_python24=false +GESFTPSERVER_CONF_ENV += rjk_cv_python3=false # openssh/dropbear looks here define GESFTPSERVER_ADD_SYMLINK