Bug 186757 - update for ports-mgmt/jailaudit to version 1.5
Summary: update for ports-mgmt/jailaudit to version 1.5
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Ruslan Makhmatkhanov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-02-14 08:20 UTC by cryx-freebsd
Modified: 2014-02-14 10:10 UTC (History)
0 users

See Also:


Attachments
file.diff (2.72 KB, patch)
2014-02-14 08:20 UTC, cryx-freebsd
no flags Details | Diff
jailaudit-1.5.diff.txt (2.68 KB, text/plain)
2014-02-14 09:10 UTC, Philipp Wuensche
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description cryx-freebsd 2014-02-14 08:20:00 UTC
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.

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2014-02-14 08:20:08 UTC
Class Changed
From-To: maintainer-update->change-request

Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool)
Comment 2 Edwin Groothuis freebsd_committer 2014-02-14 08:20:09 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Edwin Groothuis freebsd_committer 2014-02-14 08:20:09 UTC
Maintainer of ports-mgmt/jailaudit,

Please note that PR ports/186757 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186757

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 4 Philipp Wuensche 2014-02-14 08:24:53 UTC
Edwin Groothuis wrote:
> Maintainer of ports-mgmt/jailaudit,
> 
> Please note that PR ports/186757 has just been submitted.
> 
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.
> 
> The full text of the PR can be found at:
>     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/186757

I approve my own patch. :)

Greetings,
Philipp
Comment 5 Ruslan Makhmatkhanov freebsd_committer 2014-02-14 09:04:09 UTC
State Changed
From-To: feedback->open

Hello, Philipp. You submitted the reversed patch. Please follow-up with 
correct patch. Thanks.
Comment 6 Philipp Wuensche 2014-02-14 09:10:53 UTC
I'm sorry, I've send the reverse patch! I now attached the correct one.
Comment 7 Ruslan Makhmatkhanov freebsd_committer 2014-02-14 09:50:06 UTC
Responsible Changed
From-To: freebsd-ports-bugs->rm

I will take it.
Comment 8 dfilter service freebsd_committer 2014-02-14 10:01:44 UTC
Author: rm
Date: Fri Feb 14 10:01:37 2014
New Revision: 344178
URL: http://svnweb.freebsd.org/changeset/ports/344178
QAT: https://qat.redports.org/buildarchive/r344178/

Log:
  - update to 1.5
  - add LICENSE (Beerware, maintainer is author of the port)
  - support staging
  - add dependency on ports-mgmt/portaudit for FreeBSD < 10
  
  PR:		186757
  Submitted by:	Philipp Wuensche <cryx-freebsd@h3q.com> (maintainer)

Modified:
  head/ports-mgmt/jailaudit/Makefile
  head/ports-mgmt/jailaudit/distinfo
  head/ports-mgmt/jailaudit/pkg-plist

Modified: head/ports-mgmt/jailaudit/Makefile
==============================================================================
--- head/ports-mgmt/jailaudit/Makefile	Fri Feb 14 09:59:19 2014	(r344177)
+++ head/ports-mgmt/jailaudit/Makefile	Fri Feb 14 10:01:37 2014	(r344178)
@@ -2,14 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	jailaudit
-PORTVERSION=	1.4
+PORTVERSION=	1.5
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://outpost.h3q.com/software/jailaudit/
 
 MAINTAINER=	cryx-ports@h3q.com
 COMMENT=	Script to generate portaudit reports for jails
 
-RUN_DEPENDS=	${LOCALBASE}/sbin/portaudit:${PORTSDIR}/ports-mgmt/portaudit
+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
 
 USE_BZIP2=	yes
 
@@ -21,5 +27,22 @@ PLIST_SUB+=	PERIODICDIR="${PERIODICDIR:S
 		REPORTDIR="${REPORTDIR:S,^${PREFIX}/,,}" \
 		XTMPDIR="${XTMPDIR:S,^${PREFIX}/,,}"
 
-NO_STAGE=	yes
-.include <bsd.port.mk>
+.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>

Modified: head/ports-mgmt/jailaudit/distinfo
==============================================================================
--- head/ports-mgmt/jailaudit/distinfo	Fri Feb 14 09:59:19 2014	(r344177)
+++ head/ports-mgmt/jailaudit/distinfo	Fri Feb 14 10:01:37 2014	(r344178)
@@ -1,2 +1,2 @@
-SHA256 (jailaudit-1.4.tar.bz2) = c1b95187bab7212d7b925d6c7e26f4e10dcba53650de5484497c779ba4a8e0c8
-SIZE (jailaudit-1.4.tar.bz2) = 2817
+SHA256 (jailaudit-1.5.tar.bz2) = 972c82d2b9888b6750b55711a432fd44b66cc65fb8618408ba9ec2a3c979ec93
+SIZE (jailaudit-1.5.tar.bz2) = 2818

Modified: head/ports-mgmt/jailaudit/pkg-plist
==============================================================================
--- head/ports-mgmt/jailaudit/pkg-plist	Fri Feb 14 09:59:19 2014	(r344177)
+++ head/ports-mgmt/jailaudit/pkg-plist	Fri Feb 14 10:01:37 2014	(r344178)
@@ -1,11 +1,8 @@
 bin/jailaudit
-etc/jailaudit.conf.sample
+%%ETCDIR%%.conf.sample
 %%PERIODICDIR%%/security/410.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 %%REPORTDIR%%
 @dirrmtry jailaudit
+@dirrmtry %%PERIODICDIR%%/security
+@dirrmtry %%PERIODICDIR%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 9 Ruslan Makhmatkhanov freebsd_committer 2014-02-14 10:02:16 UTC
State Changed
From-To: open->closed

Committed, thank you!