update to libssh-0.8.4
this addresses https://www.libssh.org/security/advisories/CVE-2018-10933.txt ok rpointel@ (MAINTAINER)
This commit is contained in:
jasper
parent
05b8810e3f
commit
ec6db39f19
@ -1,15 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2018/06/26 20:45:41 rsadowski Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2018/10/23 19:28:18 jasper Exp $
|
||||
|
||||
COMMENT = C library implementing server and client side
|
||||
DISTNAME = libssh-0.7.5
|
||||
DISTNAME = libssh-0.8.4
|
||||
|
||||
SHARED_LIBS += ssh 3.0 # 4.5
|
||||
SHARED_LIBS += ssh_threads 2.0 # 4.5
|
||||
SHARED_LIBS += ssh 4.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 <rpointel@openbsd.org>
|
||||
@ -26,6 +25,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>
|
||||
|
||||
@ -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.4.tar.xz) = a7B3EwIahYa6ISCyw2xGjcmsgJbQQ/mxcmY5qkJ1uBs=
|
||||
SIZE (libssh-0.8.4.tar.xz) = 425848
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-ConfigureChecks_cmake,v 1.2 2017/09/21 17:07:52 rsadowski Exp $
|
||||
$OpenBSD: patch-ConfigureChecks_cmake,v 1.3 2018/10/23 19:28:18 jasper Exp $
|
||||
|
||||
Index: ConfigureChecks.cmake
|
||||
--- ConfigureChecks.cmake.orig
|
||||
+++ ConfigureChecks.cmake
|
||||
@@ -205,7 +205,7 @@ check_c_source_compiles("
|
||||
@@ -259,7 +259,7 @@ check_c_source_compiles("
|
||||
__thread int tls;
|
||||
|
||||
int main(void) {
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-cmake_Modules_DefineCompilerFlags_cmake,v 1.3 2014/03/09 20:41:14 rpointel Exp $
|
||||
|
||||
Check for compiler flags not available with gcc < 4.
|
||||
|
||||
--- cmake/Modules/DefineCompilerFlags.cmake.orig Sat Dec 21 18:37:12 2013
|
||||
+++ cmake/Modules/DefineCompilerFlags.cmake Wed Jan 8 14:00:39 2014
|
||||
@@ -11,9 +11,14 @@ if (UNIX AND NOT WIN32)
|
||||
|
||||
# add -Wconversion ?
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
|
||||
+
|
||||
+ check_c_compiler_flag("-Wdeclaration-after-statement" WITH_WDECL)
|
||||
+ if (WITH_WDECL)
|
||||
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeclaration-after-statement")
|
||||
+ endif (WITH_WDECL)
|
||||
|
||||
# with -fPIC
|
||||
check_c_compiler_flag("-fPIC" WITH_FPIC)
|
||||
@ -1,14 +1,14 @@
|
||||
$OpenBSD: patch-tests_unittests_torture_misc_c,v 1.3 2017/05/11 00:21:50 espie Exp $
|
||||
$OpenBSD: patch-tests_unittests_torture_misc_c,v 1.4 2018/10/23 19:28:18 jasper Exp $
|
||||
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),
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2015/11/04 19:19:20 rpointel Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.7 2018/10/23 19:28:18 jasper Exp $
|
||||
include/libssh/
|
||||
include/libssh/callbacks.h
|
||||
include/libssh/legacy.h
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user