[pkgsrc/trunk]: pkgsrc/chat/ctrlproxy ctrlproxy: fix SSL support

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bcdeac26010b
branches:  trunk
changeset: 452772:bcdeac26010b
user:      nia <nia%pkgsrc.org@localhost>
date:      Sat May 15 11:54:48 2021 +0000

description:
ctrlproxy: fix SSL support

diffstat:

 chat/ctrlproxy/Makefile                   |   7 +++-
 chat/ctrlproxy/distinfo                   |   5 ++-
 chat/ctrlproxy/options.mk                 |  11 +-------
 chat/ctrlproxy/patches/patch-Makefile     |  21 ++++++++++++++++
 chat/ctrlproxy/patches/patch-aa           |  19 ---------------
 chat/ctrlproxy/patches/patch-src_gnutls.c |  39 +++++++++++++++++++++++++++++++
 6 files changed, 70 insertions(+), 32 deletions(-)

diffs (160 lines):

diff -r 339c5342fc71 -r bcdeac26010b chat/ctrlproxy/Makefile
--- a/chat/ctrlproxy/Makefile   Sat May 15 11:45:52 2021 +0000
+++ b/chat/ctrlproxy/Makefile   Sat May 15 11:54:48 2021 +0000
@@ -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@localhost
 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 @@
                ${DESTDIR}${PREFIX}/share/examples/ctrlproxy/config.example
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 339c5342fc71 -r bcdeac26010b chat/ctrlproxy/distinfo
--- a/chat/ctrlproxy/distinfo   Sat May 15 11:45:52 2021 +0000
+++ b/chat/ctrlproxy/distinfo   Sat May 15 11:54:48 2021 +0000
@@ -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 -r 339c5342fc71 -r bcdeac26010b chat/ctrlproxy/options.mk
--- a/chat/ctrlproxy/options.mk Sat May 15 11:45:52 2021 +0000
+++ b/chat/ctrlproxy/options.mk Sat May 15 11:54:48 2021 +0000
@@ -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 -r 339c5342fc71 -r bcdeac26010b chat/ctrlproxy/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/ctrlproxy/patches/patch-Makefile     Sat May 15 11:54:48 2021 +0000
@@ -0,0 +1,21 @@
+$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
+@@ -190,10 +190,10 @@ uninstall-data::
+       -rmdir $(DESTDIR)$(sysconfdir)
+ 
+ install-data:
+-      $(INSTALL) -d $(DESTDIR)$(sysconfdir)
+-      $(INSTALL) -d $(DESTDIR)$(DEFAULT_CONFIG_DIR)
+-      $(INSTALL) -m 0644 motd $(DESTDIR)$(DEFAULT_CONFIG_DIR)
+-      $(INSTALL) -m 0644 config.default $(DESTDIR)$(DEFAULT_CONFIG_DIR)/config
++      #$(INSTALL) -d $(DESTDIR)$(sysconfdir)
++      #$(INSTALL) -d $(DESTDIR)$(DEFAULT_CONFIG_DIR)
++      #$(INSTALL) -m 0644 motd $(DESTDIR)$(DEFAULT_CONFIG_DIR)
++      #$(INSTALL) -m 0644 config.default $(DESTDIR)$(DEFAULT_CONFIG_DIR)/config
+ 
+ install-pkgconfig:
+       $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
diff -r 339c5342fc71 -r bcdeac26010b chat/ctrlproxy/patches/patch-aa
--- a/chat/ctrlproxy/patches/patch-aa   Sat May 15 11:45:52 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/04 01:05:46 adrianp Exp $
-
---- Makefile.orig      2008-12-06 17:36:33.000000000 +0000
-+++ Makefile
-@@ -190,10 +190,10 @@ uninstall-data::
-       -rmdir $(DESTDIR)$(sysconfdir)
- 
- install-data:
--      $(INSTALL) -d $(DESTDIR)$(sysconfdir)
--      $(INSTALL) -d $(DESTDIR)$(DEFAULT_CONFIG_DIR)
--      $(INSTALL) -m 0644 motd $(DESTDIR)$(DEFAULT_CONFIG_DIR)
--      $(INSTALL) -m 0644 config.default $(DESTDIR)$(DEFAULT_CONFIG_DIR)/config
-+      #$(INSTALL) -d $(DESTDIR)$(sysconfdir)
-+      #$(INSTALL) -d $(DESTDIR)$(DEFAULT_CONFIG_DIR)
-+      #$(INSTALL) -m 0644 motd $(DESTDIR)$(DEFAULT_CONFIG_DIR)
-+      #$(INSTALL) -m 0644 config.default $(DESTDIR)$(DEFAULT_CONFIG_DIR)/config
- 
- install-pkgconfig:
-       $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
diff -r 339c5342fc71 -r bcdeac26010b chat/ctrlproxy/patches/patch-src_gnutls.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/ctrlproxy/patches/patch-src_gnutls.c Sat May 15 11:54:48 2021 +0000
@@ -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;
+ }