main/dropbear: fix contributor email address v1 PROPOSED

Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.alpinelinux.org/~alpine/aports/%3C1445780660-2520-1-git-send-email-soeren+git%40soeren-tempel.net%3E/mbox | git am -3
Learn more about email & git

[alpine-aports] [PATCH 1/3] main/dropbear: fix contributor email address Export this patch

Sören Tempel
---
 main/dropbear/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 2bc67ee..49dd67c 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Carlo Landmeter <clandmeter at gmail>
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dropbear
 pkgver=2015.68
-- 
2.6.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 2/3] main/dropbear: use configure options from newapkbuild autoconf template Export this patch

Sören Tempel
---
 main/dropbear/APKBUILD | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index 49dd67c..bbbff79 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -1,3 +1,4 @@
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dropbear
@@ -6,16 +7,16 @@ pkgrel=1
 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=
+license="MIT"
+depends=""
+depends_dev=""
 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-options_sftp-server_path.patch
-	"
+	dropbear-options_sftp-server_path.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 _progs="dropbear dbclient dropbearkey dropbearconvert scp"
@@ -36,6 +37,10 @@ build() {
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
 		|| return 1
 	make PROGRAMS="$_progs" MULTI=1 || return 1
 }
-- 
2.6.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 3/3] main/dropbear: make scp subpackage conflict with openssh-client Export this patch

Sören Tempel
---
 main/dropbear/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index bbbff79..281a97b 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dropbear
 pkgver=2015.68
-pkgrel=1
+pkgrel=2
 pkgdesc="small SSH 2 client/server designed for small memory environments"
 url="http://matt.ucc.asn.au/dropbear/dropbear.html"
 arch="all"
@@ -63,7 +63,7 @@ package() {
 
 _scp() {
 	pkgdesc="Dropbear scp support"
-	depends="dropbear"
+	depends="dropbear !openssh-client"
 	arch="noarch"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/scp "$subpkgdir"/usr/bin/
-- 
2.6.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
View this thread in the archives