From owner-svn-ports-all@FreeBSD.ORG Thu Jun 26 19:41:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59319607; Thu, 26 Jun 2014 19:41:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3A9DB2046; Thu, 26 Jun 2014 19:41:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5QJf3Rd076280; Thu, 26 Jun 2014 19:41:03 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5QJf2HH076277; Thu, 26 Jun 2014 19:41:02 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201406261941.s5QJf2HH076277@svn.freebsd.org> From: Cy Schubert Date: Thu, 26 Jun 2014 19:41:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359413 - head/security/aide X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jun 2014 19:41:03 -0000 Author: cy Date: Thu Jun 26 19:41:02 2014 New Revision: 359413 URL: http://svnweb.freebsd.org/changeset/ports/359413 QAT: https://qat.redports.org/buildarchive/r359413/ Log: Support stage. Remove redundant database creation already in pkg-plist. Modified: head/security/aide/Makefile head/security/aide/pkg-plist Modified: head/security/aide/Makefile ============================================================================== --- head/security/aide/Makefile Thu Jun 26 19:37:31 2014 (r359412) +++ head/security/aide/Makefile Thu Jun 26 19:41:02 2014 (r359413) @@ -12,10 +12,9 @@ MASTER_SITES= SF \ MAINTAINER= cy@FreeBSD.org COMMENT= Replacement and extension for Tripwire -LIB_DEPENDS= mhash.2:${PORTSDIR}/security/mhash +LIB_DEPENDS= libmhash.so:${PORTSDIR}/security/mhash USES= bison gmake -NO_STAGE= yes .include USE_AUTOTOOLS= autoconf @@ -34,30 +33,9 @@ MAN5= aide.conf.5 SUB_FILES= pkg-message post-install: - @${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${PREFIX}/etc/aide.conf.sample - @if [ ! -f ${PREFIX}/etc/aide.conf ]; then \ - ${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${PREFIX}/etc/aide.conf ; \ + @${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${STAGEDIR}${PREFIX}/etc/aide.conf.sample + @if [ ! -f ${STAGEDOIR}${PREFIX}/etc/aide.conf ]; then \ + ${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${STAGEDIR}${PREFIX}/etc/aide.conf ; \ fi - @if [ ! -d /var/db/aide/databases ]; then \ - ${MKDIR} /var/db/aide/databases; \ - ${CHOWN} root:wheel /var/db/aide ; \ - ${CHOWN} root:wheel /var/db/aide/databases ; \ - ${CHMOD} 0700 /var/db/aide ; \ - ${CHMOD} 0700 /var/db/aide/databases ; \ - fi - @${ECHO} - @${CAT} ${PKGMESSAGE} - @${ECHO} -.if defined(AIDE_FLOPPY) - @disklabel -w -B /dev/rfd0c fd1440 - @newfs -u 0 -t 0 -i 196608 -m 0 -T minimum -o space /dev/rfd0c - @mount /dev/fd0c /mnt - @${CP} ${PREFIX}/bin/aide /mnt/aide - @${CP} -p /var/db/aide/aide.conf /mnt/aide.conf - @${CP} < /var/db/aide/databases/aide.db /mnt/aide.db - @${CHMOD} 555 /mnt/aide - @umount /mnt - @${ECHO} Do not forget to remove and write-protect the floppy. -.endif .include Modified: head/security/aide/pkg-plist ============================================================================== --- head/security/aide/pkg-plist Thu Jun 26 19:37:31 2014 (r359412) +++ head/security/aide/pkg-plist Thu Jun 26 19:41:02 2014 (r359413) @@ -1,12 +1,11 @@ bin/aide @unexec if cmp -s %D/etc/aide.conf %D/etc/aide.conf.sample; then rm -f %D/etc/aide.conf; fi etc/aide.conf.sample +man/man1/aide.1.gz +man/man5/aide.conf.5.gz @exec [ ! -f %B/aide.conf ] && cp %B/%f %B/aide.conf @exec /bin/mkdir -p /var/db/aide/databases @exec [ -f /var/db/aide/aide.conf ] || /usr/sbin/chown root:wheel /var/db/aide @exec [ -f /var/db/aide/aide.conf ] || /usr/sbin/chown root:wheel /var/db/aide/databases @exec [ -f /var/db/aide/aide.conf ] || /bin/chmod 0700 /var/db/aide @exec [ -f /var/db/aide/aide.conf ] || /bin/chmod 0700 /var/db/aide/databases -@unexec rmdir /var/db/aide/databases 2>/dev/null || true -@unexec rmdir /var/db/aide 2>/dev/null || true -@unexec rmdir /var/db 2>/dev/null || true