diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-08-31 15:05:18 -0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-09-03 15:49:13 +0000 |
| commit | 6abaf9389bf3f7877189e02957b8a943081201c7 (patch) | |
| tree | d87ebcbd2e5a8fd2b619f35b37ef04a174358e21 | |
| parent | 8aa001e3d89b6699a8da6765c12fab9140c26f7e (diff) | |
| download | aports-6abaf9389bf3f7877189e02957b8a943081201c7.tar.bz2 aports-6abaf9389bf3f7877189e02957b8a943081201c7.tar.xz | |
main/libssh: upgrade to 0.9.0
| -rw-r--r-- | main/libssh/APKBUILD | 8 | ||||
| -rw-r--r-- | main/libssh/fix-unittests-torture_config.patch | 35 |
2 files changed, 3 insertions, 40 deletions
diff --git a/main/libssh/APKBUILD b/main/libssh/APKBUILD index 13959004bb..4c985dd2d3 100644 --- a/main/libssh/APKBUILD +++ b/main/libssh/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libssh -pkgver=0.8.7 +pkgver=0.9.0 pkgrel=0 pkgdesc="Library for accessing ssh client services through C libraries" url="https://www.libssh.org" @@ -12,13 +12,12 @@ makedepends="$depends_dev cmake doxygen" checkdepends="cmocka-dev" subpackages="$pkgname-dev" source="https://www.libssh.org/files/${pkgver%.*}/libssh-$pkgver.tar.xz - fix-unittests-torture_config.patch " -builddir="$srcdir"/$pkgname-$pkgver # secfixes: # 0.7.6-r0: # - CVE-2018-10933 + build() { cd "$builddir" mkdir build && cd build @@ -40,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="13c3dccad81d521edf29c8a5e2c5f7fdd90507a0eda652b2b040a0a17bab88860873e089a46e181907ea3f449ca1847b1c84453b1960f456e391eefe5be983c5 libssh-0.8.7.tar.xz -e1f735492d5e847de218790a92c1ce4591e1ed7b8c31805829acbcd90729842d65d8e20676c02e7567be7a64f9565b8d3fc326339e099054dc880763c9e07f97 fix-unittests-torture_config.patch" +sha512sums="8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865 libssh-0.9.0.tar.xz" diff --git a/main/libssh/fix-unittests-torture_config.patch b/main/libssh/fix-unittests-torture_config.patch deleted file mode 100644 index ba13385660..0000000000 --- a/main/libssh/fix-unittests-torture_config.patch +++ /dev/null @@ -1,35 +0,0 @@ -Has been fixed in master with https://bugs.libssh.org/rLIBSSH1f43b52117fc97eef95e3627517cadb531b2b43e - -Can be removed as of next release (0.8.7+) - ---- a/tests/unittests/torture_config.c -+++ b/tests/unittests/torture_config.c -@@ -208,16 +208,16 @@ - static void torture_config_glob(void **state) { - ssh_session session = *state; - int ret; --#ifdef HAVE_GLOB -+#if defined(HAVE_GLOB) && defined(HAVE_GLOB_GL_FLAGS_MEMBER) - char *v; --#endif -+#endif /* HAVE_GLOB && HAVE_GLOB_GL_FLAGS_MEMBER */ - - ret = ssh_config_parse_file(session, LIBSSH_TESTCONFIG5); - assert_true(ret == 0); /* non-existing files should not error */ - - /* Test the variable presence */ - --#ifdef HAVE_GLOB -+#if defined(HAVE_GLOB) && defined(HAVE_GLOB_GL_FLAGS_MEMBER) - ret = ssh_options_get(session, SSH_OPTIONS_PROXYCOMMAND, &v); - assert_true(ret == 0); - assert_non_null(v); -@@ -231,7 +231,7 @@ - - assert_string_equal(v, ID_FILE); - SSH_STRING_FREE_CHAR(v); --#endif /* HAVE_GLOB */ -+#endif /* HAVE_GLOB && HAVE_GLOB_GL_FLAGS_MEMBER */ - } - - /** |