pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

felinks: Add SSL options rather than implicitly depending on OpenSSL



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Thu Jun 18 16:09:44 2020 +0100
Changeset:	c79f9ba7aa52ba67ebc9c7a6995e91a9d945c513

Modified Files:
	felinks/Makefile
Added Files:
	felinks/options.mk

Log Message:
felinks: Add SSL options rather than implicitly depending on OpenSSL

Default to GnuTLS since this is GPLv2 and incompatible with the
OpenSSL license...

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

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

diffstat:
 felinks/Makefile   |  2 +-
 felinks/options.mk | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diffs:
diff --git a/felinks/Makefile b/felinks/Makefile
index d6b0a54b91..d114656eb1 100644
--- a/felinks/Makefile
+++ b/felinks/Makefile
@@ -34,10 +34,10 @@ CONFIGURE_ARGS+=	--without-lua
 LIBS+=	-lexecinfo
 .endif
 
+.include "options.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/felinks/options.mk b/felinks/options.mk
new file mode 100644
index 0000000000..9d7d489cfd
--- /dev/null
+++ b/felinks/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.17 2019/11/04 22:09:53 rillig Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.felinks
+PKG_OPTIONS_REQUIRED_GROUPS=	tls
+PKG_OPTIONS_GROUP.tls=		gnutls openssl
+PKG_SUGGESTED_OPTIONS=		gnutls
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+=	--without-openssl
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+.endif


Home | Main Index | Thread Index | Old Index