summaryrefslogtreecommitdiff
path: root/security/libprelude
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2022-08-22 22:59:07 +0000
committertnn <tnn@pkgsrc.org>2022-08-22 22:59:07 +0000
commitdabc0cbdc331bca93382d1662ee96876043e0e02 (patch)
tree045dd7ad43d000bf8bd5f1c2922dd261399eb6cd /security/libprelude
parent569813dfb57d330bd4cc4bbc499cb5df8f0582d8 (diff)
downloadpkgsrc-dabc0cbdc331bca93382d1662ee96876043e0e02.tar.gz
prelude: remove from pkgsrc
prelude is unmaintained in pkgsrc since 2009 and is several major versions behind. This makes it useless for it's intended purpose as an intrusion detection system. Can be revived if/when there is an interested maintainer. But it's probably easier to start from scratch given how stale these packages were.
Diffstat (limited to 'security/libprelude')
-rw-r--r--security/libprelude/DESCR8
-rw-r--r--security/libprelude/Makefile40
-rw-r--r--security/libprelude/Makefile.common59
-rw-r--r--security/libprelude/PLIST121
-rw-r--r--security/libprelude/buildlink3.mk16
-rw-r--r--security/libprelude/distinfo25
-rw-r--r--security/libprelude/patches/patch-aa90
-rw-r--r--security/libprelude/patches/patch-ab12
-rw-r--r--security/libprelude/patches/patch-ac13
-rw-r--r--security/libprelude/patches/patch-ad14
-rw-r--r--security/libprelude/patches/patch-ae13
-rw-r--r--security/libprelude/patches/patch-ag22
-rw-r--r--security/libprelude/patches/patch-ah15
-rw-r--r--security/libprelude/patches/patch-ai22
-rw-r--r--security/libprelude/patches/patch-aj13
-rw-r--r--security/libprelude/patches/patch-ak22
-rw-r--r--security/libprelude/patches/patch-al13
-rw-r--r--security/libprelude/patches/patch-am15
-rw-r--r--security/libprelude/patches/patch-an15
-rw-r--r--security/libprelude/patches/patch-ba117
-rw-r--r--security/libprelude/patches/patch-bb108
-rw-r--r--security/libprelude/patches/patch-bindings_low_level_perl_Prelude.c15
-rw-r--r--security/libprelude/patches/patch-config.h.in16
-rw-r--r--security/libprelude/patches/patch-src_include_prelude-plugin.h18
-rw-r--r--security/libprelude/patches/patch-src_libprelude-error_Makefile.in29
-rw-r--r--security/libprelude/patches/patch-src_libprelude-error_mkstrtable.awk42
26 files changed, 0 insertions, 893 deletions
diff --git a/security/libprelude/DESCR b/security/libprelude/DESCR
deleted file mode 100644
index 2c0c2ebe633..00000000000
--- a/security/libprelude/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Prelude is a hybrid IDS consisting of multiple
-sensors, managers, and a display console. LibPrelude
-is the glue that binds all aspects of Prelude together.
-LibPrelude is a library which enables Prelude
-components to communicate in a standard IDMEF method.
-
-This is just the base packages which installs
-LibPrelude's libraries and c++ easy bindings.
diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
deleted file mode 100644
index 1f9989c52da..00000000000
--- a/security/libprelude/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.73 2022/06/28 11:35:36 wiz Exp $
-#
-
-PKGREVISION= 27
-COMMENT= LibPrelude libraries and c++ easy bindings
-LICENSE= gnu-gpl-v2
-
-.include "../../security/libprelude/Makefile.common"
-
-CONF_FILES+= ${PREFIX}/share/examples/libprelude/client.conf ${PKG_SYSCONFDIR}/default/client.conf
-CONF_FILES+= ${PREFIX}/share/examples/libprelude/global.conf ${PKG_SYSCONFDIR}/default/global.conf
-CONF_FILES+= ${PREFIX}/share/examples/libprelude/idmef-client.conf ${PKG_SYSCONFDIR}/default/idmef-client.conf
-CONF_FILES+= ${PREFIX}/share/examples/libprelude/tls.conf ${PKG_SYSCONFDIR}/default/tls.conf
-
-CONFIGURE_ARGS+= --without-python --without-lua --without-perl
-
-# Work around mktime configure test failure leading to build issue
-.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64)
-CONFIGURE_ENV+= ac_cv_func_working_mktime=yes
-.endif
-
-PKGCONFIG_OVERRIDE+= src/libprelude.pc.in
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.libprelude
-PKG_SUPPORTED_OPTIONS= debug
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mdebug)
-CFLAGS= -O0 -ggdb
-.endif
-
-# we already patch 'configure'
-CHECK_PORTABILITY_SKIP+= configure.in
-
-.include "../../devel/libltdl/convenience.mk"
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/security/libprelude/Makefile.common b/security/libprelude/Makefile.common
deleted file mode 100644
index 12ee93ccc28..00000000000
--- a/security/libprelude/Makefile.common
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile.common,v 1.15 2022/04/23 11:56:24 tnn Exp $
-#
-# used by security/libprelude/Makefile
-# used by security/libprelude-lua/Makefile
-# used by security/libprelude-perl/Makefile
-# used by security/libprelude-python/Makefile
-
-DISTNAME= libprelude-${VERSION}
-VERSION= 0.9.24.1
-CATEGORIES= security
-#MASTER_SITES= http://www.prelude-ids.com/download/releases/libprelude/
-
-MAINTAINER?= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.prelude-siem.org/
-
-PATCHDIR= ${.CURDIR}/../../security/libprelude/patches
-DISTINFO_FILE= ${.CURDIR}/../../security/libprelude/distinfo
-
-BUILD_DEFS+= VARBASE
-
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-USE_TOOLS+= chown bison gawk gmake pkg-config
-USE_LANGUAGES= c c++
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
-CONFIGURE_ARGS+= --localstatedir=${VARBASE}
-CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ARGS+= --enable-easy-bindings
-PKG_SYSCONFSUBDIR= prelude
-
-.include "../../mk/bsd.prefs.mk"
-
-PRELUDE_USER?= _prelude
-PRELUDE_GROUP?= _prelude
-PRELUDE_HOME?= ${VARBASE}/spool/prelude
-
-PKG_GROUPS= ${PRELUDE_GROUP}
-PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}
-
-PKG_GROUPS_VARS+= PRELUDE_GROUP
-PKG_USERS_VARS+= PRELUDE_USER
-
-PKG_GECOS.${PRELUDE_USER}= Prelude IDS
-PKG_HOME.${PRELUDE_USER}= ${PRELUDE_HOME}
-
-EGDIR= ${PREFIX}/share/examples/libprelude
-REQD_DIRS= ${EGDIR}
-MAKE_DIRS= ${PKG_SYSCONFDIR}/default ${PKG_SYSCONFDIR}/profile
-MAKE_DIRS_PERMS+= ${PKG_SYSCONFDIR}/profile ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0711
-
-SUBST_CLASSES+= make
-SUBST_STAGE.make= pre-configure
-SUBST_FILES.make= Makefile.in
-SUBST_VARS.make= EGDIR
-
-INSTALLATION_DIRS= share/examples/libprelude
-
-.include "../../mk/bsd.prefs.mk"
diff --git a/security/libprelude/PLIST b/security/libprelude/PLIST
deleted file mode 100644
index 07570683c3b..00000000000
--- a/security/libprelude/PLIST
+++ /dev/null
@@ -1,121 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2017/09/12 05:55:31 dholland Exp $
-bin/libprelude-config
-bin/prelude-adduser
-bin/prelude-admin
-include/libprelude/common.h
-include/libprelude/daemonize.h
-include/libprelude/idmef-additional-data.h
-include/libprelude/idmef-class.h
-include/libprelude/idmef-criteria.h
-include/libprelude/idmef-criteria.hxx
-include/libprelude/idmef-criterion-value.h
-include/libprelude/idmef-data.h
-include/libprelude/idmef-message-helpers.h
-include/libprelude/idmef-message-id.h
-include/libprelude/idmef-message-print.h
-include/libprelude/idmef-message-read.h
-include/libprelude/idmef-message-write.h
-include/libprelude/idmef-path.h
-include/libprelude/idmef-path.hxx
-include/libprelude/idmef-time.h
-include/libprelude/idmef-time.hxx
-include/libprelude/idmef-tree-data.h
-include/libprelude/idmef-tree-wrap.h
-include/libprelude/idmef-value-type.h
-include/libprelude/idmef-value.h
-include/libprelude/idmef-value.hxx
-include/libprelude/idmef.h
-include/libprelude/idmef.hxx
-include/libprelude/prelude-async.h
-include/libprelude/prelude-client-easy.hxx
-include/libprelude/prelude-client-profile.h
-include/libprelude/prelude-client-profile.hxx
-include/libprelude/prelude-client.h
-include/libprelude/prelude-client.hxx
-include/libprelude/prelude-config.h
-include/libprelude/prelude-connection-pool.h
-include/libprelude/prelude-connection-pool.hxx
-include/libprelude/prelude-connection.h
-include/libprelude/prelude-connection.hxx
-include/libprelude/prelude-error.h
-include/libprelude/prelude-error.hxx
-include/libprelude/prelude-extract.h
-include/libprelude/prelude-failover.h
-include/libprelude/prelude-hash.h
-include/libprelude/prelude-ident.h
-include/libprelude/prelude-inttypes.h
-include/libprelude/prelude-io.h
-include/libprelude/prelude-linked-object.h
-include/libprelude/prelude-list.h
-include/libprelude/prelude-log.h
-include/libprelude/prelude-log.hxx
-include/libprelude/prelude-message-id.h
-include/libprelude/prelude-msg.h
-include/libprelude/prelude-msgbuf.h
-include/libprelude/prelude-option-wide.h
-include/libprelude/prelude-option.h
-include/libprelude/prelude-plugin.h
-include/libprelude/prelude-string.h
-include/libprelude/prelude-thread.h
-include/libprelude/prelude-timer.h
-include/libprelude/prelude.h
-include/libprelude/prelude.hxx
-lib/libprelude.la
-lib/libpreludecpp.la
-lib/pkgconfig/libprelude.pc
-man/man1/prelude-admin.1
-share/aclocal/libprelude.m4
-share/doc/libprelude/ch01.html
-share/doc/libprelude/ch02.html
-share/doc/libprelude/ch03.html
-share/doc/libprelude/ch04.html
-share/doc/libprelude/home.png
-share/doc/libprelude/index.html
-share/doc/libprelude/index.sgml
-share/doc/libprelude/left.png
-share/doc/libprelude/libprelude-idmef-additional-data.html
-share/doc/libprelude/libprelude-idmef-criteria.html
-share/doc/libprelude/libprelude-idmef-criterion-value.html
-share/doc/libprelude/libprelude-idmef-data.html
-share/doc/libprelude/libprelude-idmef-message-print.html
-share/doc/libprelude/libprelude-idmef-message-read.html
-share/doc/libprelude/libprelude-idmef-message-write.html
-share/doc/libprelude/libprelude-idmef-path.html
-share/doc/libprelude/libprelude-idmef-time.html
-share/doc/libprelude/libprelude-idmef-tree-wrap.html
-share/doc/libprelude/libprelude-idmef-value.html
-share/doc/libprelude/libprelude-prelude-async.html
-share/doc/libprelude/libprelude-prelude-client-profile.html
-share/doc/libprelude/libprelude-prelude-client.html
-share/doc/libprelude/libprelude-prelude-connection-pool.html
-share/doc/libprelude/libprelude-prelude-connection.html
-share/doc/libprelude/libprelude-prelude-error.html
-share/doc/libprelude/libprelude-prelude-failover.html
-share/doc/libprelude/libprelude-prelude-hash.html
-share/doc/libprelude/libprelude-prelude-ident.html
-share/doc/libprelude/libprelude-prelude-inttypes.html
-share/doc/libprelude/libprelude-prelude-io.html
-share/doc/libprelude/libprelude-prelude-linked-object.html
-share/doc/libprelude/libprelude-prelude-list.html
-share/doc/libprelude/libprelude-prelude-log.html
-share/doc/libprelude/libprelude-prelude-msg.html
-share/doc/libprelude/libprelude-prelude-msgbuf.html
-share/doc/libprelude/libprelude-prelude-option-wide.html
-share/doc/libprelude/libprelude-prelude-option.html
-share/doc/libprelude/libprelude-prelude-plugin.html
-share/doc/libprelude/libprelude-prelude-string.html
-share/doc/libprelude/libprelude-prelude-timer.html
-share/doc/libprelude/libprelude-prelude.html
-share/doc/libprelude/libprelude.devhelp
-share/doc/libprelude/libprelude.devhelp2
-share/doc/libprelude/pt01.html
-share/doc/libprelude/pt02.html
-share/doc/libprelude/pt03.html
-share/doc/libprelude/pt04.html
-share/doc/libprelude/right.png
-share/doc/libprelude/style.css
-share/doc/libprelude/up.png
-share/examples/libprelude/client.conf
-share/examples/libprelude/global.conf
-share/examples/libprelude/idmef-client.conf
-share/examples/libprelude/tls.conf
diff --git a/security/libprelude/buildlink3.mk b/security/libprelude/buildlink3.mk
deleted file mode 100644
index abe35dccb8a..00000000000
--- a/security/libprelude/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.25 2022/06/28 11:35:36 wiz Exp $
-
-BUILDLINK_TREE+= libprelude
-
-.if !defined(LIBPRELUDE_BUILDLINK3_MK)
-LIBPRELUDE_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libprelude+= libprelude>=0.9.0
-BUILDLINK_ABI_DEPENDS.libprelude+= libprelude>=0.9.24.1nb27
-BUILDLINK_PKGSRCDIR.libprelude?= ../../security/libprelude
-
-.include "../../security/gnutls/buildlink3.mk"
-.include "../../security/libgcrypt/buildlink3.mk"
-.endif # LIBPRELUDE_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -libprelude
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
deleted file mode 100644
index d74d67c5ea2..00000000000
--- a/security/libprelude/distinfo
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: distinfo,v 1.44 2021/10/26 11:17:14 nia Exp $
-
-BLAKE2s (libprelude-0.9.24.1.tar.gz) = 1eca0af9bdb4f57f0712fb486b7308a86dcbf4c4fd36f059c6a076c45f71d229
-SHA512 (libprelude-0.9.24.1.tar.gz) = f7f86f1f92e84e66f198e04e1d9a6b82c28d8239835919b76bfdb3034270956d915eea0a6c8d9a9eeb519ad02396ab50f14cf820b95c7288d2188ac85923b05c
-Size (libprelude-0.9.24.1.tar.gz) = 2582719 bytes
-SHA1 (patch-aa) = 4781d5d5f726b74e3e2179217ff2db9672c12158
-SHA1 (patch-ab) = 126b42abda48d8200040519210a962474fc7c3d0
-SHA1 (patch-ac) = 7474b2cf8cbb7fca81d85fe7c575f8ca99f90a43
-SHA1 (patch-ad) = 195228e1e04918275a3ab1cccb838de081a9ec98
-SHA1 (patch-ae) = d8b22cea826727a41108d65f84b594d0879397b2
-SHA1 (patch-ag) = 684bf8a217950b0a7fb38140b20643f81d464431
-SHA1 (patch-ah) = 840be5d59650cfc62cfa1b26693d90e6c08cc220
-SHA1 (patch-ai) = 53a16f270a9048f74849c0cd02b517e821bdf08a
-SHA1 (patch-aj) = e4019c1a71ecdf33540d603ba2e0ba09bd2b6f7b
-SHA1 (patch-ak) = d5ba7700db11bee688d56e1b92f3663e6637237d
-SHA1 (patch-al) = a3c150d76c91e33703d9ee05cd32e5d6f7b1264a
-SHA1 (patch-am) = 5581c999105a5d3b616e090afc105781e66eb888
-SHA1 (patch-an) = 1f92ed4028087d9a357fcf3788978495d63a13e3
-SHA1 (patch-ba) = 333d6e3f842d80888be0cec3921417fe51a027bc
-SHA1 (patch-bb) = ca80e503226a2e1adcc0976597a225a51a74b8f9
-SHA1 (patch-bindings_low_level_perl_Prelude.c) = 919ad0340f590365857fe7495c9d6dfa3540c0cf
-SHA1 (patch-config.h.in) = 11b1031ece55e086dcf9ff94f32b9321fe92bd48
-SHA1 (patch-src_include_prelude-plugin.h) = 4731b98059971577819906d84fe7f160c24c04f5
-SHA1 (patch-src_libprelude-error_Makefile.in) = 7cedf555b09f14b8cd37aea07789f0078302d735
-SHA1 (patch-src_libprelude-error_mkstrtable.awk) = 52078d284f2529eb08e29423afb738b8da5d98e4
diff --git a/security/libprelude/patches/patch-aa b/security/libprelude/patches/patch-aa
deleted file mode 100644
index aa8b48fd33d..00000000000
--- a/security/libprelude/patches/patch-aa
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2009/08/23 18:56:34 hasso Exp $
-
---- Makefile.in.orig 2009-07-08 16:37:14 +0200
-+++ Makefile.in 2009-07-20 00:38:41 +0200
-@@ -865,7 +865,7 @@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
--localedir = @localedir@
-+localedir = @prefix@/share/locale
- localstatedir = @localstatedir@
- lt_ECHO = @lt_ECHO@
- ltdl_LIBOBJS = @ltdl_LIBOBJS@
-@@ -1525,71 +1525,13 @@
- # Spool directory for report saving is mode
-
- install-data-local:
-- $(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_SPOOL_DIR);
-- $(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR);
-- $(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;
-- $(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/profile;
-- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf; then \
-- echo; \
-- echo "********************************************************************************"; \
-- echo; \
-- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf already exist..."; \
-- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist"; \
-- echo; \
-- echo "********************************************************************************"; \
-- echo; \
-- $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist; \
-- else \
-- $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
-- fi
--
-- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf; then \
-- echo; \
-- echo "********************************************************************************"; \
-- echo; \
-- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf already exist..."; \
-- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist"; \
-- echo; \
-- echo "********************************************************************************"; \
-- echo; \
-- $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist; \
-- else \
-- $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
-- fi
--
-- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf; then \
-- echo; \
-- echo "********************************************************************************"; \
-- echo; \
-- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf already exist..."; \
-- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist"; \
-- echo; \
-- echo "********************************************************************************"; \
-- echo; \
-- $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;\
-- else \
-- $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
-- fi
--
-- @if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf; then \
-- echo; \
-- echo "********************************************************************************"; \
-- echo; \
-- echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf already exist..."; \
-- echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist"; \
-- echo; \
-- echo "********************************************************************************"; \
-- echo; \
-- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist; \
-- else \
-- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default; \
-- fi
-+ $(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_SPOOL_DIR)
-+ $(BSD_INSTALL_DATA) $(top_srcdir)/client.conf ${DESTDIR}@EGDIR@
-+ $(BSD_INSTALL_DATA) $(top_srcdir)/global.conf ${DESTDIR}@EGDIR@
-+ $(BSD_INSTALL_DATA) $(top_srcdir)/idmef-client.conf ${DESTDIR}@EGDIR@
-+ $(BSD_INSTALL_DATA) $(top_srcdir)/tls.conf ${DESTDIR}@EGDIR@
-
- uninstall-local:
-- rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf
-- rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf
-- rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf
-- rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf
-
- dist-hook:
- @if test -d "$(srcdir)/.git"; then \
diff --git a/security/libprelude/patches/patch-ab b/security/libprelude/patches/patch-ab
deleted file mode 100644
index b29bb37784b..00000000000
--- a/security/libprelude/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2016/09/29 12:14:38 joerg Exp $
-
---- src/tls-auth.c.orig 2009-05-12 07:49:43.000000000 +0000
-+++ src/tls-auth.c
-@@ -259,6 +260,7 @@ int tls_auth_connection(prelude_client_p
- return prelude_error_verbose(PRELUDE_ERROR_PROFILE, "TLS initialization error: %s", gnutls_strerror(ret));
-
- set_default_priority(session);
-+ gnutls_priority_set_direct (session, "NORMAL", NULL);
- gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, cred);
-
- fd = prelude_io_get_fd(io);
diff --git a/security/libprelude/patches/patch-ac b/security/libprelude/patches/patch-ac
deleted file mode 100644
index bc94e926a66..00000000000
--- a/security/libprelude/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2009/08/23 18:56:34 hasso Exp $
-
---- src/Makefile.in.orig 2008-12-12 15:49:25 +0100
-+++ src/Makefile.in 2008-12-12 15:49:32 +0100
-@@ -183,7 +183,7 @@
- libprelude_la_OBJECTS = $(am_libprelude_la_OBJECTS)
- libprelude_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-- $(libprelude_la_LDFLAGS) $(LDFLAGS) -o $@
-+ $(libprelude_la_LDFLAGS) $(LDFLAGS) $(LIBMULTITHREAD) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
diff --git a/security/libprelude/patches/patch-ad b/security/libprelude/patches/patch-ad
deleted file mode 100644
index adc27478d51..00000000000
--- a/security/libprelude/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2009/08/23 18:56:34 hasso Exp $
-
-From Till Dörges on the prelude-devel ML.
-
---- libprelude-config.in.orig 2009-07-21 00:31:43 +0200
-+++ libprelude-config.in 2009-07-21 00:31:58 +0200
-@@ -70,6 +70,7 @@
- ;;
-
- --ldflags)
-+ echo "-Wl,-rpath -Wl,@libdir@"
- ;;
-
- --c++)
diff --git a/security/libprelude/patches/patch-ae b/security/libprelude/patches/patch-ae
deleted file mode 100644
index f8bd5faacc7..00000000000
--- a/security/libprelude/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2009/08/23 18:56:34 hasso Exp $
-
---- configure.orig 2008-04-25 07:08:22.000000000 -0600
-+++ configure
-@@ -44961,7 +44961,7 @@ fi
-
- { $as_echo "$as_me:$LINENO: checking for cpu-specific compiler flags" >&5
- $as_echo_n "checking for cpu-specific compiler flags... " >&6; }
--if test "$host_cpu" == "x86_64" && test $enable_static = "yes"; then
-+if test "$host_cpu" = "x86_64" && test $enable_static = "yes"; then
- { $as_echo "$as_me:$LINENO: result: x86_64/static: adding -fPIC" >&5
- $as_echo "x86_64/static: adding -fPIC" >&6; }
-
diff --git a/security/libprelude/patches/patch-ag b/security/libprelude/patches/patch-ag
deleted file mode 100644
index 23afa25f369..00000000000
--- a/security/libprelude/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/08/23 18:56:34 hasso Exp $
-
---- bindings/lua/Makefile.in.orig 2009-07-24 19:26:18 +0300
-+++ bindings/lua/Makefile.in 2009-07-24 19:27:20 +0300
-@@ -194,7 +194,7 @@ am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(PreludeEasydir)"
- LTLIBRARIES = $(PreludeEasy_LTLIBRARIES)
--@HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_DEPENDENCIES = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la
-+@HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_DEPENDENCIES = $(top_builddir)/../.buildlink/lib/libpreludecpp.la
- am__PreludeEasy_la_SOURCES_DIST = PreludeEasy.cxx
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@am_PreludeEasy_la_OBJECTS = \
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@ PreludeEasy.lo
-@@ -860,7 +860,7 @@ top_srcdir = @top_srcdir@
- @HAVE_EASY_BINDINGS_TRUE@EXTRA_DIST = libpreludecpp-lua.i PreludeEasy.cxx
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@AM_CPPFLAGS = -I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include @LUA_CFLAGS@ -I@top_srcdir@/libmissing -I@top_builddir@/libmissing
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_LDFLAGS = -module -avoid-version @LUA_LIBS@
--@HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la
-+@HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludecpp.la
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_SOURCES = PreludeEasy.cxx
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasydir = $(libdir)
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_LTLIBRARIES = PreludeEasy.la
diff --git a/security/libprelude/patches/patch-ah b/security/libprelude/patches/patch-ah
deleted file mode 100644
index 2f08dfb3095..00000000000
--- a/security/libprelude/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2013/06/30 11:35:23 sno Exp $
-
-Fixing missing RPATH for perl bindings
-
---- bindings/perl/Makefile.PL.in.orig 2009-07-24 19:55:09 +0300
-+++ bindings/perl/Makefile.PL.in 2009-07-24 19:58:01 +0300
-@@ -6,7 +6,7 @@ use Cwd "abs_path";
-
- my %attributs = (NAME => 'PreludeEasy',
- INC => '-I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include -I@top_srcdir@/libmissing -I@top_builddir@/libmissing',
-- LIBS => ["-L@top_builddir@/src/.libs -lprelude -L@top_builddir@/bindings/c++/.libs -lpreludecpp", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ],
-+ LIBS => ["-L@top_builddir@/../.buildlink/lib -lprelude -lpreludecpp @LIBPRELUDE_LIBS@", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ],
- LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags}");
-
- if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) {
diff --git a/security/libprelude/patches/patch-ai b/security/libprelude/patches/patch-ai
deleted file mode 100644
index 9a64aaf9a74..00000000000
--- a/security/libprelude/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2009/08/23 18:56:34 hasso Exp $
-
---- bindings/ruby/Makefile.in.orig 2009-07-24 20:01:14 +0300
-+++ bindings/ruby/Makefile.in 2009-07-24 20:02:07 +0300
-@@ -195,7 +195,7 @@ am__base_list = \
- am__installdirs = "$(DESTDIR)$(rbexecdir)"
- LTLIBRARIES = $(rbexec_LTLIBRARIES)
- am__DEPENDENCIES_1 =
--@HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_DEPENDENCIES = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la \
-+@HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_DEPENDENCIES = $(top_builddir)/../.buildlink/lib/libpreludecpp.la \
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@ $(am__DEPENDENCIES_1)
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@nodist_PreludeEasy_la_OBJECTS = PreludeEasy_la-PreludeEasy.lo
- PreludeEasy_la_OBJECTS = $(nodist_PreludeEasy_la_OBJECTS)
-@@ -860,7 +860,7 @@ top_srcdir = @top_srcdir@
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@rbexec_LTLIBRARIES = PreludeEasy.la
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_CPPFLAGS = $(RUBY_INCLUDES) $(RUBY_CCFLAGS) -I@top_builddir@ -I$(top_srcdir)/src/include -I$(top_builddir)/src/include -I@top_builddir@/src/libprelude-error -I$(top_srcdir)/bindings/c++/include -I@top_srcdir@/libmissing -I@top_builddir@/libmissing
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_LDFLAGS = -module -avoid-version
--@HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la $(RUBY_LIBS)
-+@HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludecpp.la $(RUBY_LIBS)
- @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@nodist_PreludeEasy_la_SOURCES = PreludeEasy.cxx
- all: all-am
-
diff --git a/security/libprelude/patches/patch-aj b/security/libprelude/patches/patch-aj
deleted file mode 100644
index 00bfa99fefc..00000000000
--- a/security/libprelude/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/09/11 16:54:47 joerg Exp $
-
---- bindings/c++/prelude.cxx.orig 2009-09-11 18:50:18.000000000 +0200
-+++ bindings/c++/prelude.cxx
-@@ -21,6 +21,8 @@
- *
- *****/
-
-+#include <ctime>
-+
- #include <prelude.h>
- #include "prelude.hxx"
-
diff --git a/security/libprelude/patches/patch-ak b/security/libprelude/patches/patch-ak
deleted file mode 100644
index 3d21a648ebd..00000000000
--- a/security/libprelude/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2009/11/25 20:56:04 joerg Exp $
-
---- bindings/c++/Makefile.in.orig 2009-11-25 21:47:32.000000000 +0100
-+++ bindings/c++/Makefile.in
-@@ -194,7 +194,7 @@ am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
- am__installdirs = "$(DESTDIR)$(libdir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
--@HAVE_EASY_BINDINGS_TRUE@libpreludecpp_la_DEPENDENCIES = $(top_builddir)/src/.libs/libprelude.la
-+@HAVE_EASY_BINDINGS_TRUE@libpreludecpp_la_DEPENDENCIES = $(top_builddir)/src/libprelude.la
- am__libpreludecpp_la_SOURCES_DIST = prelude-error.cxx idmef.cxx \
- idmef-criteria.cxx idmef-path.cxx idmef-time.cxx \
- idmef-value.cxx prelude.cxx prelude-client.cxx \
-@@ -929,7 +929,7 @@ top_srcdir = @top_srcdir@
- @HAVE_EASY_BINDINGS_TRUE@ prelude-log.cxx
-
- @HAVE_EASY_BINDINGS_TRUE@libpreludecpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDECPP_SONAME@
--@HAVE_EASY_BINDINGS_TRUE@libpreludecpp_la_LIBADD = $(top_builddir)/src/.libs/libprelude.la
-+@HAVE_EASY_BINDINGS_TRUE@libpreludecpp_la_LIBADD = $(top_builddir)/src/libprelude.la
- @HAVE_EASY_BINDINGS_TRUE@libpreludecpp_la_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src/include -I$(top_srcdir)/src/include -I$(top_builddir)/src/libprelude-error -I$(top_builddir)/bindings/c++/include -I$(top_srcdir)/bindings/c++/include
- all: all-recursive
-
diff --git a/security/libprelude/patches/patch-al b/security/libprelude/patches/patch-al
deleted file mode 100644
index 19ff0722a38..00000000000
--- a/security/libprelude/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2009/11/25 20:56:04 joerg Exp $
-
---- bindings/c++/Makefile.am.orig 2009-11-25 21:47:30.000000000 +0100
-+++ bindings/c++/Makefile.am
-@@ -20,7 +20,7 @@ libpreludecpp_la_SOURCES = \
- prelude-log.cxx
-
- libpreludecpp_la_LDFLAGS = -no-undefined -version-info @LIBPRELUDECPP_SONAME@
--libpreludecpp_la_LIBADD = $(top_builddir)/src/.libs/libprelude.la
-+libpreludecpp_la_LIBADD = $(top_builddir)/src/libprelude.la
- libpreludecpp_la_CPPFLAGS = -I$(top_builddir) -I$(top_builddir)/src/include -I$(top_srcdir)/src/include -I$(top_builddir)/src/libprelude-error -I$(top_builddir)/bindings/c++/include -I$(top_srcdir)/bindings/c++/include
-
- endif
diff --git a/security/libprelude/patches/patch-am b/security/libprelude/patches/patch-am
deleted file mode 100644
index f8b3afba90d..00000000000
--- a/security/libprelude/patches/patch-am
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-am,v 1.1 2011/07/08 11:47:28 drochner Exp $
-
---- libmissing/mktime.c.orig 2009-05-12 07:49:42.000000000 +0000
-+++ libmissing/mktime.c
-@@ -165,8 +165,10 @@ ydhms_diff (long int year1, long int yda
- int year0, int yday0, int hour0, int min0, int sec0)
- {
- verify (C99_integer_division, -1 / 2 == 0);
-+#if 0
- verify (long_int_year_and_yday_are_wide_enough,
- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
-+#endif
-
- /* Compute intervening leap days correctly even if year is negative.
- Take care to avoid integer overflow here. */
diff --git a/security/libprelude/patches/patch-an b/security/libprelude/patches/patch-an
deleted file mode 100644
index e338ed12995..00000000000
--- a/security/libprelude/patches/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-an,v 1.1 2013/06/30 11:35:23 sno Exp $
-
-Fixing missing RPATH for perl bindings
-
---- bindings/low-level/perl/Makefile.PL.in.orig 2009-05-12 07:49:42.000000000 +0000
-+++ bindings/low-level/perl/Makefile.PL.in
-@@ -6,7 +6,7 @@ use Cwd "abs_path";
-
- my %attributs = (NAME => 'Prelude',
- INC => '-I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error',
-- LIBS => ["-L@top_builddir@/src/.libs -lprelude", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ],
-+ LIBS => ["-L@top_builddir@/src/.libs -lprelude @LIBPRELUDE_LIBS@", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ],
- LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags}");
-
- if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) {
diff --git a/security/libprelude/patches/patch-ba b/security/libprelude/patches/patch-ba
deleted file mode 100644
index 06365df4c3e..00000000000
--- a/security/libprelude/patches/patch-ba
+++ /dev/null
@@ -1,117 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2016/09/29 12:14:38 joerg Exp $
-
-make this build with gnutls-3
-
---- prelude-admin/prelude-admin.c.orig 2009-07-08 13:50:22.000000000 +0000
-+++ prelude-admin/prelude-admin.c
-@@ -57,7 +57,6 @@
- #include <errno.h>
- #include <gnutls/gnutls.h>
- #include <gnutls/x509.h>
--#include <gnutls/extra.h>
-
- #include "common.h"
- #include "config-engine.h"
-@@ -841,29 +840,70 @@ static int anon_check_passwd(prelude_io_
- }
-
-
-+static inline gnutls_transport_ptr_t fd_to_ptr(int fd)
-+{
-+ union {
-+ gnutls_transport_ptr_t ptr;
-+ int fd;
-+ } data;
-+
-+ data.fd = fd;
-+
-+ return data.ptr;
-+}
-+
-+
-+static inline int ptr_to_fd(gnutls_transport_ptr_t ptr)
-+{
-+ union {
-+ gnutls_transport_ptr_t ptr;
-+ int fd;
-+ } data;
-+
-+ data.ptr = ptr;
-+ return data.fd;
-+}
-+
-+
-+static ssize_t tls_pull(gnutls_transport_ptr_t fd, void *buf, size_t count)
-+{
-+ return read(ptr_to_fd(fd), buf, count);
-+}
-+
-+
-+static ssize_t tls_push(gnutls_transport_ptr_t fd, const void *buf, size_t count)
-+{
-+ return write(ptr_to_fd(fd), buf, count);
-+}
-+
-
- static gnutls_session new_tls_session(int sock, char *passwd)
- {
- int ret;
- gnutls_session session;
- gnutls_anon_client_credentials anoncred;
-+ const char *err;
-
-- const int kx_priority[] = {
-- GNUTLS_KX_ANON_DH,
--#ifdef GNUTLS_SRP_ENABLED
-- GNUTLS_KX_SRP, GNUTLS_KX_SRP_DSS, GNUTLS_KX_SRP_RSA,
-+#if defined LIBGNUTLS_VERSION_MAJOR && LIBGNUTLS_VERSION_MAJOR >= 3
-+# define TLS_DH_STR "+ANON-ECDH:+ANON-DH"
-+#else
-+# define TLS_DH_STR "+ANON-DH"
- #endif
-- 0
-- };
-
-- union {
-- int fd;
-- void *ptr;
-- } data;
-+#ifdef GNUTLS_SRP_ENABLED
-+ const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
-+#else
-+ const char *pstring = "NORMAL:" TLS_DH_STR;
-+#endif
-
- gnutls_init(&session, GNUTLS_CLIENT);
- gnutls_set_default_priority(session);
-- gnutls_kx_set_priority(session, kx_priority);
-+
-+ ret = gnutls_priority_set_direct(session, pstring, &err);
-+ if (ret < 0) {
-+ fprintf(stderr, "TLS priority syntax error at: %s\n", err);
-+ return NULL;
-+ }
-
- #ifdef GNUTLS_SRP_ENABLED
- {
-@@ -877,8 +917,9 @@ static gnutls_session new_tls_session(in
- gnutls_anon_allocate_client_credentials(&anoncred);
- gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
-
-- data.fd = sock;
-- gnutls_transport_set_ptr(session, data.ptr);
-+ gnutls_transport_set_ptr(session, fd_to_ptr(sock));
-+ gnutls_transport_set_pull_function(session, tls_pull);
-+ gnutls_transport_set_push_function(session, tls_push);
-
- ret = gnutls_handshake(session);
- if ( ret < 0 ) {
-@@ -897,8 +938,6 @@ static gnutls_session new_tls_session(in
- return session;
- }
-
--
--
- static prelude_io_t *connect_manager(const char *addr, unsigned int port, char *passwd)
- {
- int ret, sock;
diff --git a/security/libprelude/patches/patch-bb b/security/libprelude/patches/patch-bb
deleted file mode 100644
index 1f41b0bc599..00000000000
--- a/security/libprelude/patches/patch-bb
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2016/09/29 12:14:38 joerg Exp $
-
-make this build with gnutls-3
-
---- prelude-admin/server.c.orig 2009-05-12 07:49:42.000000000 +0000
-+++ prelude-admin/server.c
-@@ -39,7 +39,6 @@
-
- #include <gcrypt.h>
- #include <gnutls/gnutls.h>
--#include <gnutls/extra.h>
-
- #include "prelude-client.h"
- #include "prelude-error.h"
-@@ -97,26 +96,71 @@ static int anon_check_passwd(prelude_io_
- }
-
-
-+static inline gnutls_transport_ptr_t fd_to_ptr(int fd)
-+{
-+ union {
-+ gnutls_transport_ptr_t ptr;
-+ int fd;
-+ } data;
-+
-+ data.fd = fd;
-+
-+ return data.ptr;
-+}
-+
-+
-+static inline int ptr_to_fd(gnutls_transport_ptr_t ptr)
-+{
-+ union {
-+ gnutls_transport_ptr_t ptr;
-+ int fd;
-+ } data;
-+
-+ data.ptr = ptr;
-+ return data.fd;
-+}
-+
-+
-+
-+static ssize_t tls_pull(gnutls_transport_ptr_t fd, void *buf, size_t count)
-+{
-+ return read(ptr_to_fd(fd), buf, count);
-+}
-+
-+static ssize_t tls_push(gnutls_transport_ptr_t fd, const void *buf, size_t count)
-+{
-+ return write(ptr_to_fd(fd), buf, count);
-+}
-+
-+
-
- static gnutls_session new_tls_session(int sock)
- {
- int ret;
- gnutls_session session;
-- const int kx_priority[] = {
-- GNUTLS_KX_ANON_DH,
-+ const char *err;
-+
-+#if defined LIBGNUTLS_VERSION_MAJOR && LIBGNUTLS_VERSION_MAJOR >= 3
-+# define TLS_DH_STR "+ANON-ECDH:+ANON-DH"
-+#else
-+# define TLS_DH_STR "+ANON-DH"
-+#endif
-+
- #ifdef GNUTLS_SRP_ENABLED
-- GNUTLS_KX_SRP, GNUTLS_KX_SRP_DSS, GNUTLS_KX_SRP_RSA,
-+ const char *pstring = "NORMAL:+SRP:+SRP-DSS:+SRP-RSA:" TLS_DH_STR;
-+#else
-+ const char *pstring = "NORMAL:" TLS_DH_STR;
- #endif
-- 0 };
-- union {
-- int fd;
-- void *ptr;
-- } data;
-
- gnutls_init(&session, GNUTLS_SERVER);
--
- gnutls_set_default_priority(session);
-- gnutls_kx_set_priority(session, kx_priority);
-+
-+ ret = gnutls_priority_set_direct(session, pstring, &err);
-+ if (ret < 0) {
-+ fprintf(stderr, "TLS priority syntax error at: %s\n", err);
-+ return NULL;
-+ }
-+
-
- #ifdef GNUTLS_SRP_ENABLED
- gnutls_credentials_set(session, GNUTLS_CRD_SRP, srpcred);
-@@ -124,8 +168,9 @@ static gnutls_session new_tls_session(in
- #endif
- gnutls_credentials_set(session, GNUTLS_CRD_ANON, anoncred);
-
-- data.fd = sock;
-- gnutls_transport_set_ptr(session, data.ptr);
-+ gnutls_transport_set_ptr(session, fd_to_ptr(sock));
-+ gnutls_transport_set_pull_function(session, tls_pull);
-+ gnutls_transport_set_push_function(session, tls_push);
-
- ret = gnutls_handshake(session);
- if ( ret < 0 ) {
diff --git a/security/libprelude/patches/patch-bindings_low_level_perl_Prelude.c b/security/libprelude/patches/patch-bindings_low_level_perl_Prelude.c
deleted file mode 100644
index 646cc6ba923..00000000000
--- a/security/libprelude/patches/patch-bindings_low_level_perl_Prelude.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bindings_low_level_perl_Prelude.c,v 1.1 2017/09/12 06:04:47 dholland Exp $
-
-Don't undef bool; it breaks the build.
-
---- bindings/low-level/perl/Prelude.c~ 2009-08-11 15:13:59.000000000 +0000
-+++ bindings/low-level/perl/Prelude.c
-@@ -1425,7 +1425,7 @@ SWIG_Perl_SetModule(swig_module_info *mo
- #undef eof
- #endif
- #ifdef bool
-- #undef bool
-+// #undef bool
- #endif
- #ifdef close
- #undef close
diff --git a/security/libprelude/patches/patch-config.h.in b/security/libprelude/patches/patch-config.h.in
deleted file mode 100644
index d7a2405c7e5..00000000000
--- a/security/libprelude/patches/patch-config.h.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-config.h.in,v 1.1 2018/01/31 12:55:29 jperkin Exp $
-
-Don't break std::mktime.
-
---- config.h.in.orig 2009-08-11 15:05:50.000000000 +0000
-+++ config.h.in
-@@ -957,7 +957,9 @@
- #undef mbstate_t
-
- /* Define to rpl_mktime if the replacement function should be used. */
-+#if !defined(__cplusplus)
- #undef mktime
-+#endif
-
- /* Define to the type of st_nlink in struct stat, or a supertype. */
- #undef nlink_t
diff --git a/security/libprelude/patches/patch-src_include_prelude-plugin.h b/security/libprelude/patches/patch-src_include_prelude-plugin.h
deleted file mode 100644
index 458583bfb05..00000000000
--- a/security/libprelude/patches/patch-src_include_prelude-plugin.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_include_prelude-plugin.h,v 1.1 2013/04/12 13:45:48 joerg Exp $
-
---- src/include/prelude-plugin.h.orig 2009-05-12 07:49:42.000000000 +0000
-+++ src/include/prelude-plugin.h
-@@ -59,11 +59,8 @@ typedef struct {
- * Hack for plugin preloading,
- * without having the end program depend on ltdl.
- */
--#ifdef PRELUDE_APPLICATION_USE_LIBTOOL2
--# define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
--#endif
--
--extern const void *lt_preloaded_symbols[];
-+#include <ltdl.h>
-+#define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
-
- #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS() \
- prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols)
diff --git a/security/libprelude/patches/patch-src_libprelude-error_Makefile.in b/security/libprelude/patches/patch-src_libprelude-error_Makefile.in
deleted file mode 100644
index 800bc1e5843..00000000000
--- a/security/libprelude/patches/patch-src_libprelude-error_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_libprelude-error_Makefile.in,v 1.2 2019/12/20 22:11:02 gutteridge Exp $
-
-Use -P when preprocessing error symbols to avoid getting line number
-output, which on gcc5 introduces extra line breaks and makes the
-downstream processing fail miserably.
-
-Also, rename the awk variable "namespace" to "name_space", since the
-former is now a reserved word with GNU awk 5.0.
-
---- src/libprelude-error/Makefile.in.orig 2009-08-11 15:05:56.000000000 +0000
-+++ src/libprelude-error/Makefile.in
-@@ -1201,7 +1201,7 @@ code-to-errno.h: Makefile mkerrnos.awk e
-
- mkerrcodes.h: Makefile mkerrcodes.awk
- LANG="" $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
-- $(CPP) _$@ | grep PRELUDE_ERROR_ | LANG="" $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
-+ $(CPP) -P _$@ | grep PRELUDE_ERROR_ | LANG="" $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
- -rm _$@
-
- # It is correct to use $(CC_FOR_BUILD) here. We want to run the
-@@ -1214,7 +1214,7 @@ code-from-errno.h: mkerrcodes Makefile
-
- errnos-sym.h: Makefile mkstrtable.awk errnos.in
- LANG="" $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
-- -v prefix=PRELUDE_ERROR_ -v namespace=errnos_ \
-+ -v prefix=PRELUDE_ERROR_ -v name_space=errnos_ \
- $(srcdir)/errnos.in >$@
-
- prelude-error.h: Makefile mkheader.awk err-sources.h.in err-codes.h.in errnos.in prelude-error.h.in
diff --git a/security/libprelude/patches/patch-src_libprelude-error_mkstrtable.awk b/security/libprelude/patches/patch-src_libprelude-error_mkstrtable.awk
deleted file mode 100644
index df191d8e989..00000000000
--- a/security/libprelude/patches/patch-src_libprelude-error_mkstrtable.awk
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-src_libprelude-error_mkstrtable.awk,v 1.1 2019/12/20 22:11:02 gutteridge Exp $
-
-Rename the awk variable "namespace" to "name_space", since the former
-is now a reserved word with GNU awk 5.0.
-
---- src/libprelude-error/mkstrtable.awk.orig 2009-05-12 07:49:42.000000000 +0000
-+++ src/libprelude-error/mkstrtable.awk
-@@ -77,7 +77,7 @@
- #
- # The variable prefix can be used to prepend a string to each message.
- #
--# The variable namespace can be used to prepend a string to each
-+# The variable name_space can be used to prepend a string to each
- # variable and macro name.
-
- BEGIN {
-@@ -102,7 +102,7 @@ header {
- print "/* The purpose of this complex string table is to produce";
- print " optimal code with a minimum of relocations. */";
- print "";
-- print "static const char " namespace "msgstr[] = ";
-+ print "static const char " name_space "msgstr[] = ";
- header = 0;
- }
- else
-@@ -150,14 +150,14 @@ END {
- else
- print " gettext_noop (\"" prefix last_msgstr "\");";
- print "";
-- print "static const int " namespace "msgidx[] =";
-+ print "static const int " name_space "msgidx[] =";
- print " {";
- for (i = 0; i < coded_msgs; i++)
- print " " pos[i] ",";
- print " " pos[coded_msgs];
- print " };";
- print "";
-- print "#define " namespace "msgidxof(code) (0 ? -1 \\";
-+ print "#define " name_space "msgidxof(code) (0 ? -1 \\";
-
- # Gather the ranges.
- skip = code[0];