From 58331d582a590654a3ef023a81f1d0fd2a228469 Mon Sep 17 00:00:00 2001 From: TBK Date: Fri, 6 Apr 2018 03:24:31 +0200 Subject: main/dropbear: upgrade to 2018.76 --- main/dropbear/APKBUILD | 10 ++++------ main/dropbear/dropbear-options_sftp-server_path.patch | 14 +++++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD index 7b24a20dc8a..688dbd76303 100644 --- a/main/dropbear/APKBUILD +++ b/main/dropbear/APKBUILD @@ -2,14 +2,13 @@ # Contributor: Carlo Landmeter # Maintainer: Natanael Copa pkgname=dropbear -pkgver=2017.75 -pkgrel=1 +pkgver=2018.76 +pkgrel=0 pkgdesc="small SSH 2 client/server designed for small memory environments" url="http://matt.ucc.asn.au/dropbear/dropbear.html" arch="all" license="MIT" depends="" -depends_dev="" options="!check" makedepends="zlib-dev linux-headers" subpackages="$pkgname-doc @@ -24,7 +23,6 @@ source="http://matt.ucc.asn.au/dropbear/releases/${pkgname}-${pkgver}.tar.bz2 dropbear-0.53.1-static_build_fix.patch dropbear-options_sftp-server_path.patch" -builddir="$srcdir"/$pkgname-$pkgver _progs="dropbear dropbearkey dbclient dropbearconvert scp" build() { @@ -78,8 +76,8 @@ _ssh() { ln -s /usr/bin/dbclient "$subpkgdir"/usr/bin/ssh } -sha512sums="9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4 dropbear-2017.75.tar.bz2 +sha512sums="82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e dropbear-2018.76.tar.bz2 9c55ab3d8b61955cde1ccc1b8acbd3d2ef123feb9489e92737304c35315d07b7f85fad8a12ac7b0ec2c1dcee3d76b8bc4aa18518f4ddd963917805db33e48826 dropbear.initd 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f dropbear.confd c9b0f28eb9653de21da4e8646fc27870a156112bce3d8a13baa6154ebf4baada3dee4f75bd5fdf5b6cd24a43fb80fb009e917d139d9e65d35118b082de0ebfbf dropbear-0.53.1-static_build_fix.patch -7fed3e2566f56f0445df185437afaddf7a029df0e4d5f265c1e97a89ce4a8d61b1b4aaae8ecaf25d94251fa9d14bb5b01b4cf7afa1a52289a4f8c7d042029d3c dropbear-options_sftp-server_path.patch" +e11456ec3bc7e1265727c8921a6eb6151712a9a498c7768e2d4b7f9043256099457cebf29b2d47dd61eb260746d97f4b19e9429443bda1c3e441ea50ced79b48 dropbear-options_sftp-server_path.patch" diff --git a/main/dropbear/dropbear-options_sftp-server_path.patch b/main/dropbear/dropbear-options_sftp-server_path.patch index 4262fdf2098..9eee8d4436d 100644 --- a/main/dropbear/dropbear-options_sftp-server_path.patch +++ b/main/dropbear/dropbear-options_sftp-server_path.patch @@ -1,11 +1,11 @@ ---- a/options.h -+++ b/options.h -@@ -289,7 +289,7 @@ - * OpenSSH), set the path below. If the path isn't defined, sftp will not - * be enabled */ - #ifndef SFTPSERVER_PATH +--- a/default_options.h ++++ b/default_options.h +@@ -250,7 +250,7 @@ + * OpenSSH), set the path below and set DROPBEAR_SFTPSERVER. + * The sftp-server program is not provided by Dropbear itself */ + #define DROPBEAR_SFTPSERVER 1 -#define SFTPSERVER_PATH "/usr/libexec/sftp-server" +#define SFTPSERVER_PATH "/usr/lib/ssh/sftp-server" - #endif /* This is used by the scp binary when used as a client binary. If you're + * not using the Dropbear client, you'll need to change it */ -- cgit v1.2.3