CVS commit: pkgsrc/security/libssh

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Jun 13 17:54:44 UTC 2023

Modified Files:
        pkgsrc/security/libssh: Makefile buildlink3.mk options.mk

Log Message:
libssh: add 'gssapi' option, enabled (as before) by default. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/security/libssh/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/security/libssh/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/security/libssh/options.mk

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

Modified files:

Index: pkgsrc/security/libssh/Makefile
diff -u pkgsrc/security/libssh/Makefile:1.46 pkgsrc/security/libssh/Makefile:1.47
--- pkgsrc/security/libssh/Makefile:1.46        Sun May  7 10:21:56 2023
+++ pkgsrc/security/libssh/Makefile     Tue Jun 13 17:54:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2023/05/07 10:21:56 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2023/06/13 17:54:44 schmonz Exp $
 #
 # history: upstream renamed 0.11 to 0.1.1;
 # we have to use the old-style convention so that version compares work.
@@ -6,6 +6,7 @@
 VER=           0.10.5
 DISTNAME=      libssh-${VER}
 PKGNAME=       libssh-0.105
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  https://www.libssh.org/files/${VER:R}/
 EXTRACT_SUFX=  .tar.xz
@@ -36,5 +37,4 @@ BUILDLINK_DEPMETHOD.argp=  build
 BUILDLINK_DEPMETHOD.cmocka=  build
 .include "../../devel/cmocka/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/krb5.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/libssh/buildlink3.mk
diff -u pkgsrc/security/libssh/buildlink3.mk:1.23 pkgsrc/security/libssh/buildlink3.mk:1.24
--- pkgsrc/security/libssh/buildlink3.mk:1.23   Sat Apr 15 21:36:14 2023
+++ pkgsrc/security/libssh/buildlink3.mk        Tue Jun 13 17:54:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2023/04/15 21:36:14 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2023/06/13 17:54:44 schmonz Exp $
 
 BUILDLINK_TREE+=       libssh
 
@@ -12,12 +12,15 @@ BUILDLINK_PKGSRCDIR.libssh?=        ../../secur
 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"
-.include "../../mk/krb5.buildlink3.mk"
 .endif # LIBSSH_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libssh

Index: pkgsrc/security/libssh/options.mk
diff -u pkgsrc/security/libssh/options.mk:1.5 pkgsrc/security/libssh/options.mk:1.6
--- pkgsrc/security/libssh/options.mk:1.5       Sat Jan 25 10:45:11 2020
+++ pkgsrc/security/libssh/options.mk   Tue Jun 13 17:54:44 2023
@@ -1,12 +1,20 @@
-# $NetBSD: options.mk,v 1.5 2020/01/25 10:45:11 jperkin Exp $
+# $NetBSD: options.mk,v 1.6 2023/06/13 17:54:44 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.libssh
+PKG_SUPPORTED_OPTIONS=         gssapi
 PKG_OPTIONS_REQUIRED_GROUPS=   crypto
 PKG_OPTIONS_GROUP.crypto=      openssl libgcrypt
-PKG_SUGGESTED_OPTIONS=         openssl
+PKG_SUGGESTED_OPTIONS=         gssapi openssl
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mgssapi)
+CMAKE_ARGS+=           -DWITH_GSSAPI:BOOL=ON
+.include "../../mk/krb5.buildlink3.mk"
+.else
+CMAKE_ARGS+=           -DWITH_GSSAPI:BOOL=OFF
+.endif
+
 .if !empty(PKG_OPTIONS:Mopenssl)
 CMAKE_ARGS+=           -DWITH_GCRYPT:BOOL=OFF
 .include "../../security/openssl/buildlink3.mk"