- Updated to 1.3.14

ChangeLog: http://packages.debian.org/changelogs/pool/main/l/logcheck/logcheck_1.3.14/changelog

PR:		ports/162810
Submitted by:	Takefu <takefu@airport.fm>
Feature safe:	yes

security/logcheck/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	logcheck
-PORTVERSION=	1.3.13
-PORTREVISION=	1
+PORTVERSION=	1.3.14
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -26,10 +25,13 @@ LOGCHECK_UID=	915
 LOGCHECK_GROUP=	${LOGCHECK_USER}
 LOGCHECK_GID=	${LOGCHECK_UID}
 
+DBDIR=		/var/db/${PORTNAME}
+RUNDIR=		/var/run/${PORTNAME}
+
 # Enable Perl dependency for logtail script
 USE_PERL5=	5.8.0+
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BINMODE=	755
 SHAREMODE=	640
 SUB_LIST+=	LOGCHECK_USER=${LOGCHECK_USER} \
@@ -38,6 +40,7 @@ SUB_LIST+=	LOGCHECK_USER=${LOGCHECK_USER} \
 		LOGCHECK_GID=${LOGCHECK_GID} \
 		PW=${PW}
 SUB_FILES=	pkg-install pkg-deinstall pkg-message
+PLIST_SUB+=	DBDIR=${DBDIR} RUNDIR=${RUNDIR}
 CONFIG_DIRS=	cracking.d ignore.d.paranoid ignore.d.server \
 		ignore.d.workstation violations.d violations.ignore.d
 DOCS=		AUTHORS CHANGES CREDITS LICENSE TODO docs/README*
@@ -70,14 +73,14 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/logtail ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/logtail2 ${PREFIX}/sbin
 	@PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	@${INSTALL} -d /var/db/logcheck
-	@${INSTALL} -d /var/run/logcheck
-	${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} /var/db/logcheck
+	@${INSTALL} -d ${DBDIR}
+	@${INSTALL} -d ${RUNDIR}
+	${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} ${DBDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} \
-		/var/db/logcheck' >> ${TMPPLIST}
-	${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} /var/run/logcheck
+		${DBDIR}' >> ${TMPPLIST}
+	${CHOWN} ${LOGCHECK_USER}:${LOGCHECK_GROUP} ${RUNDIR}
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} \
-		/var/run/logcheck' >> ${TMPPLIST}
+		${RUNDIR}' >> ${TMPPLIST}
 	@${INSTALL} -d ${ETCDIR}
 	@${INSTALL_DATA} ${WRKSRC}/etc/logcheck.conf \
 		${ETCDIR}/logcheck.conf.sample

security/logcheck/distinfo

@@ -1,2 +1,2 @@
-SHA256 (logcheck_1.3.13.tar.gz) = 199e062eb98292eb5345b916689ec734d97b6c6c42d472a5cd4fb99dd5197f6b
-SIZE (logcheck_1.3.13.tar.gz) = 162167
+SHA256 (logcheck_1.3.14.tar.gz) = aba50525b075e6b3446e18ff70b85d0704c82bcf80a5e21e4a5d2c27c555f6b0
+SIZE (logcheck_1.3.14.tar.gz) = 161518

security/logcheck/files/extra-patch-src__logcheck.in

@@ -26,15 +26,6 @@
      exit 1
  fi
  
-@@ -51,7 +44,7 @@
- 
- # Get the details for the email message
- DATE="$(date +'%Y-%m-%d %H:%M')"
--VERSION="1.3.7"
-+VERSION="1.3.10"
- 
- # Set the default report level
- REPORTLEVEL="server"
 @@ -69,12 +62,12 @@
  ADDTAG="no"
  

security/logcheck/pkg-plist

@@ -88,7 +88,6 @@
 %%ETCDIR%%/ignore.d.server/nntpcache
 %%ETCDIR%%/ignore.d.server/nscd
 %%ETCDIR%%/ignore.d.server/nslcd
-@comment %%ETCDIR%%/ignore.d.server/ntop
 %%ETCDIR%%/ignore.d.server/openvpn
 %%ETCDIR%%/ignore.d.server/otrs
 %%ETCDIR%%/ignore.d.server/passwd
@@ -142,7 +141,6 @@
 %%ETCDIR%%/ignore.d.server/userv
 %%ETCDIR%%/ignore.d.server/vsftpd
 %%ETCDIR%%/ignore.d.server/watchdog
-%%ETCDIR%%/ignore.d.server/webmin
 %%ETCDIR%%/ignore.d.server/wu-ftpd
 %%ETCDIR%%/ignore.d.server/xinetd
 %%ETCDIR%%/ignore.d.workstation/automount
@@ -207,7 +205,7 @@ sbin/logtail2
 @dirrm %%DATADIR%%/detectrotate
 @dirrm %%DATADIR%%
 @cwd /
-@exec mkdir -p /var/db/logcheck
-@dirrmtry /var/db/logcheck
-@exec mkdir -p /var/run/logcheck
-@dirrmtry /var/run/logcheck
+@exec mkdir -p %%DBDIR%%
+@dirrmtry %%DBDIR%%
+@exec mkdir -p %%RUNDIR%%
+@dirrmtry %%RUNDIR%%