From nobody Fri Jul 1 10:02:57 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B90FF8A5105; Fri, 1 Jul 2022 10:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LZ9k92Qxvz3M1l; Fri, 1 Jul 2022 10:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656669777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l0W0v8YWpTdyJtzSpOZwLBUCfQZdduo1E7D2Et6gnq4=; b=CeV8vZtt5QJBu40NC5NnnvtSYpLbOB+hTIx5CPp1F0n565h5JI7gcIJnGQi7z9rWRzjlE6 C2rrbCCuAdD5d+XaJhf6yFqn0vTCEsy1Bitg+gj1kktkG4EfOHX9Ha9JVBrSh8JsfnYRei w3QV4SryQXJc6w9DQwHk2T0S0JS/joAXeS/2X7xhslRNwxUDRNnX0Pxdz31xh3waOt9Ben jtwQmbzWvUnXKCrDuz4HVhnFF85JddPIIb717L2gKPLB407B1nPwv6i2vTFE11wzslcmRu aP9usLVKYUvYYdMaC+KldYb7Lmpe7IZZwYT1LyxF2eeqRHZhFafw9wvb3zd+YQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 30F72195A4; Fri, 1 Jul 2022 10:02:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 261A2v9u064607; Fri, 1 Jul 2022 10:02:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 261A2vn3064606; Fri, 1 Jul 2022 10:02:57 GMT (envelope-from git) Date: Fri, 1 Jul 2022 10:02:57 GMT Message-Id: <202207011002.261A2vn3064606@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 4d75bb040d3c - main - cleanup: Remove expired ports: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d75bb040d3cc1398fb3163bd45b7c3babc10083 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656669777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l0W0v8YWpTdyJtzSpOZwLBUCfQZdduo1E7D2Et6gnq4=; b=wfDaeT0sKQ+7lfbCsM81B8EgEk92WudiWPfIGMYHiSv5Cwo3gA972dgWqCmPNJ8QOiVQK7 6I6MEW/ow5Fqg9OLne3L6RFWhQPl5I96zlwBENVFV6GyPq0qzBCSTg4yLswHalApHIGEIR 9kChb69lr62rXY+OcwKRcHWsIX748jiLCw9z3tBa970vZ79WM5EWBMOdF5G1z9F2rdkmqs HvgcxX8fOrKXRDh+mVoJiIyuv6U0DZjwvLTpqwY4Evc9EBJN2dQuRNXpWz2x1Uyd/jHsuI /prTUq83gB8uOWf7EOemYXq02g7Q8cWFsKr+I9KrzJQzf4SUbaBo9pLizTUg+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656669777; a=rsa-sha256; cv=none; b=IFMoHQzTWH4kZZUUqopPDjIdMBLllrAfssEauYIR98O4JxfgMQtGg2k8dy/UHU93ym2g55 +8JCh1+4O0N+EcI2T4dWkHQNdD+HYc121mKD22vNEFNTaa50Gi3b8yuOveTEfLzNpPnmOo /qGqKuWh6N1xOyLPibmAD4YMDDqIE42F2YgD+wcg2lT6Zae1PezHdxaaMrQcUZFdbpzD3R wInhbNhw8HXHqZeLcExi0ZREKVDNhgH/q6bw8aO/ykXYSjN5iEwDkAJlGLZZqNimp1a2Yy 4dORtNs5aH8ICxLa6JY1wumR3YZ/JXSQ0CQrRxpNGr1L80Mg7buXuSXtDaz9xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d75bb040d3cc1398fb3163bd45b7c3babc10083 commit 4d75bb040d3cc1398fb3163bd45b7c3babc10083 Author: Rene Ladan AuthorDate: 2022-07-01 10:02:52 +0000 Commit: Rene Ladan CommitDate: 2022-07-01 10:02:52 +0000 cleanup: Remove expired ports: 2022-07-01 sysutils/pesign: Unmaintaned since 2016, very much out of date, does not build with GCC 11 (PR #263544) --- MOVED | 1 + sysutils/Makefile | 1 - sysutils/pesign/Makefile | 51 ------------------ sysutils/pesign/distinfo | 5 -- sysutils/pesign/files/patch-Make.defaults | 37 ------------- .../pesign/files/patch-include-libdpe-libdpe.h | 11 ---- sysutils/pesign/files/patch-libdpe-common.h | 17 ------ sysutils/pesign/files/patch-libdpe-endian.h | 60 ---------------------- sysutils/pesign/files/patch-libdpe-lock.h | 11 ---- sysutils/pesign/files/patch-libdpe-pe_allocspace.c | 52 ------------------- sysutils/pesign/files/patch-libdpe-pe_update.c | 11 ---- sysutils/pesign/files/patch-src-Makefile | 13 ----- sysutils/pesign/files/patch-src-cms_common.c | 37 ------------- sysutils/pesign/files/patch-src-daemon.c | 57 -------------------- sysutils/pesign/files/patch-src-efisiglist.c | 16 ------ sysutils/pesign/files/patch-src-endian.h | 52 ------------------- sysutils/pesign/files/patch-src-siglist.c | 11 ---- sysutils/pesign/pkg-descr | 4 -- sysutils/pesign/pkg-plist | 8 --- 19 files changed, 1 insertion(+), 454 deletions(-) diff --git a/MOVED b/MOVED index 27de377e53f2..d6d9c617d420 100644 --- a/MOVED +++ b/MOVED @@ -17488,3 +17488,4 @@ x11/havoc|deskutils/havoc|2022-07-01|move desktop utility to its right category devel/go-glide||2022-07-01|Has expired: use go mod instead of glide irc/unreal||2022-07-01|Has expired: Very outdated, listed as end of life in 2016 and has known security issues sysutils/go-btfs||2022-07-01|Has expired: Requires go 1.15 +sysutils/pesign||2022-07-01|Has expired: Unmaintaned since 2016, very much out of date, does not build with GCC 11 (PR #263544) diff --git a/sysutils/Makefile b/sysutils/Makefile index 361bc5b87882..ab6ff0576a89 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -963,7 +963,6 @@ SUBDIR += pefs-kmod SUBDIR += perp SUBDIR += personality - SUBDIR += pesign SUBDIR += pfetch SUBDIR += pflogx SUBDIR += pfstat diff --git a/sysutils/pesign/Makefile b/sysutils/pesign/Makefile deleted file mode 100644 index bf0541459e30..000000000000 --- a/sysutils/pesign/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# Created by: Edward Tomasz Napierala - -PORTNAME= pesign -PORTVERSION= 0.110 -PORTREVISION= 8 -CATEGORIES= sysutils - -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= b535d1ac5cbc.patch:-p1 - -MAINTAINER= ports@FreeBSD.org -COMMENT= Signing utility for UEFI secure boot - -LICENSE= GPLv2 - -DEPRECATED= Unmaintaned since 2016, very much out of date, does not build with GCC 11 (PR \#263544) -EXPIRATION_DATE= 2022-07-01 - -LIB_DEPENDS= libefivar.so.0:devel/efivar \ - libnspr4.so:devel/nspr \ - libnss3.so:security/nss \ - libpopt.so:devel/popt \ - libuuid.so:misc/e2fsprogs-libuuid - -USE_GCC= 10 -USE_GITHUB= yes -GH_ACCOUNT= rhinstaller - -USES= cpe gmake localbase pkgconfig -USE_LDCONFIG= yes - -CPE_VENDOR= pesign_project - -ONLY_FOR_ARCHS= aarch64 armv6 armv7 amd64 i386 -ONLY_FOR_ARCHS_REASON= UEFI specification only supports little-endian processors - -post-patch: - @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/Make.defaults - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/efikeygen ${STAGEDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/src/pesign ${STAGEDIR}${PREFIX}/bin - ${INSTALL_LIB} ${WRKSRC}/libdpe/libdpe.so ${STAGEDIR}${PREFIX}/lib - ${MKDIR} ${STAGEDIR}${PREFIX}/include/libdpe - ${INSTALL_DATA} ${WRKSRC}/include/libdpe/pe.h ${STAGEDIR}${PREFIX}/include/libdpe - ${INSTALL_DATA} ${WRKSRC}/include/libdpe/libdpe.h ${STAGEDIR}${PREFIX}/include/libdpe - ${INSTALL_MAN} ${WRKSRC}/src/efikeygen.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/src/pesign-client.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/src/pesign.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - -.include diff --git a/sysutils/pesign/distinfo b/sysutils/pesign/distinfo deleted file mode 100644 index d16b95105f69..000000000000 --- a/sysutils/pesign/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1414180266 -SHA256 (rhinstaller-pesign-0.110_GH0.tar.gz) = 836abeb4404b4b3a616deb478f8bf4fed2fce4f12be1a00b6fab238d150ed2ed -SIZE (rhinstaller-pesign-0.110_GH0.tar.gz) = 103805 -SHA256 (b535d1ac5cbc.patch) = 787fe6bb67b0cbc8716a84d063d0995c1f23567d87f2c6bec33c3daa0145f367 -SIZE (b535d1ac5cbc.patch) = 1971 diff --git a/sysutils/pesign/files/patch-Make.defaults b/sysutils/pesign/files/patch-Make.defaults deleted file mode 100644 index fe96dad122d0..000000000000 --- a/sysutils/pesign/files/patch-Make.defaults +++ /dev/null @@ -1,37 +0,0 @@ ---- Make.defaults.orig 2014-10-24 21:51:06.000000000 +0200 -+++ Make.defaults 2015-01-16 10:34:32.000000000 +0100 -@@ -4,22 +4,24 @@ PREFIX := /usr - HOSTARCH = $(shell uname -m | sed s,i[3456789]86,ia32,) - ARCH := $(shell uname -m | sed s,i[3456789]86,ia32,) - INCDIR = -I$(TOPDIR)/include --CPPFLAGS = -DCONFIG_$(ARCH) --CFLAGS = -g -O0 -+CPPFLAGS += -DCONFIG_$(ARCH) -+CFLAGS += -g -O0 - BUILDFLAGS := $(CFLAGS) $(ARCH3264) -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants --std=gnu99 -D_GNU_SOURCE -Wno-unused-result -Wno-unused-function - ASFLAGS = $(ARCH3264) - LDFLAGS = -nostdlib - CCLDFLAGS = -shared - INSTALL = install --# XXX this is broken --bindir = /usr/bin/ - --CC = $(bindir)gcc --AS = $(bindir)as --LD = $(bindir)ld.bfd --AR = $(bindir)ar --RANLIB = $(bindir)ranlib --OBJCOPY = $(bindir)objcopy -+CC = $(prefix)%%CC%% -+AS = $(prefix)as -+LD = $(prefix)ld.bfd -+AR = $(prefix)ar -+RANLIB = $(prefix)ranlib -+OBJCOPY = $(prefix)objcopy -+ -+ifeq ($(ARCH),amd64) -+ ARCH = x86_64 -+endif - - ifeq ($(ARCH),ia64) - CFLAGS += -mfixed-range=f32-f127 diff --git a/sysutils/pesign/files/patch-include-libdpe-libdpe.h b/sysutils/pesign/files/patch-include-libdpe-libdpe.h deleted file mode 100644 index 26e629e19b52..000000000000 --- a/sysutils/pesign/files/patch-include-libdpe-libdpe.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/libdpe/libdpe.h.orig 2015-01-16 09:43:46.000000000 +0100 -+++ include/libdpe/libdpe.h 2015-01-16 09:43:53.000000000 +0100 -@@ -78,7 +78,7 @@ extern Pe *pe_begin(int fildes, Pe_Cmd c - extern Pe *pe_clone(Pe *pe, Pe_Cmd cmd); - extern Pe *pe_memory(char *image, size_t size); - extern int pe_end(Pe *pe); --extern loff_t pe_update(Pe *pe, Pe_Cmd cmd); -+extern off_t pe_update(Pe *pe, Pe_Cmd cmd); - extern Pe_Kind pe_kind(Pe *Pe) __attribute__ ((__pure__)); - extern Pe_Scn *pe_nextscn(Pe *pe, Pe_Scn *scn); - extern Pe_Scn *pe_getscn(Pe *pe, size_t idx); diff --git a/sysutils/pesign/files/patch-libdpe-common.h b/sysutils/pesign/files/patch-libdpe-common.h deleted file mode 100644 index ff26ad1d36ce..000000000000 --- a/sysutils/pesign/files/patch-libdpe-common.h +++ /dev/null @@ -1,17 +0,0 @@ ---- libdpe/common.h.orig 2014-10-24 21:51:06.000000000 +0200 -+++ libdpe/common.h 2015-01-16 10:23:58.000000000 +0100 -@@ -23,11 +23,11 @@ - #include - - #define pwrite_retry(fd, buf, len, off) \ -- TEMP_FAILURE_RETRY (pwrite (fd, buf, len, off)) -+ pwrite (fd, buf, len, off) - #define write_retry(fd, buf, n) \ -- TEMP_FAILURE_RETRY (write (fd, buf, n)) -+ write (fd, buf, n) - #define pread_retry(fd, buf, len, off) \ -- TEMP_FAILURE_RETRY (pread (fd, buf, len, off)) -+ pread (fd, buf, len, off) - - #define is_64_bit(pe) ((pe)->flags & IMAGE_FILE_32BIT_MACHINE) - diff --git a/sysutils/pesign/files/patch-libdpe-endian.h b/sysutils/pesign/files/patch-libdpe-endian.h deleted file mode 100644 index dc0f3232b73c..000000000000 --- a/sysutils/pesign/files/patch-libdpe-endian.h +++ /dev/null @@ -1,60 +0,0 @@ ---- libdpe/endian.h.orig 2015-01-16 09:47:58.000000000 +0100 -+++ libdpe/endian.h 2015-01-16 09:48:53.000000000 +0100 -@@ -19,7 +19,7 @@ - #ifndef ENDIAN_H - #define ENDIAN_H - --#include -+#include - #include - #include - -@@ -30,32 +30,34 @@ - #define le16_to_cpu(x) (x) - #define le32_to_cpu(x) (x) - #define le64_to_cpu(x) (x) --#define cpu_to_be16(x) __bswap_16(x) --#define cpu_to_be32(x) __bswap_32(x) --#define cpu_to_be64(x) __bswap_64(x) --#define be16_to_cpu(x) __bswap_16(x) --#define be32_to_cpu(x) __bswap_32(x) --#define be64_to_cpu(x) __bswap_64(x) --#else -+#define cpu_to_be16(x) bswap16(x) -+#define cpu_to_be32(x) bswap32(x) -+#define cpu_to_be64(x) bswap64(x) -+#define be16_to_cpu(x) bswap16(x) -+#define be32_to_cpu(x) bswap32(x) -+#define be64_to_cpu(x) bswap64(x) -+#elif __BYTE_ORDER == __BIG_ENDIAN - #define cpu_to_be16(x) (x) - #define cpu_to_be32(x) (x) - #define cpu_to_be64(x) (x) - #define be16_to_cpu(x) (x) - #define be32_to_cpu(x) (x) - #define be64_to_cpu(x) (x) --#define cpu_to_le16(x) __bswap_16(x) --#define cpu_to_le32(x) __bswap_32(x) --#define cpu_to_le64(x) __bswap_64(x) --#define le16_to_cpu(x) __bswap_16(x) --#define le32_to_cpu(x) __bswap_32(x) --#define le64_to_cpu(x) __bswap_64(x) -+#define cpu_to_le16(x) bswap16(x) -+#define cpu_to_le32(x) bswap32(x) -+#define cpu_to_le64(x) bswap64(x) -+#define le16_to_cpu(x) bswap16(x) -+#define le32_to_cpu(x) bswap32(x) -+#define le64_to_cpu(x) bswap64(x) -+#else -+#error "Unknown endianess" - #endif - - static inline uint32_t - __attribute__((unused)) - SwapBytes32(uint32_t x) - { -- return __bswap_32(x); -+ return bswap32(x); - } - - static inline int diff --git a/sysutils/pesign/files/patch-libdpe-lock.h b/sysutils/pesign/files/patch-libdpe-lock.h deleted file mode 100644 index 04f23d49c713..000000000000 --- a/sysutils/pesign/files/patch-libdpe-lock.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libdpe/lock.h.orig 2015-01-16 09:53:05.000000000 +0100 -+++ libdpe/lock.h 2015-01-16 09:53:44.000000000 +0100 -@@ -31,7 +31,7 @@ - #include - #define rwlock_define(class,name) class pthread_rwlock_t name - #define RWLOCK_CALL(call) \ -- ({ int _err = pthread_rwlock_ ## call; assert_perror(_err); }) -+ ({ int _err = pthread_rwlock_ ## call; assert(_err == 0); }) - #define rwlock_init(lock) RWLOCK_CALL(init (&lock, NULL)) - #define rwlock_fini(lock) RWLOCK_CALL(destroy (&lock)) - #define rwlock_rdlock(lock) RWLOCK_CALL(rdlock (&lock)) diff --git a/sysutils/pesign/files/patch-libdpe-pe_allocspace.c b/sysutils/pesign/files/patch-libdpe-pe_allocspace.c deleted file mode 100644 index 2e18a7e5bc77..000000000000 --- a/sysutils/pesign/files/patch-libdpe-pe_allocspace.c +++ /dev/null @@ -1,52 +0,0 @@ ---- libdpe/pe_allocspace.c.orig 2014-10-24 21:51:06.000000000 +0200 -+++ libdpe/pe_allocspace.c 2015-01-16 09:58:52.000000000 +0100 -@@ -19,6 +19,7 @@ - - #include "libdpe.h" - -+#include - #include - #include - #include -@@ -83,6 +84,7 @@ pe_set_image_size(Pe *pe) - int - pe_extend_file(Pe *pe, size_t size, uint32_t *new_space, int align) - { -+ int error; - void *new = NULL; - - if (align) -@@ -93,9 +95,13 @@ pe_extend_file(Pe *pe, size_t size, uint - if (rc < 0) - return -1; - -- new = mremap(pe->map_address, pe->maximum_size, -- pe->maximum_size + extra, MREMAP_MAYMOVE); -+ error = munmap(pe->map_address, pe->maximum_size); -+ if (error != 0) -+ err(1, "munmap"); -+ new = mmap(pe->map_address, pe->maximum_size + extra, -+ PROT_WRITE | PROT_READ, MAP_SHARED, pe->fildes, 0); - if (new == MAP_FAILED) { -+ err(1, "mmap"); - __libpe_seterrno (PE_E_NOMEM); - return -1; - } -@@ -116,10 +122,15 @@ int - pe_shorten_file(Pe *pe, size_t size) - { - void *new = NULL; -+ int error; - -- new = mremap(pe->map_address, pe->maximum_size, -- pe->maximum_size - size, 0); -+ error = munmap(pe->map_address, pe->maximum_size); -+ if (error != 0) -+ err(1, "munmap"); -+ -+ new = mmap(pe->map_address, pe->maximum_size - size, PROT_READ | PROT_WRITE, MAP_SHARED, pe->fildes, 0); - if (new == MAP_FAILED) { -+ err(1, "mmap"); - __libpe_seterrno (PE_E_NOMEM); - return -1; - } diff --git a/sysutils/pesign/files/patch-libdpe-pe_update.c b/sysutils/pesign/files/patch-libdpe-pe_update.c deleted file mode 100644 index 9a8335465b55..000000000000 --- a/sysutils/pesign/files/patch-libdpe-pe_update.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libdpe/pe_update.c.orig 2015-01-16 09:50:40.000000000 +0100 -+++ libdpe/pe_update.c 2015-01-16 09:50:47.000000000 +0100 -@@ -75,7 +75,7 @@ write_file(Pe *pe, off_t size, size_t sh - return size; - } - --loff_t -+off_t - pe_update(Pe *pe, Pe_Cmd cmd) - { - if (cmd != PE_C_NULL && cmd != PE_C_WRITE && cmd != PE_C_WRITE_MMAP) { diff --git a/sysutils/pesign/files/patch-src-Makefile b/sysutils/pesign/files/patch-src-Makefile deleted file mode 100644 index 843543b930f8..000000000000 --- a/sysutils/pesign/files/patch-src-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- src/Makefile.orig 2015-01-16 10:03:55.000000000 +0100 -+++ src/Makefile 2015-01-16 10:04:21.000000000 +0100 -@@ -7,8 +7,8 @@ PKLIBS = nss - LIBS = popt uuid efivar - STATIC_LIBS = $(TOPDIR)/libdpe/libdpe.a - LDFLAGS = --CCLDFLAGS = -L../libdpe $(foreach pklib,$(PKLIBS), $(shell pkg-config --libs-only-L $(pklib))) -pie -fPIE -Wl,-z,relro,-z,now --BUILDFLAGS += -I../include/ $(foreach pklib,$(PKLIBS), $(shell pkg-config --cflags $(pklib))) -Werror -fPIE -+CCLDFLAGS = -L../libdpe $(foreach pklib,$(PKLIBS), $(shell pkg-config --libs-only-L $(pklib))) -fPIC -Wl,-z,relro,-z,now -+BUILDFLAGS += -I../include/ $(foreach pklib,$(PKLIBS), $(shell pkg-config --cflags $(pklib))) -Werror -fPIC - - TARGETS = pesign authvar client efisiglist efikeygen pesigcheck - diff --git a/sysutils/pesign/files/patch-src-cms_common.c b/sysutils/pesign/files/patch-src-cms_common.c deleted file mode 100644 index 30336e5dc55d..000000000000 --- a/sysutils/pesign/files/patch-src-cms_common.c +++ /dev/null @@ -1,37 +0,0 @@ ---- src/cms_common.c.orig 2014-10-24 19:51:06 UTC -+++ src/cms_common.c -@@ -45,7 +45,7 @@ struct digest_param { - SECOidTag digest_tag; - SECOidTag signature_tag; - SECOidTag digest_encryption_tag; -- efi_guid_t *efi_guid; -+ const efi_guid_t *efi_guid; - int size; - }; - -@@ -1664,25 +1664,6 @@ typedef struct { - SECItem oid; - SECItem keyhash; - } KeyId; -- --static const SEC_ASN1Template KeyIdTemplate[] = { -- {.kind = SEC_ASN1_SEQUENCE, -- .offset = 0, -- .sub = NULL, -- .size = sizeof (KeyId), -- }, -- {.kind = SEC_ASN1_OBJECT_ID, -- .offset = offsetof(KeyId, oid), -- .sub = &SEC_ObjectIDTemplate, -- .size = sizeof (SECItem), -- }, -- {.kind = SEC_ASN1_OCTET_STRING, -- .offset = offsetof(KeyId, keyhash), -- .sub = NULL, -- .size = sizeof (SECItem), -- }, -- { 0 } --}; - - int - generate_keys(cms_context *cms, PK11SlotInfo *slot, diff --git a/sysutils/pesign/files/patch-src-daemon.c b/sysutils/pesign/files/patch-src-daemon.c deleted file mode 100644 index 9d021c4a51a8..000000000000 --- a/sysutils/pesign/files/patch-src-daemon.c +++ /dev/null @@ -1,57 +0,0 @@ ---- src/daemon.c.orig 2014-10-24 21:51:06.000000000 +0200 -+++ src/daemon.c 2015-01-16 09:57:05.000000000 +0100 -@@ -25,7 +25,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -839,7 +838,7 @@ shutdown: - do_shutdown(ctx, nsockets, pollfds); - return 0; - } -- rc = ppoll(pollfds, nsockets, NULL, NULL); -+ rc = poll(pollfds, nsockets, INFTIM); - if (should_exit != 0) - goto shutdown; - if (rc < 0) { -@@ -864,8 +863,8 @@ shutdown: - - struct sockaddr_un remote; - socklen_t len = sizeof(remote); -- pollfds[nsockets-1].fd = accept(pollfds[0].fd, &remote, -- &len); -+ pollfds[nsockets-1].fd = accept(pollfds[0].fd, -+ (struct sockaddr *)&remote, &len); - pollfds[nsockets-1].events = POLLIN|POLLPRI|POLLHUP; - pollfds[nsockets-1].revents = pollfds[0].revents; - } -@@ -942,7 +941,7 @@ set_up_socket(context *ctx) - .sun_path = SOCKPATH, - }; - -- int rc = bind(sd, &addr_un, sizeof(addr_un)); -+ int rc = bind(sd, (struct sockaddr *)&addr_un, sizeof(addr_un)); - if (rc < 0) { - ctx->backup_cms->log(ctx->backup_cms, ctx->priority|LOG_ERR, - "unable to bind to \"%s\": %m", -@@ -998,7 +997,7 @@ check_socket(context *ctx) - - struct sockaddr_un remote; - socklen_t size = sizeof(remote); -- rc = getpeername(sd, &remote, &size); -+ rc = getpeername(sd, (struct sockaddr *)&remote, &size); - if (rc < 0) { - close(sd); - return; -@@ -1159,8 +1158,6 @@ daemonize(cms_context *cms_ctx, char *ce - close(fd); - } - -- prctl(PR_SET_NAME, "pesignd", 0, 0, 0); -- - setsid(); - - if (do_fork) { diff --git a/sysutils/pesign/files/patch-src-efisiglist.c b/sysutils/pesign/files/patch-src-efisiglist.c deleted file mode 100644 index 56f3a48f8b85..000000000000 --- a/sysutils/pesign/files/patch-src-efisiglist.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/efisiglist.c.orig 2014-10-24 21:51:06.000000000 +0200 -+++ src/efisiglist.c 2015-01-16 10:01:33.000000000 +0100 -@@ -38,11 +38,11 @@ struct hash_param { - - static struct hash_param hash_params[] = { - {.name = "sha256", -- .guid = &efi_guid_sha256, -+ .guid = (void *)&efi_guid_sha256, - .size = 32, - }, - {.name = "sha1", -- .guid = &efi_guid_sha1, -+ .guid = (void *)&efi_guid_sha1, - .size = 20, - }, - }; diff --git a/sysutils/pesign/files/patch-src-endian.h b/sysutils/pesign/files/patch-src-endian.h deleted file mode 100644 index 368702af71b7..000000000000 --- a/sysutils/pesign/files/patch-src-endian.h +++ /dev/null @@ -1,52 +0,0 @@ ---- src/endian.h.orig 2015-01-16 09:45:30.000000000 +0100 -+++ src/endian.h 2015-01-16 09:46:28.000000000 +0100 -@@ -18,7 +18,7 @@ - #ifndef ENDIAN_H - #define ENDIAN_H - --#include -+#include - - #if __BYTE_ORDER == __LITTLE_ENDIAN - #define cpu_to_le16(x) (x) -@@ -27,25 +27,27 @@ - #define le16_to_cpu(x) (x) - #define le32_to_cpu(x) (x) - #define le64_to_cpu(x) (x) --#define cpu_to_be16(x) __bswap_16(x) --#define cpu_to_be32(x) __bswap_32(x) --#define cpu_to_be64(x) __bswap_64(x) --#define be16_to_cpu(x) __bswap_16(x) --#define be32_to_cpu(x) __bswap_32(x) --#define be64_to_cpu(x) __bswap_64(x) --#else -+#define cpu_to_be16(x) bswap_16(x) -+#define cpu_to_be32(x) bswap_32(x) -+#define cpu_to_be64(x) bswap_64(x) -+#define be16_to_cpu(x) bswap_16(x) -+#define be32_to_cpu(x) bswap_32(x) -+#define be64_to_cpu(x) bswap_64(x) -+#elif __BYTE_ORDER == __BIG_ENDIAN - #define cpu_to_be16(x) (x) - #define cpu_to_be32(x) (x) - #define cpu_to_be64(x) (x) - #define be16_to_cpu(x) (x) - #define be32_to_cpu(x) (x) - #define be64_to_cpu(x) (x) --#define cpu_to_le16(x) __bswap_16(x) --#define cpu_to_le32(x) __bswap_32(x) --#define cpu_to_le64(x) __bswap_64(x) --#define le16_to_cpu(x) __bswap_16(x) --#define le32_to_cpu(x) __bswap_32(x) --#define le64_to_cpu(x) __bswap_64(x) -+#define cpu_to_le16(x) bswap_16(x) -+#define cpu_to_le32(x) bswap_32(x) -+#define cpu_to_le64(x) bswap_64(x) -+#define le16_to_cpu(x) bswap_16(x) -+#define le32_to_cpu(x) bswap_32(x) -+#define le64_to_cpu(x) bswap_64(x) -+#else -+#error "Unknown endianess" - #endif - - #endif /* ENDIAN_H */ diff --git a/sysutils/pesign/files/patch-src-siglist.c b/sysutils/pesign/files/patch-src-siglist.c deleted file mode 100644 index 201171766621..000000000000 --- a/sysutils/pesign/files/patch-src-siglist.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/siglist.c.orig 2014-10-24 21:51:06.000000000 +0200 -+++ src/siglist.c 2015-01-16 10:02:50.000000000 +0100 -@@ -60,7 +60,7 @@ struct signature_list { - }; - - struct sig_type { -- efi_guid_t *type; -+ const efi_guid_t *type; - uint32_t size; - }; - diff --git a/sysutils/pesign/pkg-descr b/sysutils/pesign/pkg-descr deleted file mode 100644 index 12cc179c05fb..000000000000 --- a/sysutils/pesign/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Signing tool for PE-COFF binaries, hopefully at least vaguely compliant -with the PE and Authenticode specifications. - -WWW: https://github.com/rhinstaller/pesign diff --git a/sysutils/pesign/pkg-plist b/sysutils/pesign/pkg-plist deleted file mode 100644 index d9a8ede6f8ee..000000000000 --- a/sysutils/pesign/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/efikeygen -bin/pesign -include/libdpe/libdpe.h -include/libdpe/pe.h -lib/libdpe.so -man/man1/efikeygen.1.gz -man/man1/pesign-client.1.gz -man/man1/pesign.1.gz