Date: Tue, 29 Nov 2011 09:58:03 +0900 From: Takefu <takefu@airport.fm> To: miwi@FreeBSD.org Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/162810: [UPDATE] security/logcheck: Update 1.3.14 Message-ID: <4ED42E1B.5020404@airport.fm> In-Reply-To: <201111281234.pASCYACb058929@freefall.freebsd.org> References: <201111281234.pASCYACb058929@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This would do?
--- logcheck.patch begins here ---
diff -ruN /usr/ports/security/logcheck/Makefile security/logcheck/Makefile
--- /usr/ports/security/logcheck/Makefile 2011-11-28 18:43:53.000000000 +0900
+++ security/logcheck/Makefile 2011-11-29 09:31:50.000000000 +0900
@@ -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,14 @@
LOGCHECK_GROUP= ${LOGCHECK_USER}
LOGCHECK_GID= ${LOGCHECK_UID}
+BASEDIR= # none
+DBDIR= ${BASEDIR}/var/db/${PORTNAME}
+RUNDIR= ${BASEDIR}/var/run/${PORTNAME}
+
# Enable Perl dependency for logtail script
USE_PERL5= 5.8.0+
-WRKSRC= ${WRKDIR}/${PORTNAME}
+WRKSRC= ${WRKDIR}/${DISTNAME:S!_!-!}
BINMODE= 755
SHAREMODE= 640
SUB_LIST+= LOGCHECK_USER=${LOGCHECK_USER} \
@@ -37,6 +40,7 @@
LOGCHECK_GROUP=${LOGCHECK_GROUP} \
LOGCHECK_GID=${LOGCHECK_GID} \
PW=${PW}
+PLIST_SUB+= BASEDIR=${BASEDIR} DBDIR=${DBDIR} RUNDIR=${RUNDIR}
SUB_FILES= pkg-install pkg-deinstall pkg-message
CONFIG_DIRS= cracking.d ignore.d.paranoid ignore.d.server \
ignore.d.workstation violations.d violations.ignore.d
@@ -56,9 +60,6 @@
@${SED} ${_SUB_LIST_TEMP} ${FILESDIR}/${patch}.in > ${WRKDIR}/${patch}
.endfor
-post-patch:
- @${FIND} ${WRKSRC}/rulefiles -type f -name \*.orig -delete
-
do-build:
@${REINPLACE_CMD} -e 's!/var/log/syslog!/var/log/messages!' \
${WRKSRC}/etc/logcheck.logfiles
@@ -70,14 +71,14 @@
${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
- @${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} \
- /var/db/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 ${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}
+ @${ECHO_CMD} '@exec ${CHOWN} -R ${LOGCHECK_USER}:${LOGCHECK_GROUP} '\
+ ${RUNDIR} >> ${TMPPLIST}
@${INSTALL} -d ${ETCDIR}
@${INSTALL_DATA} ${WRKSRC}/etc/logcheck.conf \
${ETCDIR}/logcheck.conf.sample
diff -ruN /usr/ports/security/logcheck/distinfo security/logcheck/distinfo
--- /usr/ports/security/logcheck/distinfo 2011-07-04 09:09:12.000000000 +0900
+++ security/logcheck/distinfo 2011-11-24 13:52:33.000000000 +0900
@@ -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
diff -ruN /usr/ports/security/logcheck/files/extra-patch-src__logcheck.in security/logcheck/files/extra-patch-src__logcheck.in
--- /usr/ports/security/logcheck/files/extra-patch-src__logcheck.in 2010-07-21 16:51:56.000000000 +0900
+++ security/logcheck/files/extra-patch-src__logcheck.in 2011-11-24 14:01:58.000000000 +0900
@@ -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"
diff -ruN /usr/ports/security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh
--- /usr/ports/security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh 2011-11-24 04:37:24.000000000 +0900
+++ security/logcheck/files/patch-rulefiles__linux__ignore.d.server__ssh 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
---- ./rulefiles/linux/ignore.d.server/ssh.orig 2010-09-03 04:24:30.000000000 -0400
-+++ ./rulefiles/linux/ignore.d.server/ssh 2011-11-23 14:25:31.000000000 -0500
-@@ -21,8 +21,8 @@
- ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: \(pam_unix\) check pass; user unknown$
- ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: \(pam_unix\) bad username \[[^]]+\]$
- ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: error: Could not get shadow information for NOUSER$
--^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: error: PAM: Authentication failure for( illegal user)? [^[:space:]]+ from ([:.[:xdigit:]]+|UNKNOWN|[-_.[:alnum:]]+)$
--^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: error: PAM: User not known to the underlying authentication module for i(llegal|nvalid) user [^[:space:]]+ from ([:.[:xdigit:]]+|UNKNOWN|[-_.[:alnum:]]+)$
-+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: error: PAM: authentication error for( illegal user)? [^[:space:]]+ from ([:.[:xdigit:]]+|UNKNOWN|[-_.[:alnum:]]+)$
-+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: error: PAM: unknown user for i(llegal|nvalid) user [^[:space:]]+ from ([:.[:xdigit:]]+|UNKNOWN|[-_.[:alnum:]]+)$
- ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: error: ssh_msg_send: write$
- ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: fatal: Timeout before authentication for [:[:alnum:].]+$
- ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ sshd\[[[:digit:]]+\]: fatal: Write failed: (Connection (timed out|reset by peer)|Broken pipe)$
diff -ruN /usr/ports/security/logcheck/pkg-plist security/logcheck/pkg-plist
--- /usr/ports/security/logcheck/pkg-plist 2010-08-19 12:44:39.000000000 +0900
+++ security/logcheck/pkg-plist 2011-11-29 08:58:56.000000000 +0900
@@ -142,7 +142,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 +206,7 @@
@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%%
--- logcheck.patch ends here ---
> can u please run portlint -AC, fix all errors and resend a patch? thx.
--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4ED42E1B.5020404>