Date: Tue, 09 Oct 2012 16:10:47 +0900 From: Takefu <takefu@airport.fm> To: freebsd-gnats-submit@FreeBSD.org Cc: glarkin@FreeBSD.org Subject: ports/172520: [PATCH] security/logcheck: update to 1.3.15 Message-ID: <5073CDF7.9050408@airport.fm> Resent-Message-ID: <201210092230.q99MU4rM042156@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172520
>Category: ports
>Synopsis: [PATCH] security/logcheck: update to 1.3.15
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 09 22:30:04 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Takefu
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
FOX Amateur Radio Club
>Environment:
System: FreeBSD RELENG_7_4.local_IPv4.airport.fm 7.4-RELEASE-p10 FreeBSD 7.4-RELEASE-p10 #0: Thu Aug 30 12:54:21 JST 2012
>Description:
- Update to 1.3.15
- fix portlint(1) compliant
Port maintainer (glarkin@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:
--- logcheck-1.3.15.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/logcheck/Makefile ./Makefile
--- /usr/ports/security/logcheck/Makefile 2012-03-21 05:13:42.000000000 +0900
+++ ./Makefile 2012-10-09 16:08:20.000000000 +0900
@@ -1,13 +1,8 @@
-# Ports collection makefile for: logcheck
-# Date created: 9 December 1999
-# Whom: Dan Langille <dan@freebsddiary.org>
-#
+# Created by: Dan Langille <dan@freebsddiary.org>
# $FreeBSD: ports/security/logcheck/Makefile,v 1.38 2012/03/20 20:13:42 glarkin Exp $
-#
PORTNAME= logcheck
-PORTVERSION= 1.3.14
-PORTREVISION= 1
+PORTVERSION= 1.3.15
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -26,13 +21,14 @@
LOGCHECK_GROUP= ${LOGCHECK_USER}
LOGCHECK_GID= ${LOGCHECK_UID}
-DBDIR= /var/db/${PORTNAME}
-RUNDIR= /var/run/${PORTNAME}
+BASEDIR?= # None. portlint compliance
+DBDIR= ${BASEDIR}/var/db/${PORTNAME}
+RUNDIR= ${BASEDIR}/var/run/${PORTNAME}
# Enable Perl dependency for logtail script
USE_PERL5= 5.8.0+
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${DISTNAME:S!_!-!}
BINMODE= 755
SHAREMODE= 640
SUB_LIST+= LOGCHECK_USER=${LOGCHECK_USER} \
@@ -55,6 +51,8 @@
extra-patch-src__logtail2
EXTRA_PATCHES= ${PATCH_LIST:C|^|${WRKDIR}/|g}
+.include <bsd.port.pre.mk>
+
pre-patch:
.for patch in ${PATCH_LIST}
@${SED} ${_SUB_LIST_TEMP} ${FILESDIR}/${patch}.in > ${WRKDIR}/${patch}
@@ -74,45 +72,39 @@
${INSTALL_SCRIPT} ${WRKSRC}/src/logtail ${PREFIX}/sbin
${INSTALL_SCRIPT} ${WRKSRC}/src/logtail2 ${PREFIX}/sbin
@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
- @${INSTALL} -d ${DBDIR}
- @${INSTALL} -d ${RUNDIR}
- ${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} ${DBDIR}
- @${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} \
- ${DBDIR}' >> ${TMPPLIST}
- ${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} ${RUNDIR}
+ @${INSTALL} -d -o ${LOGCHECK_USER} -g ${LOGCHECK_GROUP} \
+ ${DBDIR} ${RUNDIR}
@${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} \
- ${RUNDIR}' >> ${TMPPLIST}
- @${INSTALL} -d ${ETCDIR}
- @${INSTALL_DATA} ${WRKSRC}/etc/logcheck.conf \
+ ${DBDIR} ${RUNDIR}' >> ${TMPPLIST}
+ @${INSTALL} -d -g ${LOGCHECK_GROUP} ${ETCDIR}
+ @${INSTALL_DATA} -g ${LOGCHECK_GROUP} ${WRKSRC}/etc/logcheck.conf \
${ETCDIR}/logcheck.conf.sample
- @${INSTALL_DATA} ${WRKSRC}/etc/logcheck.logfiles \
+ @${INSTALL_DATA} -g ${LOGCHECK_GROUP} ${WRKSRC}/etc/logcheck.logfiles \
${ETCDIR}/logcheck.logfiles.sample
.for i in ${CONFIG_DIRS}
- @${INSTALL} -d ${ETCDIR}/${i}
- @${INSTALL_DATA} ${WRKSRC}/rulefiles/linux/${i}/* ${ETCDIR}/${i}
+ @${INSTALL} -d -g ${LOGCHECK_GROUP} ${ETCDIR}/${i}
+ @${INSTALL_DATA} -g ${LOGCHECK_GROUP} ${WRKSRC}/rulefiles/linux/${i}/* \
+ ${ETCDIR}/${i}
.endfor
- @${INSTALL} -d ${DATADIR}/detectrotate
- @${INSTALL_DATA} ${WRKSRC}/src/detectrotate/*.dtr ${DATADIR}/detectrotate
+ @${INSTALL} -d -g ${LOGCHECK_GROUP} ${DATADIR}/detectrotate
+ @${INSTALL_DATA} -g ${LOGCHECK_GROUP} ${WRKSRC}/src/detectrotate/*.dtr \
+ ${DATADIR}/detectrotate
.if !defined(NOPORTEXAMPLES)
@${INSTALL} -d ${EXAMPLESDIR}
- @${INSTALL_DATA} ${WRKSRC}/debian/logcheck.cron.d \
+ @${INSTALL_DATA} -m 0644 ${WRKSRC}/debian/logcheck.cron.d \
${EXAMPLESDIR}/crontab.in
.endif
- ${CHOWN} -R root:${LOGCHECK_GROUP} ${ETCDIR}
- @${ECHO_CMD} '@exec ${CHOWN} -R root:${LOGCHECK_GROUP} \
- ${ETCDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
- ${CHOWN} -R root:${LOGCHECK_GROUP} ${DATADIR}
- @${ECHO_CMD} '@exec ${CHOWN} -R root:${LOGCHECK_GROUP} \
+ @${ECHO_CMD} '@exec ${CHGRP} -R ${LOGCHECK_GROUP} \
+ ${ETCDIR:S|^${PREFIX}/|%D/|} \
${DATADIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${INSTALL_MAN} ${WRKSRC}/docs/*.8 ${MAN8PREFIX}/man/man8
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${INSTALL} -d ${DOCSDIR}
- @cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
- @${CHMOD} 644 ${DOCSDIR}/*
+ @cd ${WRKSRC} && ${INSTALL_DATA} -m 0644 ${DOCS} ${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/security/logcheck/distinfo ./distinfo
--- /usr/ports/security/logcheck/distinfo 2011-12-09 08:13:33.000000000 +0900
+++ ./distinfo 2012-10-09 15:53:01.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (logcheck_1.3.14.tar.gz) = aba50525b075e6b3446e18ff70b85d0704c82bcf80a5e21e4a5d2c27c555f6b0
-SIZE (logcheck_1.3.14.tar.gz) = 161518
+SHA256 (logcheck_1.3.15.tar.gz) = b29b4753940a9130b5f19f60d2d89af23be220674625f4bd2fb1d40945d0b9e5
+SIZE (logcheck_1.3.15.tar.gz) = 162397
diff -ruN --exclude=CVS /usr/ports/security/logcheck/pkg-plist ./pkg-plist
--- /usr/ports/security/logcheck/pkg-plist 2012-03-21 05:13:42.000000000 +0900
+++ ./pkg-plist 2012-10-09 15:59:36.000000000 +0900
@@ -49,6 +49,7 @@
%%ETCDIR%%/ignore.d.server/dkim-filter
%%ETCDIR%%/ignore.d.server/dnsmasq
%%ETCDIR%%/ignore.d.server/dovecot
+%%ETCDIR%%/ignore.d.server/dropbear
%%ETCDIR%%/ignore.d.server/dspam
%%ETCDIR%%/ignore.d.server/epmd
%%ETCDIR%%/ignore.d.server/exim4
@@ -159,6 +160,7 @@
%%ETCDIR%%/ignore.d.workstation/kdm
%%ETCDIR%%/ignore.d.workstation/kernel
%%ETCDIR%%/ignore.d.workstation/laptop-mode-tools
+%%ETCDIR%%/ignore.d.workstation/libmtp-runtime
%%ETCDIR%%/ignore.d.workstation/libpam-gnome-keyring
%%ETCDIR%%/ignore.d.workstation/logcheck
%%ETCDIR%%/ignore.d.workstation/login
--- logcheck-1.3.15.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5073CDF7.9050408>