- Update security/gnutls to 3.4.10.

- Rename the LIBDANE option DANE because that's the name of the protocol
  supported by libgnutls-dane and gnutls-cli.  Also clarify the option
  description.
- Add an IDN option.
- libgnutls-openssl has been removed in 3.4.  Some ports used this library
  in their LIB_DEPENDS but no port actually required it.
- Some old API functions have been removed.  Ports that used these have been
  updated or patched to use the new API.
- Add a patch to print/cups to prevent overlinking of libgnutls.so.
- Bump PORTREVISION on dependent ports.

net-im/jabber: This port used the old API to give users fine grained
control over which crypto algorithms were used via a configuration file.
It's not immediately obvious how to port this to the new API so the port
always uses the defaults now.

www/hydra: Mark BROKEN.  This uses more removed calls than the other ports,
is said to be alpha quality and not fully functional and has been abandoned
10 years ago.

PR:		207768
Exp-run by:	antoine
Approved by:	portmgr (antoine)

5 files changed, 52 insertions, 65 deletions

diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index c6859dbe6f74..c6014ec82dcf 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -2,36 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	libpreludedb
-PORTVERSION=	1.0.1p1
-PORTREVISION=	10
+PORTVERSION=	1.2.6
 CATEGORIES=	security
-MASTER_SITES=	https://www.prelude-ids.org/attachments/download/287/
+MASTER_SITES=	http://www.prelude-siem.org/attachments/download/408/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Framework library for access to Prelude NIDS database
+COMMENT=	Library to access Prelude IDMEF database
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl \
-		libgmp.so:${PORTSDIR}/math/gmp \
-		libgnutls.so:${PORTSDIR}/security/gnutls \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
-		libprelude.so:${PORTSDIR}/security/libprelude \
-		libnettle.so:${PORTSDIR}/security/nettle \
-		libp11-kit.so:${PORTSDIR}/security/p11-kit
+LIB_DEPENDS=	libprelude.so:${PORTSDIR}/security/libprelude
 
-USES=		gettext gmake iconv libtool
+USES=		gmake libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gtk-doc=no \
-		--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS=	--without-swig \
+		--without-python3
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-PORTDOCS=	*
-
-OPTIONS_DEFINE=		DOCS PERL PYTHON
+OPTIONS_DEFINE=		DOCS PYTHON
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	MYSQL
@@ -40,35 +30,14 @@ OPTIONS_SUB=		yes
 MYSQL_DESC=		MySQL plugin
 MYSQL_USE=		mysql=yes
 MYSQL_CONFIGURE_WITH=	mysql
-PERL_DESC=		Perl bindings
-PERL_USES=		perl5
-PERL_USE=		perl5=build,run
-PERL_CONFIGURE_WITH=	perl
 PGSQL_DESC=		PostgreSQL plugin
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgresql
-PYTHON_USES=		python
-PYTHON_CONFIGURE_WITH=	python
-PYTHON_PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
+PYTHON_USES=		python:2.7
+PYTHON_CONFIGURE_WITH=	python2=${PYTHON_CMD}
+PYTHON_PLIST_SUB=	VERSION=${PORTVERSION}
 SQLITE_DESC=		SQLite3 plugin
 SQLITE_USE=		sqlite=yes
 SQLITE_CONFIGURE_WITH=	sqlite3
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* \
-		${STAGEDIR}${DOCSDIR}
-
-post-install-PERL-on:
-	@${FIND} ${STAGEDIR}${PREFIX}/lib/perl5 \
-		-name "*.so" | ${XARGS} ${STRIP_CMD}
-
-post-install-PYTHON-on:
-	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
-		-name "*.so" | ${XARGS} ${STRIP_CMD}
-
 .include <bsd.port.mk>
diff --git a/security/libpreludedb/distinfo b/security/libpreludedb/distinfo
index 7ba7d4e4bbdd..a0d5a3832e97 100644
--- a/security/libpreludedb/distinfo
+++ b/security/libpreludedb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpreludedb-1.0.1p1.tar.gz) = c62a30d2d96bea4188328124a85a53e2aa1e6effebe15c83dd4440248e0f4f61
-SIZE (libpreludedb-1.0.1p1.tar.gz) = 939675
+SHA256 (libpreludedb-1.2.6.tar.gz) = e855358b90811132c5e2e9fecf168eedee3c2bda03cd8eb4ae34a6e31f1540b1
+SIZE (libpreludedb-1.2.6.tar.gz) = 1230637
diff --git a/security/libpreludedb/files/patch-Makefile.in b/security/libpreludedb/files/patch-Makefile.in
deleted file mode 100644
index b6afaaac580f..000000000000
--- a/security/libpreludedb/files/patch-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	2009-07-15 13:49:18.000000000 +0600
-+++ Makefile.in	2009-09-04 10:56:03.000000000 +0600
-@@ -645,9 +645,8 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
--DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
- EXTRA_DIST = LICENSE.README HACKING.README
--SUBDIRS = m4 libmissing src plugins bindings docs
-+SUBDIRS = m4 libmissing src plugins bindings
- MAINTAINERCLEANFILES = \
- 	$(srcdir)/INSTALL \
- 	$(srcdir)/aclocal.m4 \
diff --git a/security/libpreludedb/pkg-descr b/security/libpreludedb/pkg-descr
index 65056eb8cfe3..4aa12dcc7c97 100644
--- a/security/libpreludedb/pkg-descr
+++ b/security/libpreludedb/pkg-descr
@@ -1,6 +1,12 @@
-Prelude is a new innovative hybrid Intrusion Detection system designed 
-to be very modular, distributed, rock solid and fast. 
+Prelude is a Universal "Security Information & Event Management" (SIEM)
+system.  Prelude collects, normalizes, sorts, aggregates, correlates and
+reports all security-related events.
+
+As well as being capable of recovering any type of log (system logs, syslog,
+flat files, etc.), Prelude benefits from a native support with a number of
+systems dedicated to enriching information even further (snort, samhain,
+ossec, auditd, etc.).
 
 This library provides a framework for easy access to the Prelude database.
 
-WWW: http://www.prelude-ids.org/
+WWW: https://www.prelude-siem.org/
diff --git a/security/libpreludedb/pkg-plist b/security/libpreludedb/pkg-plist
index 20e3b83fded4..fe1566b53ef7 100644
--- a/security/libpreludedb/pkg-plist
+++ b/security/libpreludedb/pkg-plist
@@ -1,28 +1,53 @@
 bin/libpreludedb-config
 bin/preludedb-admin
 include/libpreludedb/preludedb.h
+include/libpreludedb/preludedb.hxx
 include/libpreludedb/preludedb-error.h
+include/libpreludedb/preludedb-error.hxx
 include/libpreludedb/preludedb-path-selection.h
 include/libpreludedb/preludedb-plugin-format.h
 include/libpreludedb/preludedb-plugin-sql.h
 include/libpreludedb/preludedb-sql-settings.h
 include/libpreludedb/preludedb-sql.h
+include/libpreludedb/preludedb-sql.hxx
 include/libpreludedb/preludedb-version.h
 lib/libpreludedb.so
-lib/libpreludedb.so.0
-lib/libpreludedb.so.0.4.10
+lib/libpreludedb.so.7
+lib/libpreludedb.so.7.0.0
+lib/libpreludedbcpp.so
+lib/libpreludedbcpp.so.2
+lib/libpreludedbcpp.so.2.0.0
 lib/libpreludedb/plugins/formats/classic.so
 %%MYSQL%%lib/libpreludedb/plugins/sql/mysql.so
 %%PGSQL%%lib/libpreludedb/plugins/sql/pgsql.so
 %%SQLITE%%lib/libpreludedb/plugins/sql/sqlite3.so
-%%PERL%%%%SITE_ARCH%%/PreludeDB.pm
-%%PERL%%%%SITE_ARCH%%/auto/PreludeDB/PreludeDB.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-0.0.0-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-%%VERSION%%-py%%PYTHON_VER%%.egg-info
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc
 man/man1/preludedb-admin.1.gz
 share/aclocal/libpreludedb.m4
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/api-index-full.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/ch01.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/deprecated-api-index.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/home.png
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/index.sgml
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/left.png
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-error.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-path-selection.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-format.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-plugin-sql.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql-settings.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-sql.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb-version.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb-preludedb.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/libpreludedb.devhelp2
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/object-tree.html
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/right.png
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/style.css
+%%PORTDOCS%%share/gtk-doc/html/libpreludedb/up.png
 %%DATADIR%%/classic/mysql-update-14-1.sql
 %%DATADIR%%/classic/mysql-update-14-2.sql
 %%DATADIR%%/classic/mysql-update-14-3.sql