From fb84f8d0228ae1536b6b4c27234847c4e28f0ca0 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 9 Jul 2012 13:00:24 +0000
Subject: [PATCH] tedu nepenthes' prelude support, pointed out naddy@

---
 net/Makefile                      |  3 +--
 net/nepenthes/Makefile            | 15 +--------------
 net/nepenthes/pkg/DESCR           |  3 ---
 net/nepenthes/pkg/MESSAGE-prelude | 16 ----------------
 4 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 net/nepenthes/pkg/MESSAGE-prelude

diff --git a/net/Makefile b/net/Makefile
index 923804ef808..ae819c07141 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.759 2012/07/09 12:58:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.760 2012/07/09 13:00:24 sthen Exp $
 # $FreeBSD: Makefile,v 1.129 1997/11/20 13:47:40 itojun Exp $
 #
 
@@ -224,7 +224,6 @@
      SUBDIR += nemesis
      SUBDIR += neon
      SUBDIR += nepenthes
-     SUBDIR += nepenthes,prelude
      SUBDIR += nepim
      SUBDIR += net-snmp
      SUBDIR += netatalk
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index 6636dde33d0..28287f597c1 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2012/04/28 10:51:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2012/07/09 13:00:24 sthen Exp $
 SHARED_ONLY=	Yes
 
 COMMENT=	determine the malware activity on a network
@@ -47,21 +47,8 @@ CONFIGURE_ARGS+=--enable-debug-logging \
 		--disable-capabilities \
 		--with-curl-lib=${PREFIX}/lib
 
-FLAVORS=        prelude
-FLAVOR?=
-
-.if ${FLAVOR:L:Mprelude}
-LIB_DEPENDS+=   security/prelude/libprelude
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include  \
-                -I${LOCALBASE}/include/libprelude/" \
-		LDFLAGS="-L${LOCALBASE}/lib -pthread"
-WANTLIB+=	gcrypt gnutls gpg-error pthread tasn1 prelude>=8
-CONFIGURE_ARGS+=--enable-prelude
-MESSAGE=        ${PKGDIR}/MESSAGE-prelude
-.else
 LIB_DEPENDS+=	databases/postgresql
 WANTLIB +=	pq>=4
-.endif
 
 pre-configure:
 	@perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \
diff --git a/net/nepenthes/pkg/DESCR b/net/nepenthes/pkg/DESCR
index 01ab892c36d..f023652da8e 100644
--- a/net/nepenthes/pkg/DESCR
+++ b/net/nepenthes/pkg/DESCR
@@ -2,6 +2,3 @@ Nepenthes can determine the malware activity on a network
 by deploying a nepenthes sensor (i.e. honeypot). The programm
 emulates different well known vulnerabilities waiting for
 malicious connections trying to exploit them.
-
-Flavors:
-	* prelude - build with prelude support
diff --git a/net/nepenthes/pkg/MESSAGE-prelude b/net/nepenthes/pkg/MESSAGE-prelude
deleted file mode 100644
index 261e60e201e..00000000000
--- a/net/nepenthes/pkg/MESSAGE-prelude
+++ /dev/null
@@ -1,16 +0,0 @@
-To start with nepenthes as sensor for prelude, you have to create a
-starting profile, e.g. "nepenthes" by running on the manager side:
- 
-# prelude-adduser registration-server prelude-manager \
-        --uid=564 --gid=564
- 
-and on the sensor side:
- 
-# prelude-adduser register nepenthes "idmef:w" \
-        <manager address> --uid 564 --gid 564
- 
-Then, enable prelude logging in ${SYSCONFDIR}/nepenthes/nepenthes.conf
-(uncomment the "logprelude.so" line).
-
-Eventually, fill in ${SYSCONFDIR}/nepenthes/log-prelude.conf if needed,
-before starting nepenthes.