pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/prelude-manager Update to 0.9.15. Upstream ch...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f0531b484594
branches: trunk
changeset: 563983:f0531b484594
user: hasso <hasso%pkgsrc.org@localhost>
date: Mon Aug 24 18:32:21 2009 +0000
description:
Update to 0.9.15. Upstream changes:
- Make Prelude-Manager thread backend independant.
- Add missing dlpreopening support for the SMTP plugin.
- Win32 compilation fixes.
- Various fixes and update.
Also various pkgsrc related fixes including DESTDIR support.
diffstat:
security/prelude-manager/Makefile | 31 +++++++++++++++++++++----------
security/prelude-manager/PLIST | 6 +-----
security/prelude-manager/distinfo | 10 +++++-----
security/prelude-manager/patches/patch-ab | 24 ++++++++++++------------
4 files changed, 39 insertions(+), 32 deletions(-)
diffs (163 lines):
diff -r 4a9e6fed3bb7 -r f0531b484594 security/prelude-manager/Makefile
--- a/security/prelude-manager/Makefile Mon Aug 24 17:33:48 2009 +0000
+++ b/security/prelude-manager/Makefile Mon Aug 24 18:32:21 2009 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2008/10/19 19:18:46 he Exp $
+# $NetBSD: Makefile,v 1.31 2009/08/24 18:32:21 hasso Exp $
#
-DISTNAME= prelude-manager-0.9.14.2
-PKGREVISION= 1
+DISTNAME= prelude-manager-0.9.15
CATEGORIES= security
MASTER_SITES= http://www.prelude-ids.com/download/releases/prelude-manager/ \
http://www.prelude-ids.org/download/releases/ \
@@ -12,36 +11,42 @@
HOMEPAGE= http://www.prelude-ids.org/download/releases/
COMMENT= Prelude IDS manager
+PKG_DESTDIR_SUPPORT= user-destdir
+
.include "../../mk/bsd.prefs.mk"
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= make
+USE_LANGUAGES= c c++
BUILD_DEFS+= VARBASE
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --with-libpreludedb-prefix=${BUILDLINK_PREFIX.libpreludedb}
+
RCD_SCRIPTS= preludemanager
PRELUDE_MANAGER_PID_DIR= ${VARBASE}/run/prelude-manager
PRELUDE_USER?= _prelude
PRELUDE_GROUP?= _prelude
PRELUDE_HOME?= ${VARBASE}/spool/prelude-manager
+OWN_DIRS_PERMS+= ${PRELUDE_HOME} ${PRELUDE_USER} ${PRELUDE_GROUP} 750
+OWN_DIRS+= ${PKG_SYSCONFDIR}/prelude-manager
INSTALLATION_DIRS= sbin
PKG_GROUPS_VARS+= PRELUDE_GROUP
PKG_USERS_VARS+= PRELUDE_USER
-PKG_GROUPS= ${PRELUDE_GROUP}
-PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}
+PKG_GROUPS= ${PRELUDE_GROUP}
+PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}
PKG_GECOS.${PRELUDE_USER}= Prelude IDS manager
PKG_HOME.${PRELUDE_USER}= ${PRELUDE_HOME}
-FILES_SUBST+= PRELUDE_MANAGER_PID_DIR=${PRELUDE_MANAGER_PID_DIR:Q}
-FILES_SUBST+= PRELUDE_USER=${PRELUDE_USER:Q}
-FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_USER:Q}
+FILES_SUBST+= PRELUDE_MANAGER_PID_DIR=${PRELUDE_MANAGER_PID_DIR:Q}
+FILES_SUBST+= PRELUDE_USER=${PRELUDE_USER:Q}
+FILES_SUBST+= PRELUDE_GROUP=${PRELUDE_USER:Q}
SUBST_CLASSES+= code
SUBST_STAGE.code= post-patch
@@ -56,13 +61,19 @@
pre-patch:
${CP} ${FILESDIR}/run-prelude-manager.c ${WRKSRC}
+pre-configure:
+ ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.so ${BUILDLINK_DIR}/lib/libltdlc.so
+
post-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o run-prelude-manager run-prelude-manager.c
post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/run-prelude-manager ${PREFIX}/sbin/run-prelude-manager
- ${CHOWN} -R ${PRELUDE_USER}:${PRELUDE_GROUP} ${PRELUDE_HOME}
+ ${INSTALL_PROGRAM} ${WRKSRC}/run-prelude-manager ${DESTDIR}${PREFIX}/sbin/run-prelude-manager
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../security/gnutls/libgnutls-config.mk"
.include "../../security/libprelude/buildlink3.mk"
.include "../../security/libpreludedb/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 4a9e6fed3bb7 -r f0531b484594 security/prelude-manager/PLIST
--- a/security/prelude-manager/PLIST Mon Aug 24 17:33:48 2009 +0000
+++ b/security/prelude-manager/PLIST Mon Aug 24 18:32:21 2009 +0000
@@ -1,18 +1,14 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:13:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/08/24 18:32:22 hasso Exp $
bin/prelude-manager
include/prelude-manager/prelude-manager.h
lib/prelude-manager/decodes/normalize.la
lib/prelude-manager/filters/idmef-criteria.la
-lib/prelude-manager/filters/thresholding.a
lib/prelude-manager/filters/thresholding.la
-lib/prelude-manager/filters/thresholding.so
lib/prelude-manager/reports/db.la
lib/prelude-manager/reports/debug.la
lib/prelude-manager/reports/relaying.la
lib/prelude-manager/reports/textmod.la
-lib/prelude-manager/reports/smtp.a
lib/prelude-manager/reports/smtp.la
-lib/prelude-manager/reports/smtp.so
sbin/run-prelude-manager
share/examples/prelude-manager/prelude-manager.conf
share/examples/rc.d/preludemanager
diff -r 4a9e6fed3bb7 -r f0531b484594 security/prelude-manager/distinfo
--- a/security/prelude-manager/distinfo Mon Aug 24 17:33:48 2009 +0000
+++ b/security/prelude-manager/distinfo Mon Aug 24 18:32:21 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2008/08/26 22:25:46 shannonjr Exp $
+$NetBSD: distinfo,v 1.19 2009/08/24 18:32:22 hasso Exp $
-SHA1 (prelude-manager-0.9.14.2.tar.gz) = a3af05cc775f7d8674dc4d963ed185abef1421d8
-RMD160 (prelude-manager-0.9.14.2.tar.gz) = c5cacef8b6b962bc650a5404e146e22ab9328956
-Size (prelude-manager-0.9.14.2.tar.gz) = 778280 bytes
+SHA1 (prelude-manager-0.9.15.tar.gz) = 3cb906c647d8fbf21671d8e43b30b3244af499b1
+RMD160 (prelude-manager-0.9.15.tar.gz) = ad59b27efeb8b05be189f6fb087a574291e9c470
+Size (prelude-manager-0.9.15.tar.gz) = 1008163 bytes
SHA1 (patch-aa) = 250034ddeba5188895a6d873ce108b1bf33dfcc5
-SHA1 (patch-ab) = b6b7272812ad7d7448ab998f212e7864913f0f1a
+SHA1 (patch-ab) = 29f8ff8528a73e05ef810cfa2c8b19325e527a53
diff -r 4a9e6fed3bb7 -r f0531b484594 security/prelude-manager/patches/patch-ab
--- a/security/prelude-manager/patches/patch-ab Mon Aug 24 17:33:48 2009 +0000
+++ b/security/prelude-manager/patches/patch-ab Mon Aug 24 18:32:21 2009 +0000
@@ -1,16 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2008/07/21 12:12:15 shannonjr Exp $
+$NetBSD: patch-ab,v 1.3 2009/08/24 18:32:22 hasso Exp $
---- Makefile.in.orig 2008-06-27 01:52:38.000000000 -0600
-+++ Makefile.in
-@@ -936,21 +936,12 @@ uninstall-info: uninstall-info-recursive
+--- Makefile.in.orig 2009-07-20 23:35:10 +0200
++++ Makefile.in 2009-07-20 23:41:18 +0200
+@@ -1208,21 +1208,8 @@
install-data-local:
-+ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/examples/prelude-manager;
- $(INSTALL) -d -m 700 $(DESTDIR)$(configdir);
- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir);
- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir);
- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir);
+- $(INSTALL) -d -m 700 $(DESTDIR)$(configdir);
+- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir);
+- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir);
+- $(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir);
- @if test -f $(DESTDIR)$(configdir)/prelude-manager.conf; then \
- $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \
- echo "********************************************************************************"; \
@@ -22,7 +21,8 @@
- else \
- $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/; \
- fi
++ $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/examples/prelude-manager;
+ $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(prefix)/share/examples/prelude-manager/;
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+
+ dist-hook:
+ @if test -d "$(srcdir)/.git"; then \
Home |
Main Index |
Thread Index |
Old Index