aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorEivind Uggedal <eivind@uggedal.com>2015-09-08 11:14:04 +0000
committerEivind Uggedal <eivind@uggedal.com>2015-09-08 11:14:04 +0000
commite8f16803a06e013c242e66a6b1ae43aab3e35772 (patch)
treed2e5e817e4cfb278f506788805868ec578bfc6bc /main
parentd2a29bcd0f073d6cdd8e77653b49dded198f1bd6 (diff)
downloadaports-e8f16803a06e013c242e66a6b1ae43aab3e35772.tar.bz2
aports-e8f16803a06e013c242e66a6b1ae43aab3e35772.tar.xz
main/dropbear: fix sftp-server location
Our openssh package ships sftp-server as /usr/lib/ssh/sftp-server and not /usr/libexec/sftp-server as is the dropbear default.
Diffstat (limited to 'main')
-rw-r--r--main/dropbear/APKBUILD25
-rw-r--r--main/dropbear/dropbear-options_sftp-server_path.patch11
2 files changed, 28 insertions, 8 deletions
diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index b8e605cd54..2bc67ee91e 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=dropbear
pkgver=2015.68
-pkgrel=0
+pkgrel=1
pkgdesc="small SSH 2 client/server designed for small memory environments"
url="http://matt.ucc.asn.au/dropbear/dropbear.html"
arch="all"
@@ -11,9 +11,11 @@ depends=
makedepends="zlib-dev linux-headers"
subpackages="$pkgname-doc $pkgname-scp:_scp"
source="http://matt.ucc.asn.au/dropbear/releases/${pkgname}-${pkgver}.tar.bz2
-dropbear.initd
-dropbear.confd
-dropbear-0.53.1-static_build_fix.patch"
+ dropbear.initd
+ dropbear.confd
+ dropbear-0.53.1-static_build_fix.patch
+ dropbear-options_sftp-server_path.patch
+ "
_builddir="$srcdir"/$pkgname-$pkgver
_progs="dropbear dbclient dropbearkey dropbearconvert scp"
@@ -21,7 +23,11 @@ _progs="dropbear dbclient dropbearkey dropbearconvert scp"
prepare() {
cd "$_builddir"
update_config_sub || return 1
- patch -p1 -i "$srcdir"/dropbear-0.53.1-static_build_fix.patch
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
}
build() {
@@ -61,12 +67,15 @@ _scp() {
md5sums="7664ac10f7cc2301c530eb80c756fc5d dropbear-2015.68.tar.bz2
4299b86af9f2903f19477538e22ece30 dropbear.initd
af73c487e2be37d65d0e8bf80489357e dropbear.confd
-d33de2027d5dc851762b65b276f1ac83 dropbear-0.53.1-static_build_fix.patch"
+d33de2027d5dc851762b65b276f1ac83 dropbear-0.53.1-static_build_fix.patch
+7646c7b5367de26b0ed96e5674b63350 dropbear-options_sftp-server_path.patch"
sha256sums="55ea7c1e904ffe4b1cdbe1addca8291a2533d7d285fd22ac33608e9502a62446 dropbear-2015.68.tar.bz2
563a7f31e081f47418a45102b470d6754448ce421c28a48f0fdcf703046d5aa7 dropbear.initd
e891255a49d408eb11514662faa4d724a1df27cc2ee90268507dbd2573b67334 dropbear.confd
-c3bfdde97dc6306c8472d4b58fef874759a52d181eab1ef40363fec849a5d5d7 dropbear-0.53.1-static_build_fix.patch"
+c3bfdde97dc6306c8472d4b58fef874759a52d181eab1ef40363fec849a5d5d7 dropbear-0.53.1-static_build_fix.patch
+9d38a349cbe22b97a784eda19118e1e175093cfa30033047be5bc295a970aa81 dropbear-options_sftp-server_path.patch"
sha512sums="7725cd4077a3968684db3646f6013c6202977e79d281619e029366e45fca9c4e33e271812626237b6e33938eeb4c8b260902fe2b57cff085086bf930713a934a dropbear-2015.68.tar.bz2
9c55ab3d8b61955cde1ccc1b8acbd3d2ef123feb9489e92737304c35315d07b7f85fad8a12ac7b0ec2c1dcee3d76b8bc4aa18518f4ddd963917805db33e48826 dropbear.initd
83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f dropbear.confd
-c9b0f28eb9653de21da4e8646fc27870a156112bce3d8a13baa6154ebf4baada3dee4f75bd5fdf5b6cd24a43fb80fb009e917d139d9e65d35118b082de0ebfbf dropbear-0.53.1-static_build_fix.patch"
+c9b0f28eb9653de21da4e8646fc27870a156112bce3d8a13baa6154ebf4baada3dee4f75bd5fdf5b6cd24a43fb80fb009e917d139d9e65d35118b082de0ebfbf dropbear-0.53.1-static_build_fix.patch
+7fed3e2566f56f0445df185437afaddf7a029df0e4d5f265c1e97a89ce4a8d61b1b4aaae8ecaf25d94251fa9d14bb5b01b4cf7afa1a52289a4f8c7d042029d3c 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
new file mode 100644
index 0000000000..4262fdf209
--- /dev/null
+++ b/main/dropbear/dropbear-options_sftp-server_path.patch
@@ -0,0 +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
+-#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