On 08/15/18 09:01, Remi Pointel wrote:
Hi,
this diff updates libssh to latest release.
With the correct diff.
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/libssh/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile 26 Jun 2018 20:45:41 -0000 1.17
+++ Makefile 15 Aug 2018 07:04:29 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.17 2018/06/26 20:45:41 rsadowski Exp $
COMMENT = C library implementing server and client side
-DISTNAME = libssh-0.7.5
+DISTNAME = libssh-0.8.1
SHARED_LIBS += ssh 3.0 # 4.5
SHARED_LIBS += ssh_threads 2.0 # 4.5
@@ -9,7 +9,7 @@ SHARED_LIBS += ssh_threads 2.0 # 4.5
CATEGORIES = security devel
HOMEPAGE = https://www.libssh.org/
-MASTER_SITES = https://www.libssh.org/files/0.7/
+MASTER_SITES = https://www.libssh.org/files/0.8/
EXTRACT_SUFX = .tar.xz
MAINTAINER = Remi Pointel <[email protected]>
@@ -26,6 +26,6 @@ WRKBUILD = ${WRKDIST}/build
BUILD_DEPENDS = devel/cmocka \
devel/argp-standalone
-CONFIGURE_ARGS += -DWITH_TESTING=ON
+CONFIGURE_ARGS += -DUNIT_TESTING=ON
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/libssh/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 21 Sep 2017 17:07:52 -0000 1.12
+++ distinfo 15 Aug 2018 07:04:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (libssh-0.7.5.tar.xz) = VOht1dwg5TZ+WPPKqzN843Z1+GP4DfhbaxYUlmozcJU=
-SIZE (libssh-0.7.5.tar.xz) = 351632
+SHA256 (libssh-0.8.1.tar.xz) = 0X8SZ7Sl5GwPvmbTmj5wK4zv54iSjy624zmhi7ALGSQ=
+SIZE (libssh-0.8.1.tar.xz) = 409572
Index: patches/patch-ConfigureChecks_cmake
===================================================================
RCS file: /cvs/ports/security/libssh/patches/patch-ConfigureChecks_cmake,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-ConfigureChecks_cmake
--- patches/patch-ConfigureChecks_cmake 21 Sep 2017 17:07:52 -0000 1.2
+++ patches/patch-ConfigureChecks_cmake 15 Aug 2018 07:04:29 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-ConfigureChecks_cmake,v
Index: ConfigureChecks.cmake
--- ConfigureChecks.cmake.orig
+++ ConfigureChecks.cmake
-@@ -205,7 +205,7 @@ check_c_source_compiles("
+@@ -257,7 +257,7 @@ check_c_source_compiles("
__thread int tls;
int main(void) {
Index: patches/patch-tests_unittests_torture_misc_c
===================================================================
RCS file: /cvs/ports/security/libssh/patches/patch-tests_unittests_torture_misc_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-tests_unittests_torture_misc_c
--- patches/patch-tests_unittests_torture_misc_c 11 May 2017 00:21:50 -0000 1.3
+++ patches/patch-tests_unittests_torture_misc_c 15 Aug 2018 07:04:29 -0000
@@ -2,13 +2,13 @@ $OpenBSD: patch-tests_unittests_torture_
Index: tests/unittests/torture_misc.c
--- tests/unittests/torture_misc.c.orig
+++ tests/unittests/torture_misc.c
-@@ -209,7 +209,8 @@ int torture_run_tests(void) {
+@@ -361,7 +361,8 @@ int torture_run_tests(void) {
#ifdef _WIN32
- unit_test(torture_path_expand_tilde_win),
+ cmocka_unit_test(torture_path_expand_tilde_win),
#else
-- unit_test(torture_path_expand_tilde_unix),
+- cmocka_unit_test(torture_path_expand_tilde_unix),
+ /* failed with our make regress ("env -i"), need a real user to be tested.
+ unit_test(torture_path_expand_tilde_unix), */
#endif
- unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
- unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
+ cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
+ cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/libssh/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 4 Nov 2015 19:19:20 -0000 1.6
+++ pkg/PLIST 15 Aug 2018 07:04:29 -0000
@@ -11,9 +11,5 @@ lib/cmake/
lib/cmake/libssh/
lib/cmake/libssh/libssh-config-version.cmake
lib/cmake/libssh/libssh-config.cmake
-lib/libssh.a
@lib lib/libssh.so.${LIBssh_VERSION}
-lib/libssh_threads.a
-@lib lib/libssh_threads.so.${LIBssh_threads_VERSION}
lib/pkgconfig/libssh.pc
-lib/pkgconfig/libssh_threads.pc
