From 73a85a9570af3d21d6e45740a113dc74e68a95ba Mon Sep 17 00:00:00 2001
From: glarkin <glarkin@FreeBSD.org>
Date: Mon, 8 Sep 2008 20:09:59 +0000
Subject: - Fixed left-over directory problem - Added entries for logcheck user
 in UIDs and GIDs - Fixed package building problems (perms and empty dir
 creation)

Reported by:	QA Tindy
Approved by:	portmgr (erwin)
---
 security/logcheck/Makefile  | 17 +++++++++++++----
 security/logcheck/pkg-plist |  4 ++++
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'security')

diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index 605ed57c64e9..56d16ea35824 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	logcheck
 PORTVERSION=	1.2.54
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.debian.org/debian/pool/main/l/logcheck/ \
 		http://ftp.de.debian.org/debian/pool/main/l/logcheck/
@@ -30,6 +31,9 @@ DOCS=		AUTHORS CHANGES CREDITS LICENSE TODO docs/README*
 PORTDOCS=	${DOCS:T}
 MAN8=		logcheck.8 logtail.8
 
+LOGCHECK_USER=	logcheck
+LOGCHECK_GROUP=	${LOGCHECK_USER}
+
 do-build:
 	${REINPLACE_CMD} -e 's!/var/log/syslog!/var/log/messages!' \
 	${WRKSRC}/etc/logcheck.logfiles
@@ -44,8 +48,12 @@ do-install:
 	@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	@${INSTALL} -d /var/lib/logcheck
 	@${INSTALL} -d /var/run/logcheck
-	${CHOWN} logcheck:logcheck /var/lib/logcheck
-	${CHOWN} logcheck:logcheck /var/run/logcheck
+	${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} /var/lib/logcheck
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} \
+		/var/lib/logcheck' >> ${TMPPLIST}
+	${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} /var/run/logcheck
+	@${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} \
+		/var/run/logcheck' >> ${TMPPLIST}
 	@${INSTALL} -d ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/etc/logcheck.conf ${ETCDIR}/logcheck.conf.sample
 	@${INSTALL_DATA} ${WRKSRC}/etc/logcheck.logfiles ${ETCDIR}/logcheck.logfiles.sample
@@ -53,12 +61,13 @@ do-install:
 	@${INSTALL} -d ${ETCDIR}/${i}
 	@${INSTALL_DATA} ${WRKSRC}/rulefiles/linux/${i}/* ${ETCDIR}/${i}
 .endfor
-	@${INSTALL} -d ${DOCSDIR}
 .if !defined(NOPORTEXAMPLES)
 	@${INSTALL} -d ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d ${EXAMPLESDIR}/crontab.in
 .endif
-	${CHOWN} -R root:logcheck ${ETCDIR}
+	${CHOWN} -R root:${LOGCHECK_GROUP} ${ETCDIR}
+	@${ECHO_CMD} '@exec ${CHOWN} -R root:${LOGCHECK_GROUP} \
+		${ETCDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
 	@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${INSTALL_MAN} ${WRKSRC}/docs/*.8 ${MAN8PREFIX}/man/man8
 
diff --git a/security/logcheck/pkg-plist b/security/logcheck/pkg-plist
index e990d28f7e75..fe15aa1ec1a6 100644
--- a/security/logcheck/pkg-plist
+++ b/security/logcheck/pkg-plist
@@ -182,3 +182,7 @@ sbin/logtail
 @dirrm %%ETCDIR%%/ignore.d.paranoid
 @dirrm %%ETCDIR%%/cracking.d
 @dirrm %%ETCDIR%%
+@exec mkdir -p /var/lib/logcheck
+@unexec rm -rf /var/lib/logcheck 2> /dev/null || true
+@exec mkdir -p /var/run/logcheck
+@unexec rm -rf /var/run/logcheck 2> /dev/null || true
-- 
cgit