Received: by mail.netbsd.org (Postfix, from userid 605) id 72E1484D43; Sat, 29 May 2021 23:28:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ADAA984D16 for ; Sat, 29 May 2021 23:28:37 +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 uRk-7QojNXXp for ; Sat, 29 May 2021 23:28:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E23F884CDC for ; Sat, 29 May 2021 23:28:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D9ED4FA95; Sat, 29 May 2021 23:28:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1622330916198320" MIME-Version: 1.0 Date: Sat, 29 May 2021 23:28:36 +0000 From: "Pierre Pronchery" Subject: CVS commit: pkgsrc/security/pev To: pkgsrc-changes@NetBSD.org Reply-To: khorben@netbsd.org X-Mailer: log_accum Message-Id: <20210529232836.D9ED4FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1622330916198320 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: khorben Date: Sat May 29 23:28:36 UTC 2021 Modified Files: pkgsrc/security/pev: Makefile PLIST distinfo pkgsrc/security/pev/patches: patch-src_Makefile Added Files: pkgsrc/security/pev/patches: patch-Makefile Removed Files: pkgsrc/security/pev/patches: patch-src_pehash.c patch-src_pesec.c patch-src_plugins.c patch-src_plugins_Makefile Log Message: pev: update to version 0.81 * libpe is now packaged separately (it is no longer shipped in the sources) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/pev/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/pev/PLIST cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/pev/distinfo cvs rdiff -u -r0 -r1.3 pkgsrc/security/pev/patches/patch-Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/pev/patches/patch-src_Makefile cvs rdiff -u -r1.1 -r0 pkgsrc/security/pev/patches/patch-src_pehash.c \ pkgsrc/security/pev/patches/patch-src_pesec.c \ pkgsrc/security/pev/patches/patch-src_plugins.c \ pkgsrc/security/pev/patches/patch-src_plugins_Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1622330916198320 Content-Disposition: inline Content-Length: 5790 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/security/pev/Makefile diff -u pkgsrc/security/pev/Makefile:1.8 pkgsrc/security/pev/Makefile:1.9 --- pkgsrc/security/pev/Makefile:1.8 Fri Mar 20 11:58:18 2020 +++ pkgsrc/security/pev/Makefile Sat May 29 23:28:36 2021 @@ -1,17 +1,14 @@ -# $NetBSD: Makefile,v 1.8 2020/03/20 11:58:18 nia Exp $ -# +# $NetBSD: Makefile,v 1.9 2021/05/29 23:28:36 khorben Exp $ -DISTNAME= pev-0.80 -PKGREVISION= 1 +DISTNAME= ${GITHUB_PROJECT}-0.81 CATEGORIES= security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pev/} - -WRKSRC= ${WRKDIR}/pev +MASTER_SITES= ${MASTER_SITE_GITHUB:=merces/} +GITHUB_PROJECT= pev +GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= khorben@defora.org -HOMEPAGE= http://pev.sourceforge.net/ +HOMEPAGE= https://pev.sourceforge.io/ COMMENT= The PE analysis toolkit - LICENSE= gnu-gpl-v3 USE_TOOLS+= gmake @@ -21,8 +18,6 @@ USE_TOOLS+= gmake MAKE_FLAGS+= DESTDIR=${DESTDIR} MAKE_FLAGS+= prefix=${PREFIX} MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR} -AUTO_MKDIRS= yes -.include "../../security/openssl/buildlink3.mk" -.include "../../devel/pcre/buildlink3.mk" +.include "../../security/libpe/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/security/pev/PLIST diff -u pkgsrc/security/pev/PLIST:1.3 pkgsrc/security/pev/PLIST:1.4 --- pkgsrc/security/pev/PLIST:1.3 Tue Oct 22 16:37:05 2019 +++ pkgsrc/security/pev/PLIST Sat May 29 23:28:36 2021 @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2019/10/22 16:37:05 khorben Exp $ +@comment $NetBSD: PLIST,v 1.4 2021/05/29 23:28:36 khorben Exp $ bin/ofs2rva bin/pedis bin/pehash +bin/peldd bin/pepack bin/peres bin/pescan @@ -9,9 +10,6 @@ bin/pesec bin/pestr bin/readpe bin/rva2ofs -lib/libpe.so -lib/libpe.so.1 -lib/libpe.so.1.0 lib/pev/plugins/csv_plugin.so lib/pev/plugins/html_plugin.so lib/pev/plugins/json_plugin.so @@ -20,6 +18,7 @@ lib/pev/plugins/xml_plugin.so man/man1/ofs2rva.1 man/man1/pedis.1 man/man1/pehash.1 +man/man1/peldd.1 man/man1/pepack.1 man/man1/peres.1 man/man1/pescan.1 Index: pkgsrc/security/pev/distinfo diff -u pkgsrc/security/pev/distinfo:1.7 pkgsrc/security/pev/distinfo:1.8 --- pkgsrc/security/pev/distinfo:1.7 Fri Mar 27 20:56:25 2020 +++ pkgsrc/security/pev/distinfo Sat May 29 23:28:36 2021 @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.7 2020/03/27 20:56:25 joerg Exp $ +$NetBSD: distinfo,v 1.8 2021/05/29 23:28:36 khorben Exp $ -SHA1 (pev-0.80.tar.gz) = 18dcb65269344b5047504cca8598477b33532bab -RMD160 (pev-0.80.tar.gz) = 01ed4fa37c5349397dbd8aa3b592b9657e63acf8 -SHA512 (pev-0.80.tar.gz) = d0c8ff8fcd60470899d5dbccfd7a7e4d960da007f42be9c7eab6b22a3d7cf4dde3c3d5cd9c7d70e369164503fb124640cf508ceda3d4792244cf33d11ab83321 -Size (pev-0.80.tar.gz) = 921102 bytes -SHA1 (patch-src_Makefile) = f51a9d6afa64de8ba761a9b889911403b0107aad -SHA1 (patch-src_pehash.c) = c31083fca0d98dc607eb4f8b338bd93dd714f594 -SHA1 (patch-src_pesec.c) = fa302aa9bf2f07558f6cef0c41b0cd9063df7706 -SHA1 (patch-src_plugins.c) = c85c5c3b918850c7383f30d2efdae38985cdd143 -SHA1 (patch-src_plugins_Makefile) = ef5357385db2ac15c4f853b296dfee3703fd62eb +SHA1 (pev-0.81.tar.gz) = ee889b859f4a79618d552c11f2c0fc3f697a2d3d +RMD160 (pev-0.81.tar.gz) = 2a249110649aaf328cea72bca95ce6d8b31090bb +SHA512 (pev-0.81.tar.gz) = a1266c4281018a5e2b185506edd4604ac1e02aad88344d73acc2dc0980f9231e25a38529baaf663721fbc695403b85c2a2a211512659af7b5c08320b9644f4a3 +Size (pev-0.81.tar.gz) = 549225 bytes +SHA1 (patch-Makefile) = bccdd8d698e72e09de905fc6aecbf8f87239b8af +SHA1 (patch-src_Makefile) = 3580c8a4feff3b8f7f6525401675ede76f91d848 Index: pkgsrc/security/pev/patches/patch-src_Makefile diff -u pkgsrc/security/pev/patches/patch-src_Makefile:1.4 pkgsrc/security/pev/patches/patch-src_Makefile:1.5 --- pkgsrc/security/pev/patches/patch-src_Makefile:1.4 Tue Oct 22 16:37:05 2019 +++ pkgsrc/security/pev/patches/patch-src_Makefile Sat May 29 23:28:36 2021 @@ -1,18 +1,25 @@ -$NetBSD: patch-src_Makefile,v 1.4 2019/10/22 16:37:05 khorben Exp $ +$NetBSD: patch-src_Makefile,v 1.5 2021/05/29 23:28:36 khorben Exp $ -Only link with libdl on Linux +Only link with libdl on Linux. +Let pkgsrc set the _FORTIFY_SOURCE level. ---- src/Makefile.orig 2017-01-07 22:34:07.000000000 +0000 +--- src/Makefile.orig 2021-01-11 23:29:21.000000000 +0000 +++ src/Makefile -@@ -52,7 +52,10 @@ endif +@@ -52,13 +52,14 @@ endif ####### Compiler options --override LDFLAGS += -L$(LIBPE) -lpe -ldl -+override LDFLAGS += -L$(LIBPE) -lpe +ifeq ($(PLATFORM_OS), Linux) -+override LDFLAGS += -ldl + override LDFLAGS += -L$(LIBPE) -lpe -lcrypto -lssl -ldl -lm ++else ++override LDFLAGS += -L$(LIBPE) -lpe -lcrypto -lssl -lm +endif - override CFLAGS += -I$(LIBPE) -I"../include" -W -Wall -Wextra -std=c99 -pedantic - override CPPFLAGS += -D_GNU_SOURCE -DSHAREDIR="\"$(SHAREDIR)"\" + override CFLAGS += -I$(LIBPE)/include -I"../include" -W -Wall -Wextra -std=c99 -pedantic +-# Some gcc/clang builds (depends on the distro) already define _FORTIFY_SOURCE internally, so we +-# undefine it first to avoid redefinition warnings. + override CPPFLAGS += \ + -D_GNU_SOURCE \ +- -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 \ + -DSHAREDIR="\"$(SHAREDIR)"\" \ + -DPLUGINSDIR="\"$(pluginsdir)"\" Added files: Index: pkgsrc/security/pev/patches/patch-Makefile diff -u /dev/null pkgsrc/security/pev/patches/patch-Makefile:1.3 --- /dev/null Sat May 29 23:28:36 2021 +++ pkgsrc/security/pev/patches/patch-Makefile Sat May 29 23:28:36 2021 @@ -0,0 +1,15 @@ +$NetBSD: patch-Makefile,v 1.3 2021/05/29 23:28:36 khorben Exp $ + +Disable building libpe (it is packaged separately) + +--- Makefile.orig 2021-01-11 23:29:21.000000000 +0000 ++++ Makefile +@@ -6,7 +6,7 @@ ZIPFILE = $(ZIPDIR).zip + + all: + %: +- cd $(LIBPE_DIR) && $(MAKE) $@ ++ #cd $(LIBPE_DIR) && $(MAKE) $@ + cd $(PEV_DIR) && $(MAKE) $@ + + # Cygwin only --_----------=_1622330916198320--