libssh: remove, updated in pkgsrc

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libssh: remove, updated in pkgsrc
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Mon, 3 Aug 2026 19:43:29 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Aug 3 21:43:22 2026 +0200
Changeset:	dfa8b9657700c90f718f96b686184cda4fa42f48

Modified Files:
	Makefile
Removed Files:
	libssh/DESCR
	libssh/Makefile
	libssh/PLIST
	libssh/buildlink3.mk
	libssh/distinfo
	libssh/options.mk
	libssh/patches/patch-CompilerChecks.cmake
	libssh/patches/patch-examples_sshd__direct-tcpip.c
	libssh/patches/patch-tests_CMakeLists.txt
	libssh/patches/patch-tests_torture.c

Log Message:
libssh: remove, updated in pkgsrc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dfa8b9657700c90f718f96b686184cda4fa42f48

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |  1 -
 libssh/DESCR                                       |  4 ---
 libssh/Makefile                                    | 34 ----------------------
 libssh/PLIST                                       | 17 -----------
 libssh/buildlink3.mk                               | 26 -----------------
 libssh/distinfo                                    |  9 ------
 libssh/options.mk                                  | 33 ---------------------
 libssh/patches/patch-CompilerChecks.cmake          | 15 ----------
 libssh/patches/patch-examples_sshd__direct-tcpip.c | 17 -----------
 libssh/patches/patch-tests_CMakeLists.txt          | 18 ------------
 libssh/patches/patch-tests_torture.c               | 14 ---------
 11 files changed, 188 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 6eb2b05800..4e0f5332c2 100644
--- a/Makefile
+++ b/Makefile
@@ -2204,7 +2204,6 @@ SUBDIR+=	libsml
 SUBDIR+=	libsocialweb
 SUBDIR+=	libspnav
 SUBDIR+=	libspt
-SUBDIR+=	libssh
 SUBDIR+=	libstacktrace
 SUBDIR+=	libstrophe
 SUBDIR+=	libsysinfo
diff --git a/libssh/DESCR b/libssh/DESCR
deleted file mode 100644
index b88105b2d0..0000000000
--- a/libssh/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-libssh is a multiplatform C library implementing the SSHv2 and SSHv1 protocol
-on client and server side. With libssh, you can remotely execute programs,
-transfer files, use a secure and transparent tunnel for
-your remote applications.
diff --git a/libssh/Makefile b/libssh/Makefile
deleted file mode 100644
index 3cc8fdb04c..0000000000
--- a/libssh/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.59 2026/07/23 09:25:55 wiz Exp $
-
-DISTNAME=	libssh-0.12.1
-CATEGORIES=	security
-MASTER_SITES=	https://www.libssh.org/files/${PKGVERSION_NOREV:R}/
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	is%NetBSD.org@localhost
-HOMEPAGE=	https://www.libssh.org/
-COMMENT=	SSHv2+v1 protocol library
-LICENSE=	2-clause-bsd
-
-USE_LANGUAGES=		c c++
-PKGCONFIG_OVERRIDE+=	libssh.pc.cmake
-TEST_TARGET=		test
-
-CMAKE_CONFIGURE_ARGS+=	-DWITH_EXAMPLES=OFF
-
-CFLAGS.SunOS+=		-D_POSIX_PTHREAD_SEMANTICS
-LDFLAGS.SunOS+=		-lnsl -lsocket
-
-BUILDLINK_TRANSFORM+=	rm:-Werror=strict-overflow
-
-.include "options.mk"
-
-.include "../../devel/cmake/build.mk"
-# for examples only
-BUILDLINK_DEPMETHOD.argp=  build
-.include "../../devel/argp/buildlink3.mk"
-# for testing only
-BUILDLINK_DEPMETHOD.cmocka=  build
-.include "../../devel/cmocka/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libssh/PLIST b/libssh/PLIST
deleted file mode 100644
index bf85c8e551..0000000000
--- a/libssh/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.24 2026/07/23 09:25:55 wiz Exp $
-include/libssh/callbacks.h
-include/libssh/legacy.h
-include/libssh/libssh.h
-include/libssh/libssh_version.h
-include/libssh/libsshpp.hpp
-include/libssh/server.h
-include/libssh/sftp.h
-include/libssh/sftpserver.h
-include/libssh/ssh2.h
-lib/cmake/libssh/libssh-config-noconfig.cmake
-lib/cmake/libssh/libssh-config-version.cmake
-lib/cmake/libssh/libssh-config.cmake
-lib/libssh.so
-lib/libssh.so.4
-lib/libssh.so.4.11.1
-lib/pkgconfig/libssh.pc
diff --git a/libssh/buildlink3.mk b/libssh/buildlink3.mk
deleted file mode 100644
index 348cde8cf8..0000000000
--- a/libssh/buildlink3.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.28 2026/07/23 09:26:52 wiz Exp $
-
-BUILDLINK_TREE+=	libssh
-
-.if !defined(LIBSSH_BUILDLINK3_MK)
-LIBSSH_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libssh+=	libssh>=0.11.5<0.100
-BUILDLINK_ABI_DEPENDS.libssh?=	libssh>=0.11.5
-BUILDLINK_PKGSRCDIR.libssh?=	../../wip/libssh
-
-pkgbase := libssh
-.include "../../mk/pkg-build-options.mk"
-
-.if ${PKG_BUILD_OPTIONS.libssh:Mgssapi}
-.include "../../mk/krb5.buildlink3.mk"
-.endif
-
-.if ${PKG_BUILD_OPTIONS.libssh:Mopenssl}
-.include "../../security/openssl/buildlink3.mk"
-.endif
-
-.include "../../devel/zlib/buildlink3.mk"
-.endif # LIBSSH_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-libssh
diff --git a/libssh/distinfo b/libssh/distinfo
deleted file mode 100644
index 0ea0359c44..0000000000
--- a/libssh/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.36 2026/07/23 09:25:55 wiz Exp $
-
-BLAKE2s (libssh-0.12.1.tar.xz) = fa92a959e4afe5bac582c4599810724c7173ef08d679128c6a5507bef10fc7d5
-SHA512 (libssh-0.12.1.tar.xz) = 4702930a1005d08f171281eab8e1246661410c1f0d94ec5a370115ad72995ab31780e28c372913fb46ec7d8e2590d9176ee1a3c777c173135a82f74718a62694
-Size (libssh-0.12.1.tar.xz) = 756384 bytes
-SHA1 (patch-CompilerChecks.cmake) = 8a650be5b69e956a0a54f54b71c4927ce685b8ca
-SHA1 (patch-examples_sshd__direct-tcpip.c) = 62de8625d58dbc03c38b0eb23f6e7f20a46e91de
-SHA1 (patch-tests_CMakeLists.txt) = b5baa8db2161d3f1c7aab317b2919de5dbca6e6a
-SHA1 (patch-tests_torture.c) = 6db2304741af946d1acad2d37a1ebbf23afba0c0
diff --git a/libssh/options.mk b/libssh/options.mk
deleted file mode 100644
index 5fbb1bda59..0000000000
--- a/libssh/options.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: options.mk,v 1.8 2025/09/29 21:24:22 nia Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.libssh
-PKG_SUPPORTED_OPTIONS=		gssapi tests
-PKG_OPTIONS_REQUIRED_GROUPS=	crypto
-PKG_OPTIONS_GROUP.crypto=	openssl libgcrypt
-PKG_SUGGESTED_OPTIONS=		gssapi openssl
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgssapi)
-CMAKE_CONFIGURE_ARGS+=		-DWITH_GSSAPI:BOOL=ON
-.include "../../mk/krb5.buildlink3.mk"
-.else
-CMAKE_CONFIGURE_ARGS+=		-DWITH_GSSAPI:BOOL=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Mopenssl)
-CMAKE_CONFIGURE_ARGS+=		-DWITH_GCRYPT:BOOL=OFF
-.include "../../security/openssl/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mlibgcrypt)
-BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.4
-CMAKE_CONFIGURE_ARGS+=		-DWITH_GCRYPT:BOOL=ON
-.include "../../security/libgcrypt/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mtests)
-CMAKE_CONFIGURE_ARGS+=		-DUNIT_TESTING=ON
-.else
-CMAKE_CONFIGURE_ARGS+=		-DUNIT_TESTING=OFF
-.endif
diff --git a/libssh/patches/patch-CompilerChecks.cmake b/libssh/patches/patch-CompilerChecks.cmake
deleted file mode 100644
index 6b008f1095..0000000000
--- a/libssh/patches/patch-CompilerChecks.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-CompilerChecks.cmake,v 1.4 2025/01/07 05:56:17 pho Exp $
-
-Fix build with option libgcrypt: src/libgcrypt/libgcrypt.c fails to compile
-with -Werror=unused-variable.
-
---- CompilerChecks.cmake.orig	2025-01-07 05:51:07.479870562 +0000
-+++ CompilerChecks.cmake
-@@ -48,7 +48,6 @@ if (UNIX)
-     add_c_compiler_flag("-Werror=implicit-int" SUPPORTED_COMPILER_FLAGS)
-     add_c_compiler_flag("-Wint-conversion" SUPPORTED_COMPILER_FLAGS)
-     add_c_compiler_flag("-Werror=int-conversion" SUPPORTED_COMPILER_FLAGS)
--    add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS)
- 
-     check_c_compiler_flag("-Wformat" REQUIRED_FLAGS_WFORMAT)
-     if (REQUIRED_FLAGS_WFORMAT)
diff --git a/libssh/patches/patch-examples_sshd__direct-tcpip.c b/libssh/patches/patch-examples_sshd__direct-tcpip.c
deleted file mode 100644
index ffa93b7b59..0000000000
--- a/libssh/patches/patch-examples_sshd__direct-tcpip.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-examples_sshd__direct-tcpip.c,v 1.1 2020/07/20 15:56:24 micha Exp $
-
-Build fix:
-Include header files with declarations for struct sockaddr_in and send().
-
---- examples/sshd_direct-tcpip.c.orig	2020-01-27 15:45:32.000000000 +0000
-+++ examples/sshd_direct-tcpip.c
-@@ -20,6 +20,9 @@ clients must be made or how a client sho
- 
- #include "config.h"
- 
-+#include <netinet/in.h>  /* For struct sockaddr_in */
-+#include <sys/socket.h>  /* For send() */
-+
- #include <libssh/libssh.h>
- #include <libssh/server.h>
- #include <libssh/callbacks.h>
diff --git a/libssh/patches/patch-tests_CMakeLists.txt b/libssh/patches/patch-tests_CMakeLists.txt
deleted file mode 100644
index 8945d34970..0000000000
--- a/libssh/patches/patch-tests_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tests_CMakeLists.txt,v 1.3 2026/03/17 19:33:33 bsiegert Exp $
-
-* OpenSSH 10 support
-* Search for sshd also in /usr/lib/ssh where it is located
-  in SunOS/SmartOS.
-
---- tests/CMakeLists.txt.orig	2026-02-10 09:47:00.000000000 +0000
-+++ tests/CMakeLists.txt
-@@ -192,7 +192,8 @@ find_program(SSHD_EXECUTABLE
-              PATHS
-                 /sbin
-                 /usr/sbin
--                /usr/local/sbin)
-+                /usr/local/sbin
-+                /usr/lib/ssh)
- 
- if (WITH_PKCS11_URI)
-     find_package(softhsm)
diff --git a/libssh/patches/patch-tests_torture.c b/libssh/patches/patch-tests_torture.c
deleted file mode 100644
index 101d1c5c49..0000000000
--- a/libssh/patches/patch-tests_torture.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-tests_torture.c,v 1.1 2020/01/06 12:04:13 pho Exp $
-
-Fix build on NetBSD 8.1: Don't try to use PATH_MAX without #include <limits.h>
-
---- tests/torture.c.orig	2026-07-16 10:48:05.000000000 +0000
-+++ tests/torture.c
-@@ -24,6 +24,7 @@
- #include "config.h"
- #include "tests_config.h"
- #include <fcntl.h>
-+#include <limits.h>
- #include <signal.h>
- #include <stdio.h>
- #include <stdlib.h>
Prev by Date: libssh: finish update
Next by Date: tfkiss: Drop empty line before LICENSE
Previous by Thread: libssh: finish update
Next by Thread: tfkiss: Drop empty line before LICENSE
Indexes:
Home | Main Index | Thread Index | Old Index