Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Feb 2014 08:15:57 GMT
From:      Philipp Wuensche <cryx-freebsd@h3q.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/186757: update for ports-mgmt/jailaudit to version 1.5
Message-ID:  <201402140815.s1E8Fvp0042254@cgiserv.freebsd.org>
Resent-Message-ID: <201402140820.s1E8K0FP003202@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         186757
>Category:       ports
>Synopsis:       update for ports-mgmt/jailaudit to version 1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 14 08:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Philipp Wuensche
>Release:        9.2
>Organization:
>Environment:
>Description:
Update jailaudit to version 1.5.

This includes support for using pkg audit (if available) instead of portaudit.

The port itself is now able to use ports staging.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN freebsd-port/Makefile /usr/ports/ports-mgmt/jailaudit/Makefile
--- Makefile	2014-02-13 17:09:51.735593262 +0100
+++ Makefile	2014-01-22 18:00:46.000000000 +0100
@@ -1,18 +1,15 @@
 # Created by: Philipp Wuensche <cryx-ports@h3q.com>
-# $FreeBSD$
+# $FreeBSD: head/ports-mgmt/jailaudit/Makefile 340722 2014-01-22 17:00:46Z mat $
 
 PORTNAME=	jailaudit
-PORTVERSION=	1.5
+PORTVERSION=	1.4
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://outpost.h3q.com/software/jailaudit/
 
 MAINTAINER=	cryx-ports@h3q.com
 COMMENT=	Script to generate portaudit reports for jails
 
-LICENSE=        Beerware
-LICENSE_NAME=   Beerware
-LICENSE_TEXT=	"THE BEER-WARE LICENCE": Philipp Wuensche <cryx-ports@h3q.com> wrote this software. As long as you retain this notice you can do whatever you want with this stuff. If we meet some day, and you think this stuff is worth it, you can buy me a beer in return.
-LICENSE_PERMS=  auto-accept
+RUN_DEPENDS=	${LOCALBASE}/sbin/portaudit:${PORTSDIR}/ports-mgmt/portaudit
 
 USE_BZIP2=	yes
 
@@ -24,22 +21,5 @@
 		REPORTDIR="${REPORTDIR:S,^${PREFIX}/,,}" \
 		XTMPDIR="${XTMPDIR:S,^${PREFIX}/,,}"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 1000000
-RUN_DEPENDS=    ${LOCALBASE}/sbin/portaudit:${PORTSDIR}/ports-mgmt/portaudit
-.endif
-
-pre-install:
-	${MKDIR} ${STAGEDIR}${PERIODICDIR}/security
-
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/jailaudit ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/jailaudit.conf.sample ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_SCRIPT} ${WRKSRC}/410.jailaudit ${STAGEDIR}${PERIODICDIR}/security
-
-post-install:
-	${MKDIR} ${STAGEDIR}${REPORTDIR}
-	${MKDIR} ${STAGEDIR}${XTMPDIR}
-
-.include <bsd.port.post.mk>
+NO_STAGE=	yes
+.include <bsd.port.mk>
diff -ruN freebsd-port/distinfo /usr/ports/ports-mgmt/jailaudit/distinfo
--- distinfo	2014-02-13 17:09:51.733394844 +0100
+++ distinfo	2014-01-22 16:30:13.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (jailaudit-1.5.tar.bz2) = 972c82d2b9888b6750b55711a432fd44b66cc65fb8618408ba9ec2a3c979ec93
-SIZE (jailaudit-1.5.tar.bz2) = 2818
+SHA256 (jailaudit-1.4.tar.bz2) = c1b95187bab7212d7b925d6c7e26f4e10dcba53650de5484497c779ba4a8e0c8
+SIZE (jailaudit-1.4.tar.bz2) = 2817
diff -ruN freebsd-port/pkg-plist /usr/ports/ports-mgmt/jailaudit/pkg-plist
--- pkg-plist	2014-02-13 17:09:51.741379094 +0100
+++ pkg-plist	2014-01-22 16:16:56.000000000 +0100
@@ -1,8 +1,11 @@
 bin/jailaudit
-%%ETCDIR%%.conf.sample
+etc/jailaudit.conf.sample
 %%PERIODICDIR%%/security/410.jailaudit
-@dirrmtry %%XTMPDIR%%
-@dirrmtry %%REPORTDIR%%
-@dirrmtry jailaudit
 @dirrmtry %%PERIODICDIR%%/security
 @dirrmtry %%PERIODICDIR%%
+@exec mkdir -p %D/%%REPORTDIR%%
+@dirrmtry %%REPORTDIR%%
+@exec mkdir -p %D/%%XTMPDIR%%
+@dirrmtry %%XTMPDIR%%
+@unexec rmdir %DPDIR%% 2>/dev/null || true
+@dirrmtry jailaudit


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402140815.s1E8Fvp0042254>