aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2017-10-10 13:33:10 +0300
committerTimo Teräs <timo.teras@iki.fi>2017-10-10 13:35:52 +0300
commit7ced4e7ce4d24dc07f62e593e09762c2f77cd778 (patch)
tree64d99a8700f104f67062982cd063cb45e2ea2dd6
parent61d4fc18a12649178a385098bef8dd327feae4b8 (diff)
downloadaports-7ced4e7ce4d24dc07f62e593e09762c2f77cd778.tar.bz2
aports-7ced4e7ce4d24dc07f62e593e09762c2f77cd778.tar.xz
main/openssh: don't use _subpackages uninitialized
This confuses lua-ports' scanning of packages. _subpackages is also used in other aports, and not initializing it will cause lua-aports' scanning script to leak values from previous pkg. This caused lua-aports' to think openssh is dirty, but running abuild later thinks nothing was needed to be done.
-rw-r--r--main/openssh/APKBUILD9
1 files changed, 5 insertions, 4 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index ff6131eb31..d6699122e0 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -15,10 +15,8 @@ makedepends_build="linux-pam-dev"
makedepends_host="libressl-dev zlib-dev linux-headers"
makedepends="$makedepends_build $makedepends_host"
# Add more packages support here e.g. kerberos
+_pkgsupport=""
[ -z "$BOOTSTRAP" ] && _pkgsupport="pam"
-for _flavour in $_pkgsupport; do
- _subpackages="$_subpackages ${pkgname}-server-$_flavour:_pkg_flavour"
-done
subpackages="$pkgname-doc
$pkgname-keygen
$pkgname-client
@@ -26,8 +24,11 @@ subpackages="$pkgname-doc
$pkgname-sftp-server:sftp
$pkgname-server-common:server_common:noarch
$pkgname-server
- $_subpackages
"
+for _flavour in $_pkgsupport; do
+ subpackages="$subpackages ${pkgname}-server-$_flavour:_pkg_flavour"
+done
+
source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz
openssh7.4-peaktput.patch
openssh7.4-dynwindows.patch