From 1f5c5fc792ef3bb58ea313562bcd5fb2f375a8be Mon Sep 17 00:00:00 2001 From: Sean McAvoy Date: Thu, 7 Apr 2022 00:06:21 -0400 Subject: [PATCH] main/dropbear: upgrade to 2022.82 --- main/dropbear/APKBUILD | 12 ++++----- .../dropbear-0.53.1-static_build_fix.patch | 26 ------------------- .../dropbear-options_sftp-server_path.patch | 2 +- 3 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 main/dropbear/dropbear-0.53.1-static_build_fix.patch diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD index a6cb13cb4d8..2cda1f7a8a0 100644 --- a/main/dropbear/APKBUILD +++ b/main/dropbear/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa pkgname=dropbear -pkgver=2020.81 -pkgrel=1 +pkgver=2022.82 +pkgrel=0 pkgdesc="small SSH 2 client/server designed for small memory environments" url="https://matt.ucc.asn.au/dropbear/dropbear.html" arch="all" @@ -19,7 +19,6 @@ subpackages="$pkgname-doc source="https://matt.ucc.asn.au/dropbear/releases/dropbear-$pkgver.tar.bz2 dropbear.initd dropbear.confd - dropbear-0.53.1-static_build_fix.patch dropbear-options_sftp-server_path.patch " @@ -84,8 +83,9 @@ _ssh() { ln -s /usr/bin/dbclient "$subpkgdir"/usr/bin/ssh } -sha512sums="2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da dropbear-2020.81.tar.bz2 +sha512sums=" +94c664e0d56bce3750b04aff166bf073f778dc2aa08e093541b520db1f165d4173e1cf25eef69a59b0a5a0a63cfb3ce8bbf94d6c4010687a0233ba1ad8ea403b dropbear-2022.82.tar.bz2 9c55ab3d8b61955cde1ccc1b8acbd3d2ef123feb9489e92737304c35315d07b7f85fad8a12ac7b0ec2c1dcee3d76b8bc4aa18518f4ddd963917805db33e48826 dropbear.initd 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f dropbear.confd -413cef467db35ddc430a773af943ff650d51bdb6fb262dcabc625eb6c9f4170b5711998df5577dd05c60e21e0a9771bff022adc8273083b85a18f4d5659ffd50 dropbear-0.53.1-static_build_fix.patch -9b078548c6850c9b45e9b68a8ebd746a4a0648607c8ad0cf4106f09f7a63768c83a3e4e4fbec38b665ae283503fd3cdd054775aa3c9afe02567be3e775aef50b dropbear-options_sftp-server_path.patch" +df3fa2c64665b669257ec511afa2e04107eb6b0a2a4238ad9b33db3d322b90854b00506e14a09b648fe2d716dc6c140212cc1739f7cd03088f9b7b9781aaa499 dropbear-options_sftp-server_path.patch +" diff --git a/main/dropbear/dropbear-0.53.1-static_build_fix.patch b/main/dropbear/dropbear-0.53.1-static_build_fix.patch deleted file mode 100644 index 6f13101bbef..00000000000 --- a/main/dropbear/dropbear-0.53.1-static_build_fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -dropbear: fix static build - -the -lcrypt is missing during the link - -svr-authpasswd.o: In function `svr_auth_password': -svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt' -collect2: ld returned 1 exit status - -Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -99,7 +99,7 @@ STRIP=@STRIP@ - INSTALL=@INSTALL@ - CPPFLAGS=@CPPFLAGS@ - CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@ --LIBS+=@LIBS@ -+LIBS+=@CRYPTLIB@ @LIBS@ - LDFLAGS=@LDFLAGS@ - - EXEEXT=@EXEEXT@ diff --git a/main/dropbear/dropbear-options_sftp-server_path.patch b/main/dropbear/dropbear-options_sftp-server_path.patch index c16466e3e8f..73b9d663b35 100644 --- a/main/dropbear/dropbear-options_sftp-server_path.patch +++ b/main/dropbear/dropbear-options_sftp-server_path.patch @@ -1,6 +1,6 @@ --- a/default_options.h +++ b/default_options.h -@@ -255,7 +255,7 @@ +@@ -296,7 +296,7 @@ * OpenSSH), set the path below and set DROPBEAR_SFTPSERVER. * The sftp-server program is not provided by Dropbear itself */ #define DROPBEAR_SFTPSERVER 1