Date: Mon, 25 Aug 2014 14:11:58 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366078 - in head/security/openbsm-devel: . files Message-ID: <201408251411.s7PEBw9x022433@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Mon Aug 25 14:11:58 2014 New Revision: 366078 URL: http://svnweb.freebsd.org/changeset/ports/366078 QAT: https://qat.redports.org/buildarchive/r366078/ Log: - Merge in workaround from 191002 - Update LICENSE - Fix mtree issue on >= 9.2 - Bump PORTREVISION Added: head/security/openbsm-devel/files/patch-bin__auditdistd__subr.c (contents, props changed) Modified: head/security/openbsm-devel/Makefile head/security/openbsm-devel/pkg-plist Modified: head/security/openbsm-devel/Makefile ============================================================================== --- head/security/openbsm-devel/Makefile Mon Aug 25 14:09:46 2014 (r366077) +++ head/security/openbsm-devel/Makefile Mon Aug 25 14:11:58 2014 (r366078) @@ -3,7 +3,7 @@ PORTNAME= openbsm DISTVERSION= 1.2-alpha3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= http://www.trustedbsd.org/downloads/ \ http://mirrors.rit.edu/zi/ @@ -12,7 +12,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= zi@FreeBSD.org COMMENT= Open Source Basic Security Module (BSM) Audit Implementation -LICENSE= BSD +LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE CONFLICTS= openbsm-1.[0-9]* @@ -23,7 +23,7 @@ USE_LDCONFIG= yes USE_RC_SUBR= auditdistd SUB_FILES= pkg-message -PLIST_SUB= USERS=${USERS} GROUPS=${GROUPS} +PLIST_SUB= USERS=${USERS} GROUPS=${GROUPS} NEEDVARDIRS=${NEEDVARDIRS} USERS= auditdistd GROUPS= audit @@ -32,6 +32,12 @@ VARAUDIT= /var/audit .include <bsd.port.pre.mk> +.if ${OSVERSION} < 902000 && ${OSVERSION} >= 800000 +NEEDVARDIRS= "" +.else +NEEDVARDIRS= "@comment " +.endif + .if ${OSVERSION} <= 800000 IGNORE= requires FreeBSD 8.x or above .endif @@ -41,7 +47,12 @@ IGNORE= is not needed under FreeBSD 10. .endif post-install: - @${MKDIR} -m 0770 ${STAGEDIR}${VARAUDIT}/dist - @${MKDIR} -m 0700 ${STAGEDIR}${VARAUDIT}/remote + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libauditd.so.0.0.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libbsm.so.0.0.0 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/auditfilter_noop.so.0.0.0 +.if ${OSVERSION} < 902000 && ${OSVERSION} >= 800000 + @${MKDIR} -m 0770 \ + ${STAGEDIR}${VARAUDIT}/dist ${STAGEDIR}${VARAUDIT}/remote +.endif .include <bsd.port.post.mk> Added: head/security/openbsm-devel/files/patch-bin__auditdistd__subr.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/openbsm-devel/files/patch-bin__auditdistd__subr.c Mon Aug 25 14:11:58 2014 (r366078) @@ -0,0 +1,13 @@ +--- ./bin/auditdistd/subr.c.orig 2014-08-25 09:03:45.000000000 -0400 ++++ ./bin/auditdistd/subr.c 2014-08-25 09:05:35.000000000 -0400 +@@ -228,6 +228,10 @@ + PJDLOG_ASSERT(fd != -1); + + #ifdef HAVE_KQUEUE ++ if (wait_for_file_kq != -1) { ++ close(wait_for_file_kq); ++ wait_for_file_kq = -1; ++ } + kq = kqueue(); + if (kq == -1) { + pjdlog_errno(LOG_WARNING, "kqueue() failed"); Modified: head/security/openbsm-devel/pkg-plist ============================================================================== --- head/security/openbsm-devel/pkg-plist Mon Aug 25 14:09:46 2014 (r366077) +++ head/security/openbsm-devel/pkg-plist Mon Aug 25 14:11:58 2014 (r366078) @@ -64,10 +64,10 @@ sbin/auditfilterd sbin/auditreduce sbin/praudit @dirrm include/bsm -@cwd / -@exec mkdir -m 0770 var/audit/dist -@exec mkdir -m 0700 var/audit/remote -@exec chown %%USERS%%:%%GROUPS%% var/audit/dist -@exec chown %%USERS%%:wheel var/audit/remote -@dirrmtry var/audit/dist -@dirrmtry var/audit/remote +%%NEEDVARDIRS%%@cwd / +%%NEEDVARDIRS%%@exec mkdir -m 0770 var/audit/dist +%%NEEDVARDIRS%%@exec mkdir -m 0700 var/audit/remote +%%NEEDVARDIRS%%@exec chown %%USERS%%:%%GROUPS%% var/audit/dist +%%NEEDVARDIRS%%@exec chown %%USERS%%:wheel var/audit/remote +%%NEEDVARDIRS%%@dirrmtry var/audit/dist +%%NEEDVARDIRS%%@dirrmtry var/audit/remote
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408251411.s7PEBw9x022433>