pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/pev pev: update to version 0.81
details: https://anonhg.NetBSD.org/pkgsrc/rev/f63d430ab08e
branches: trunk
changeset: 453426:f63d430ab08e
user: khorben <khorben%pkgsrc.org@localhost>
date: Sat May 29 23:28:36 2021 +0000
description:
pev: update to version 0.81
* libpe is now packaged separately (it is no longer shipped in the sources)
diffstat:
security/pev/Makefile | 19 +++++----------
security/pev/PLIST | 7 ++---
security/pev/distinfo | 17 +++++--------
security/pev/patches/patch-Makefile | 15 ++++++++++++
security/pev/patches/patch-src_Makefile | 27 ++++++++++++++--------
security/pev/patches/patch-src_pehash.c | 30 -------------------------
security/pev/patches/patch-src_pesec.c | 16 -------------
security/pev/patches/patch-src_plugins.c | 15 ------------
security/pev/patches/patch-src_plugins_Makefile | 24 --------------------
9 files changed, 49 insertions(+), 121 deletions(-)
diffs (249 lines):
diff -r 847c512e4045 -r f63d430ab08e security/pev/Makefile
--- a/security/pev/Makefile Sat May 29 23:24:23 2021 +0000
+++ b/security/pev/Makefile Sat May 29 23:28:36 2021 +0000
@@ -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@localhost
-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 @@
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"
diff -r 847c512e4045 -r f63d430ab08e security/pev/PLIST
--- a/security/pev/PLIST Sat May 29 23:24:23 2021 +0000
+++ b/security/pev/PLIST Sat May 29 23:28:36 2021 +0000
@@ -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/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 @@
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
diff -r 847c512e4045 -r f63d430ab08e security/pev/distinfo
--- a/security/pev/distinfo Sat May 29 23:24:23 2021 +0000
+++ b/security/pev/distinfo Sat May 29 23:28:36 2021 +0000
@@ -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
diff -r 847c512e4045 -r f63d430ab08e security/pev/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/security/pev/patches/patch-Makefile Sat May 29 23:28:36 2021 +0000
@@ -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
diff -r 847c512e4045 -r f63d430ab08e security/pev/patches/patch-src_Makefile
--- a/security/pev/patches/patch-src_Makefile Sat May 29 23:24:23 2021 +0000
+++ b/security/pev/patches/patch-src_Makefile Sat May 29 23:28:36 2021 +0000
@@ -1,18 +1,25 @@
-$NetBSD: patch-src_Makefile,v 1.4 2019/10/22 16:37:05 khorben Exp $
-
-Only link with libdl on Linux
+$NetBSD: patch-src_Makefile,v 1.5 2021/05/29 23:28:36 khorben Exp $
---- src/Makefile.orig 2017-01-07 22:34:07.000000000 +0000
+Only link with libdl on Linux.
+Let pkgsrc set the _FORTIFY_SOURCE level.
+
+--- 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)"\"
diff -r 847c512e4045 -r f63d430ab08e security/pev/patches/patch-src_pehash.c
--- a/security/pev/patches/patch-src_pehash.c Sat May 29 23:24:23 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_pehash.c,v 1.1 2019/10/22 16:37:05 khorben Exp $
-
-Compatibility fix for OpenSSL 1.1.0
-
---- src/pehash.c.orig 2017-01-06 22:49:50.000000000 +0000
-+++ src/pehash.c
-@@ -215,13 +215,22 @@ static void calc_hash(const char *alg_na
- unsigned char md_value[EVP_MAX_MD_SIZE];
- unsigned int md_len;
-
-- EVP_MD_CTX md_ctx;
- // FIXME: Handle errors - Check return values.
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+ EVP_MD_CTX * md_ctx;
-+ md_ctx = EVP_MD_CTX_new();
-+ EVP_DigestInit_ex(md_ctx, md, NULL);
-+ EVP_DigestUpdate(md_ctx, data, size);
-+ EVP_DigestFinal_ex(md_ctx, md_value, &md_len);
-+ EVP_MD_CTX_free(md_ctx);
-+#else
-+ EVP_MD_CTX md_ctx;
- EVP_MD_CTX_init(&md_ctx);
- EVP_DigestInit_ex(&md_ctx, md, NULL);
- EVP_DigestUpdate(&md_ctx, data, size);
- EVP_DigestFinal_ex(&md_ctx, md_value, &md_len);
- EVP_MD_CTX_cleanup(&md_ctx);
-+#endif
-
- for (unsigned int i=0; i < md_len; i++)
- sprintf(&output[i * 2], "%02x", md_value[i]);
diff -r 847c512e4045 -r f63d430ab08e security/pev/patches/patch-src_pesec.c
--- a/security/pev/patches/patch-src_pesec.c Sat May 29 23:24:23 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_pesec.c,v 1.1 2019/10/22 16:37:05 khorben Exp $
-
-Fix build with OpenSSL >= 1.1.0
-
---- src/pesec.c.orig 2017-01-06 22:27:18.000000000 +0000
-+++ src/pesec.c
-@@ -225,7 +225,9 @@ static int parse_pkcs7_data(const option
- PKCS7 *p7 = NULL;
- BIO *in = NULL;
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- CRYPTO_malloc_init();
-+#endif
- ERR_load_crypto_strings();
- OpenSSL_add_all_algorithms();
-
diff -r 847c512e4045 -r f63d430ab08e security/pev/patches/patch-src_plugins.c
--- a/security/pev/patches/patch-src_plugins.c Sat May 29 23:24:23 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins.c,v 1.1 2019/10/22 16:37:05 khorben Exp $
-
-Build fix for FreeBSD, NetBSD, and OpenBSD.
-
---- src/plugins.c.orig 2017-01-06 22:27:18.000000000 +0000
-+++ src/plugins.c
-@@ -167,7 +167,7 @@ int plugins_load_all_from_directory(cons
- const char *filename = dir_entry->d_name;
-
- // TODO(jweyrich): Use macro conditions for each system: .so, .dylib, .dll
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- const bool possible_plugin = utils_str_ends_with(filename, ".so") != 0;
- #elif defined(__APPLE__)
- const bool possible_plugin = utils_str_ends_with(filename, ".dylib") != 0;
diff -r 847c512e4045 -r f63d430ab08e security/pev/patches/patch-src_plugins_Makefile
--- a/security/pev/patches/patch-src_plugins_Makefile Sat May 29 23:24:23 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_plugins_Makefile,v 1.1 2020/03/27 20:56:25 joerg Exp $
-
---- src/plugins/Makefile.orig 2020-03-27 18:10:48.425427652 +0000
-+++ src/plugins/Makefile
-@@ -55,9 +55,7 @@ json: LIBNAME = $(json_LIBNAME)
- json: $(json_OBJS)
-
- $(PLUGINS):
--ifeq ($(PLATFORM_OS), Linux)
-- $(LINK) -shared -Wl,-soname,$(LIBNAME).so.1 $(LDFLAGS) -o ${plugins_BUILDDIR}/$(LIBNAME).so $^
--else ifeq ($(PLATFORM_OS), Darwin)
-+ifeq ($(PLATFORM_OS), Darwin)
- $(LINK) -headerpad_max_install_names -dynamiclib \
- -undefined dynamic_lookup -fno-common \
- -flat_namespace -install_name $(LIBNAME).$(VERSION).dylib \
-@@ -65,6 +63,8 @@ else ifeq ($(PLATFORM_OS), Darwin)
- $(LDFLAGS) -o ${plugins_BUILDDIR}/$(LIBNAME).dylib $^
- else ifeq ($(PLATFORM_OS), CYGWIN)
- $(LINK) -shared $(LDFLAGS) -o ${plugins_BUILDDIR}/$(LIBNAME).dll $^
-+else
-+ $(LINK) -shared -Wl,-soname,$(LIBNAME).so.1 $(LDFLAGS) -o ${plugins_BUILDDIR}/$(LIBNAME).so $^
- endif
-
- $(plugins_BUILDDIR)/%.o: %.c
Home |
Main Index |
Thread Index |
Old Index