Received: by mail.netbsd.org (Postfix, from userid 605) id CF97784DD5; Fri, 10 Nov 2017 10:34:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5A72684DC6 for ; Fri, 10 Nov 2017 10:34:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id XsUKQsFqgVli for ; Fri, 10 Nov 2017 10:34:51 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id CD90B84D20 for ; Fri, 10 Nov 2017 10:34:51 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C8591FBDE; Fri, 10 Nov 2017 10:34:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_151031009170900" MIME-Version: 1.0 Date: Fri, 10 Nov 2017 10:34:51 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/security/logcheck To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20171110103451.C8591FBDE@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_151031009170900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Fri Nov 10 10:34:51 UTC 2017 Modified Files: pkgsrc/security/logcheck: distinfo pkgsrc/security/logcheck/patches: patch-aa Log Message: logcheck: Remove unnecessary TMPDIR handling to be MAKE_JOBS safe. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/logcheck/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/logcheck/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_151031009170900 Content-Disposition: inline Content-Length: 3293 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/logcheck/distinfo diff -u pkgsrc/security/logcheck/distinfo:1.6 pkgsrc/security/logcheck/distinfo:1.7 --- pkgsrc/security/logcheck/distinfo:1.6 Wed Nov 4 01:17:50 2015 +++ pkgsrc/security/logcheck/distinfo Fri Nov 10 10:34:51 2017 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2015/11/04 01:17:50 agc Exp $ +$NetBSD: distinfo,v 1.7 2017/11/10 10:34:51 jperkin Exp $ SHA1 (logcheck-1.1.1.tar.gz) = 18f89f0dacfe9ff31076c006d58e1bcfedaa7f22 RMD160 (logcheck-1.1.1.tar.gz) = 1865f598b4bf32af466d4aec5e0803249a61c442 SHA512 (logcheck-1.1.1.tar.gz) = 4be045289259655e7b4da05dd1a07c649b2289fbc6f15dd424dc48ab980478f3ae49501f0e9e2035fddb9a40acaf2f4ab310ff8d95355196d82d41d6fc860143 Size (logcheck-1.1.1.tar.gz) = 30267 bytes -SHA1 (patch-aa) = 692e07b102925cad20e4e3e1ccea498d1aac72d5 +SHA1 (patch-aa) = 419dd28af1153bf0d8679b1cd2b6f9b637bc6346 SHA1 (patch-ab) = 768a1193e38513bc848a0b622ab06a1d47f54ff3 Index: pkgsrc/security/logcheck/patches/patch-aa diff -u pkgsrc/security/logcheck/patches/patch-aa:1.2 pkgsrc/security/logcheck/patches/patch-aa:1.3 --- pkgsrc/security/logcheck/patches/patch-aa:1.2 Thu May 1 20:43:41 2003 +++ pkgsrc/security/logcheck/patches/patch-aa Fri Nov 10 10:34:51 2017 @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2003/05/01 20:43:41 jmmv Exp $ +$NetBSD: patch-aa,v 1.3 2017/11/10 10:34:51 jperkin Exp $ ---- Makefile.orig 1999-10-31 16:07:29.000000000 +0100 +--- Makefile.orig 1999-10-31 15:07:29.000000000 +0000 +++ Makefile @@ -5,13 +5,15 @@ # Thanks to rbulling@obscure.org for cleaning this Makefile up.. @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2003/05/01 20:43 # Braindead HPUX compiler flags #CFLAGS = -O -Aa -@@ -19,35 +21,22 @@ CFLAGS = -O +@@ -19,35 +21,19 @@ CFLAGS = -O # the new paths!! # This is where keyword files go. @@ -34,11 +34,10 @@ $NetBSD: patch-aa,v 1.2 2003/05/01 20:43 # if you want this. /usr/local/etc was kept for compatibility reasons. -#INSTALLDIR_SH = /usr/local/bin -INSTALLDIR_SH = /usr/local/etc -+INSTALLDIR_SH = /usr/local/bin - - # The scratch directory for logcheck files. +- +-# The scratch directory for logcheck files. -TMPDIR = /usr/local/etc/tmp -+TMPDIR = /var/adm/tmp ++INSTALLDIR_SH = /usr/local/bin # Debug mode for logtail # CFLAGS = -g -DDEBUG @@ -60,7 +59,7 @@ $NetBSD: patch-aa,v 1.2 2003/05/01 20:43 clean: /bin/rm ./src/logtail ./src/logtail.o -@@ -60,19 +49,21 @@ uninstall: +@@ -60,19 +46,17 @@ uninstall: /bin/rm $(INSTALLDIR)/logcheck.violations.ignore /bin/rm $(INSTALLDIR_BIN)/logtail @@ -68,13 +67,12 @@ $NetBSD: patch-aa,v 1.2 2003/05/01 20:43 +build: @echo "Making $(SYSTYPE)" $(CC) $(CFLAGS) -o ./src/logtail ./src/logtail.c +- @echo "Creating temp directory $(TMPDIR)" +- @if [ ! -d $(TMPDIR) ]; then /bin/mkdir $(TMPDIR); fi +- @echo "Setting temp directory permissions" +- chmod 700 $(TMPDIR) + +install: - @echo "Creating temp directory $(TMPDIR)" -- @if [ ! -d $(TMPDIR) ]; then /bin/mkdir $(TMPDIR); fi -+ @if [ ! -d $(TMPDIR) ]; then /bin/mkdir -p $(TMPDIR); fi - @echo "Setting temp directory permissions" - chmod 700 $(TMPDIR) @echo "Copying files" - cp ./systems/$(SYSTYPE)/logcheck.hacking $(INSTALLDIR) - cp ./systems/$(SYSTYPE)/logcheck.violations $(INSTALLDIR) --_----------=_151031009170900--