diff options
| author | Max Rees <maxcrees@me.com> | 2019-06-21 00:39:56 -0400 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2019-06-21 00:39:56 -0400 |
| commit | 63771aaa77f749ca07d33421525d8bd23ff9d980 (patch) | |
| tree | f5bca1bd9149026b86d4c0201b1fb91d87b18d87 | |
| parent | 421b6db974a64db7579e186b84b33f44dc0197ba (diff) | |
| download | packages-63771aaa77f749ca07d33421525d8bd23ff9d980.tar.gz packages-63771aaa77f749ca07d33421525d8bd23ff9d980.tar.bz2 packages-63771aaa77f749ca07d33421525d8bd23ff9d980.tar.xz packages-63771aaa77f749ca07d33421525d8bd23ff9d980.zip | |
Merge user/libssh2 into system/libssh2
| -rw-r--r-- | system/libssh2/APKBUILD | 18 | ||||
| -rw-r--r-- | user/libssh2/APKBUILD | 40 |
2 files changed, 7 insertions, 51 deletions
diff --git a/system/libssh2/APKBUILD b/system/libssh2/APKBUILD index 9f5b9c683..69989c72f 100644 --- a/system/libssh2/APKBUILD +++ b/system/libssh2/APKBUILD @@ -1,21 +1,16 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libssh2 -pkgver=1.8.0 -pkgrel=2 -pkgdesc="library for accessing ssh1/ssh2 protocol servers" +pkgver=1.8.2 +pkgrel=0 +pkgdesc="Library for accessing SSH servers" url="https://libssh2.org/" arch="all" license="BSD-3-Clause" makedepends="openssl-dev zlib-dev" -subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc" +subpackages="$pkgname-dev $pkgname-doc" source="https://www.libssh2.org/download/libssh2-$pkgver.tar.gz" -prepare() { - update_config_sub - default_prepare -} - build() { ./configure \ --build=$CBUILD \ @@ -24,7 +19,8 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --localstatedir=/var + --localstatedir=/var \ + --disable-rpath make } @@ -36,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558 libssh2-1.8.0.tar.gz" +sha512sums="390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93 libssh2-1.8.2.tar.gz" diff --git a/user/libssh2/APKBUILD b/user/libssh2/APKBUILD deleted file mode 100644 index cb6e11f97..000000000 --- a/user/libssh2/APKBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> -# Maintainer: -pkgname=libssh2 -pkgver=1.8.2 -pkgrel=0 -pkgdesc="Library for accessing SSH servers" -url="https://libssh2.org/" -arch="all" -options="!check" # Requires deprecated UsePrivilegeSeparation option. -license="BSD-3-Clause" -makedepends_host="openssl-dev zlib-dev" -subpackages="$pkgname-dev $pkgname-doc" -source="https://libssh2.org/download/libssh2-$pkgver.tar.gz" - -build() { - cd "$builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --with-libssl-prefix="${CBUILDROOT}"/usr \ - --disable-rpath - make -} - -check() { - cd "$builddir" - make check -} - -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install -} - -sha512sums="390ab4ad93bb738415ec11a6eb92806c9b9e9e5d8ee7c442d841a58b4292c1c447a9bc99e153ba464e2e11f9c0d1913469303598c3046722d1ae821991e8cb93 libssh2-1.8.2.tar.gz" |