diff options
| author | Ryan Steinmetz <zi@FreeBSD.org> | 2014-08-25 14:11:58 +0000 |
|---|---|---|
| committer | Ryan Steinmetz <zi@FreeBSD.org> | 2014-08-25 14:11:58 +0000 |
| commit | a2d9e3519905dfc33daa024ab9f0963df5036cde (patch) | |
| tree | 42c3865cafa629d83bc784af964c403836a692f9 /security | |
| parent | dc3e5ce5906ff91ac2919c414fe1e2da5ba9cd46 (diff) | |
| download | ports-a2d9e3519905dfc33daa024ab9f0963df5036cde.tar.gz ports-a2d9e3519905dfc33daa024ab9f0963df5036cde.zip | |
Notes
Diffstat (limited to 'security')
| -rw-r--r-- | security/openbsm-devel/Makefile | 21 | ||||
| -rw-r--r-- | security/openbsm-devel/files/patch-bin__auditdistd__subr.c | 13 | ||||
| -rw-r--r-- | security/openbsm-devel/pkg-plist | 14 |
3 files changed, 36 insertions, 12 deletions
diff --git a/security/openbsm-devel/Makefile b/security/openbsm-devel/Makefile index 972ce94fca42..2d249c2cb753 100644 --- a/security/openbsm-devel/Makefile +++ b/security/openbsm-devel/Makefile @@ -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.x or higher .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> diff --git a/security/openbsm-devel/files/patch-bin__auditdistd__subr.c b/security/openbsm-devel/files/patch-bin__auditdistd__subr.c new file mode 100644 index 000000000000..cee5f9cd3865 --- /dev/null +++ b/security/openbsm-devel/files/patch-bin__auditdistd__subr.c @@ -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"); diff --git a/security/openbsm-devel/pkg-plist b/security/openbsm-devel/pkg-plist index 72d49463b88f..598789306207 100644 --- a/security/openbsm-devel/pkg-plist +++ b/security/openbsm-devel/pkg-plist @@ -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 |