summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2017-11-10 10:34:51 +0000
committerjperkin <jperkin@pkgsrc.org>2017-11-10 10:34:51 +0000
commit98bbda1afd533a163f3555171f6bd457d48276c4 (patch)
tree2a1a59258e226eaf22451eca396bfe0f6d41c02e
parentcb8eab01ca4e3f5416fb61639bbfeb2e95f5bca4 (diff)
downloadpkgsrc-98bbda1afd533a163f3555171f6bd457d48276c4.tar.gz
logcheck: Remove unnecessary TMPDIR handling to be MAKE_JOBS safe.
-rw-r--r--security/logcheck/distinfo4
-rw-r--r--security/logcheck/patches/patch-aa24
2 files changed, 13 insertions, 15 deletions
diff --git a/security/logcheck/distinfo b/security/logcheck/distinfo
index 7ab0218e58e..07b049b35c9 100644
--- a/security/logcheck/distinfo
+++ b/security/logcheck/distinfo
@@ -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
diff --git a/security/logcheck/patches/patch-aa b/security/logcheck/patches/patch-aa
index 62e17622eb7..6c4fad6ad49 100644
--- a/security/logcheck/patches/patch-aa
+++ b/security/logcheck/patches/patch-aa
@@ -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:41 jmmv Exp $
# 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:41 jmmv Exp $
# 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:41 jmmv Exp $
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:41 jmmv Exp $
+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)