[pkgsrc/trunk]: pkgsrc/security/pev Fixed the default path to "userdb.txt" in...

[khorben <khorben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f82c41bc9ed1
branches:  trunk
changeset: 643000:f82c41bc9ed1
user:      khorben <khorben%pkgsrc.org@localhost>
date:      Tue Dec 09 13:26:40 2014 +0000

description:
Fixed the default path to "userdb.txt" in pepack(1) (for pkg/49458)

diffstat:

 security/pev/Makefile                   |   3 ++-
 security/pev/distinfo                   |   5 +++--
 security/pev/patches/patch-src_Makefile |  14 +++++++++++---
 security/pev/patches/patch-src_pepack.c |  29 +++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 6 deletions(-)

diffs (89 lines):

diff -r 46efc8dbf6c2 -r f82c41bc9ed1 security/pev/Makefile
--- a/security/pev/Makefile     Tue Dec 09 13:22:56 2014 +0000
+++ b/security/pev/Makefile     Tue Dec 09 13:26:40 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2014/08/02 14:11:08 khorben Exp $
+# $NetBSD: Makefile,v 1.2 2014/12/09 13:26:40 khorben Exp $
 #
 
 DISTNAME=      pev-0.60
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pev/}
 
diff -r 46efc8dbf6c2 -r f82c41bc9ed1 security/pev/distinfo
--- a/security/pev/distinfo     Tue Dec 09 13:22:56 2014 +0000
+++ b/security/pev/distinfo     Tue Dec 09 13:26:40 2014 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2014/08/06 11:07:30 khorben Exp $
+$NetBSD: distinfo,v 1.3 2014/12/09 13:26:40 khorben Exp $
 
 SHA1 (pev-0.60.tar.gz) = 8d5e0bafb6dd4da0dcda6837928ad4babb6c8a94
 RMD160 (pev-0.60.tar.gz) = f585355f5971e72f208b56ad0db1ca8ba603f3cd
 Size (pev-0.60.tar.gz) = 212932 bytes
 SHA1 (patch-lib_libpe_Makefile) = 5adf4a60f3320da9deddf74a740dd152b1810f0a
-SHA1 (patch-src_Makefile) = f8b1a5e33820626b4afad487b50ec184239db3bf
+SHA1 (patch-src_Makefile) = 3a2aed9ed69b4ce0e6a297d39eb81010f24cab48
+SHA1 (patch-src_pepack.c) = 189b2c40a72453e3b1f3cc6efbbebda373bb37b0
diff -r 46efc8dbf6c2 -r f82c41bc9ed1 security/pev/patches/patch-src_Makefile
--- a/security/pev/patches/patch-src_Makefile   Tue Dec 09 13:22:56 2014 +0000
+++ b/security/pev/patches/patch-src_Makefile   Tue Dec 09 13:26:40 2014 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_Makefile,v 1.1 2014/08/02 14:11:08 khorben Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2014/12/09 13:26:40 khorben Exp $
 
 Fixed DESTDIR support
 
---- src/Makefile.orig  2012-10-31 03:59:14.000000000 +0000
+--- src/Makefile.orig  2013-01-23 12:37:31.000000000 +0000
 +++ src/Makefile
-@@ -20,9 +20,9 @@ RM = rm -f
+@@ -20,15 +20,17 @@ RM = rm -f
  SOURCES = output.c
  PROGS = readpe pedis pepack pescan rva2ofs pesec ofs2rva pestr pehash pestr
  INSTALL = install -m 0755
@@ -16,3 +16,11 @@
  
  ####### Build rules
  
+ # 'make' will compile all binaries
+ all: $(PROGS)
+ 
++pepack: CPPFLAGS += -DPREFIX=\"$(PREFIX)\"
++
+ pestr: CPPFLAGS += -D_GNU_SOURCE=1
+ pestr: LDFLAGS += -lpcre
+ pestr: pestr.c
diff -r 46efc8dbf6c2 -r f82c41bc9ed1 security/pev/patches/patch-src_pepack.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pev/patches/patch-src_pepack.c   Tue Dec 09 13:26:40 2014 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_pepack.c,v 1.1 2014/12/09 13:26:40 khorben Exp $
+
+Fixed the path to userdb.txt (see pkg/49458)
+
+--- src/pepack.c.orig  2012-10-31 03:59:14.000000000 +0000
++++ src/pepack.c
+@@ -21,6 +21,13 @@
+ 
+ #include "pepack.h"
+ 
++#ifndef PREFIX
++# define PREFIX "/usr"
++#endif
++#ifndef DATADIR
++# define DATADIR PREFIX "/share"
++#endif
++
+ struct options config;
+ static int ind;
+ 
+@@ -119,7 +126,7 @@ bool loaddb(FILE **fp)
+       *fp = fopen(dbfile, "r");       
+ 
+       if (!*fp)
+-              *fp = fopen("/usr/share/pev/userdb.txt", "r");
++              *fp = fopen(DATADIR "/pev/userdb.txt", "r");
+ 
+       return (*fp != NULL);
+ }