ctrlproxy: fix SSL support

5 files changed, 52 insertions, 14 deletions

diff --git a/chat/ctrlproxy/Makefile b/chat/ctrlproxy/Makefile
index 015980c4779..78ee27c89ac 100644
--- a/chat/ctrlproxy/Makefile
+++ b/chat/ctrlproxy/Makefile
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.16 2021/04/21 13:24:25 adam Exp $
+# $NetBSD: Makefile,v 1.17 2021/05/15 11:54:48 nia Exp $
 #
 
 DISTNAME=		ctrlproxy-3.0.8
-PKGREVISION=		11
+PKGREVISION=		12
 CATEGORIES=		chat
 MASTER_SITES=		http://www.ctrlproxy.org/releases/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.ctrlproxy.org/
 COMMENT=		Detachable internet relay chat proxy server
+LICENSE=		gnu-gpl-v3
 
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config gmake
+USE_LANGUAGES=		c99
 GNU_CONFIGURE=		yes
 PKG_SYSCONFSUBDIR=	ctrlproxy
 
@@ -36,4 +38,5 @@ post-install:
 		${DESTDIR}${PREFIX}/share/examples/ctrlproxy/config.example
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/ctrlproxy/distinfo b/chat/ctrlproxy/distinfo
index 40fb2c88590..cb6464d649c 100644
--- a/chat/ctrlproxy/distinfo
+++ b/chat/ctrlproxy/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 01:20:18 agc Exp $
+$NetBSD: distinfo,v 1.3 2021/05/15 11:54:48 nia Exp $
 
 SHA1 (ctrlproxy-3.0.8.tar.gz) = 4999ba32e2f8eed95c0f30bebc0d72ae55cf76aa
 RMD160 (ctrlproxy-3.0.8.tar.gz) = f2dcf9a16172f9a2f8e34d0987e2be87d35c7607
 SHA512 (ctrlproxy-3.0.8.tar.gz) = 241f227eaae864a43846cf90bb3c41e7ff2423224f92b214d19f681cd1fbdee73c1edfde06ecd6ab0df2061e1386b370c66905a797ab3e3f92382f886698520c
 Size (ctrlproxy-3.0.8.tar.gz) = 277083 bytes
-SHA1 (patch-aa) = c21ee7933b80e30db19b79afaa8d6b6186f04017
+SHA1 (patch-Makefile) = e42074951158b4d35704725c115ad17eee8a8200
+SHA1 (patch-src_gnutls.c) = 735747cf2b344b3821d9d5a32aaf73d0d3586d56
diff --git a/chat/ctrlproxy/options.mk b/chat/ctrlproxy/options.mk
index 696754168a9..273ce101d83 100644
--- a/chat/ctrlproxy/options.mk
+++ b/chat/ctrlproxy/options.mk
@@ -1,18 +1,11 @@
-# $NetBSD: options.mk,v 1.2 2015/11/07 20:28:30 dholland Exp $
+# $NetBSD: options.mk,v 1.3 2021/05/15 11:54:48 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ctrlproxy
 
-PKG_SUPPORTED_OPTIONS=	ssl gssapi
+PKG_SUPPORTED_OPTIONS=	gssapi
 
 .include "../../mk/bsd.options.mk"
 
-###
-### Build in SSL support via gnutls
-###
-.if !empty(PKG_OPTIONS:Mssl)
-.include "../../security/gnutls/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mgssapi)
 .include "../../mk/krb5.buildlink3.mk"
 .else
diff --git a/chat/ctrlproxy/patches/patch-aa b/chat/ctrlproxy/patches/patch-Makefile
index 46a0799563b..bba59620e34 100644
--- a/chat/ctrlproxy/patches/patch-aa
+++ b/chat/ctrlproxy/patches/patch-Makefile
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/04 01:05:46 adrianp Exp $
+$NetBSD: patch-Makefile,v 1.1 2021/05/15 11:54:48 nia Exp $
+
+Allow pkgsrc to take care of installing config files.
 
 --- Makefile.orig	2008-12-06 17:36:33.000000000 +0000
 +++ Makefile
diff --git a/chat/ctrlproxy/patches/patch-src_gnutls.c b/chat/ctrlproxy/patches/patch-src_gnutls.c
new file mode 100644
index 00000000000..db73b2f0f36
--- /dev/null
+++ b/chat/ctrlproxy/patches/patch-src_gnutls.c
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_gnutls.c,v 1.1 2021/05/15 11:54:48 nia Exp $
+
+Fix building with newer GnuTLS. From FreeBSD Ports.
+
+--- src/gnutls.c.orig	2008-12-06 17:36:33.000000000 +0000
++++ src/gnutls.c
+@@ -18,7 +18,6 @@
+ 
+ #include <glib.h>
+ 
+-#include <gcrypt.h>
+ #include <gnutls/gnutls.h>
+ #include <gnutls/x509.h>
+ 
+@@ -47,11 +46,11 @@ typedef struct {
+ static gboolean
+ verify_certificate (gnutls_session session, const char *hostname, GError **err)
+ {
+-	int status;
++	int res, status;
+ 
+-	status = gnutls_certificate_verify_peers (session);
++	res = gnutls_certificate_verify_peers2 (session, &status);
+ 
+-	if (status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
++	if (res < 0 || status == GNUTLS_E_NO_CERTIFICATE_FOUND) {
+ 		g_set_error (err, SSL_ERROR,
+ 			     SSL_ERROR_CERTIFICATE,
+ 			     "No SSL certificate was sent.");
+@@ -452,9 +451,6 @@ static gboolean gnutls_inited = FALSE;
+ static void
+ _gnutls_init (void)
+ {
+-	/* to disallow usage of the blocking /dev/random */
+-	gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+-
+ 	gnutls_global_init ();
+ 	gnutls_inited = TRUE;
+ }