* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pesign/files/, app-crypt/pesign/
@ 2017-02-09 23:41 Göktürk Yüksek
0 siblings, 0 replies; 4+ messages in thread
From: Göktürk Yüksek @ 2017-02-09 23:41 UTC (permalink / raw
To: gentoo-commits
commit: bc18c616f9a7e080e08092b848032c5af38120f1
Author: David Michael <david.michael <AT> coreos <DOT> com>
AuthorDate: Tue Feb 7 21:23:11 2017 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 23:41:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc18c616
app-crypt/pesign: Add an ebuild for 0.112 #608572
app-crypt/pesign/Manifest | 1 +
.../pesign/files/pesign-0.112-fix-cli-opts.patch | 73 ++++++++++++++++++++++
.../files/pesign-0.112-fix-initializer.patch | 13 ++++
app-crypt/pesign/pesign-0.112.ebuild | 47 ++++++++++++++
4 files changed, 134 insertions(+)
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index 4d114926bd..14a304d16b 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1 +1,2 @@
DIST pesign-0.108.tar.gz 96838 SHA256 2019882be0286df1c58efa8c588332106b89418a6bd0fce3de8da4ca16636986 SHA512 f72fb9c3e843341300b68e06bb153690734f6e506cdd9f0d9362c760ff48194ed1ed29e0b58a5050e7331069ad47a9902cc9e34bf616667baf84208f2b69a918 WHIRLPOOL 0af005d0b6dbdff23787c009153cae07c6907d111f57831611e85c49656e29e150ffd71683f349880cfb8975547ea3a3e655cdce31b047b355ecf097e7c7ba77
+DIST pesign-0.112.tar.gz 107632 SHA256 df4f5459137126e2fdb06484d755a81b6ec9a7b50099dcc3088ea2d41047cd06 SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018 WHIRLPOOL e5f3d3801ff7df7d643e87bc851f2645931e18df140b25a7add4136db1bd89c2a8da75d8f018533d5b16ab80695740d00ac379e166993a1912ba9ad2abee6791
diff --git a/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch b/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
new file mode 100644
index 0000000000..6271a99985
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-0.112-fix-cli-opts.patch
@@ -0,0 +1,73 @@
+From 5be0515dee24308fd7e270bf2e0fb5e5a7a78f32 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Thu, 9 Jun 2016 14:30:37 +0200
+Subject: [PATCH 2/2] Fix command line parsing
+
+The gettext translation domain should be passed as .arg, not .descrip,
+otherwise popt won't process any of the command line options (it stops
+looping over the struct poptOption array when an entry has unset
+longName, shortName and arg).
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ src/client.c | 2 +-
+ src/efikeygen.c | 2 +-
+ src/efisiglist.c | 2 +-
+ src/pesigcheck.c | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/client.c b/src/client.c
+index 028419f..575c873 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -555,7 +555,7 @@ main(int argc, char *argv[])
+
+ struct poptOption options[] = {
+ {.argInfo = POPT_ARG_INTL_DOMAIN,
+- .descrip = "pesign" },
++ .arg = "pesign" },
+ {.longName = "token",
+ .shortName = 't',
+ .argInfo = POPT_ARG_STRING|POPT_ARGFLAG_SHOW_DEFAULT,
+diff --git a/src/efikeygen.c b/src/efikeygen.c
+index 6278849..8a515a5 100644
+--- a/src/efikeygen.c
++++ b/src/efikeygen.c
+@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
+ poptContext optCon;
+ struct poptOption options[] = {
+ {.argInfo = POPT_ARG_INTL_DOMAIN,
+- .descrip = "pesign" },
++ .arg = "pesign" },
+ /* global nss-ish things */
+ {.longName = "dbdir",
+ .shortName = 'd',
+diff --git a/src/efisiglist.c b/src/efisiglist.c
+index cd3f1ae..40d6a93 100644
+--- a/src/efisiglist.c
++++ b/src/efisiglist.c
+@@ -126,7 +126,7 @@ main(int argc, char *argv[])
+
+ struct poptOption options[] = {
+ {.argInfo = POPT_ARG_INTL_DOMAIN,
+- .descrip = "pesign" },
++ .arg = "pesign" },
+ {.longName = "infile",
+ .shortName = 'i',
+ .argInfo = POPT_ARG_STRING,
+diff --git a/src/pesigcheck.c b/src/pesigcheck.c
+index 1328fe9..0d49c1a 100644
+--- a/src/pesigcheck.c
++++ b/src/pesigcheck.c
+@@ -214,7 +214,7 @@ main(int argc, char *argv[])
+ poptContext optCon;
+ struct poptOption options[] = {
+ {.argInfo = POPT_ARG_INTL_DOMAIN,
+- .descrip = "pesign" },
++ .arg = "pesign" },
+ {.longName = "dbfile",
+ .shortName = 'D',
+ .argInfo = POPT_ARG_CALLBACK|POPT_CBFLAG_POST,
+--
+2.9.2
+
diff --git a/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch b/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
new file mode 100644
index 0000000000..b6147fe68e
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-0.112-fix-initializer.patch
@@ -0,0 +1,13 @@
+This addresses a -Werror=missing-braces build failure from GCC bug #53119.
+
+--- a/libdpe/pe_allocspace.c
++++ b/libdpe/pe_allocspace.c
+@@ -61,7 +61,7 @@
+ struct pe32plus_opt_hdr *opthdr = pe->state.pe32plus_exe.opthdr;
+
+ Pe_Scn *scn = NULL;
+- struct section_header shdr = { 0, }, tmp_shdr;
++ struct section_header shdr = { { 0, } }, tmp_shdr;
+ if (pehdr->sections < 1)
+ return -1;
+
diff --git a/app-crypt/pesign/pesign-0.112.ebuild b/app-crypt/pesign/pesign-0.112.ebuild
new file mode 100644
index 0000000000..7e59afdb78
--- /dev/null
+++ b/app-crypt/pesign/pesign-0.112.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
+HOMEPAGE="https://github.com/vathpela/pesign"
+SRC_URI="https://github.com/vathpela/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+ dev-libs/nspr
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sys-apps/util-linux
+"
+DEPEND="${RDEPEND}
+ sys-apps/help2man
+ sys-boot/gnu-efi
+ sys-libs/efivar
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.112-fix-cli-opts.patch
+ "${FILESDIR}"/${PN}-0.112-fix-initializer.patch
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake DESTDIR="${ED}" VERSION="${PVR}" install
+ einstalldocs
+
+ # remove some files that don't make sense for Gentoo installs
+ rm -rf "${ED%/}/etc/" "${ED%/}/var/" \
+ "${ED%/}/usr/share/doc/${PF}/COPYING" || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pesign/files/, app-crypt/pesign/
@ 2019-07-27 0:22 Stefan Strogin
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Strogin @ 2019-07-27 0:22 UTC (permalink / raw
To: gentoo-commits
commit: 0d2ffd3ca0142f69bf52e19f151ae7d2f6c8e707
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 23:30:43 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 00:21:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2ffd3c
app-crypt/pesign: bump version to 113
Closes: https://bugs.gentoo.org/689590
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
app-crypt/pesign/Manifest | 1 +
app-crypt/pesign/files/pesign-113-nss.patch | 47 ++++++++++++++++++++++++++
app-crypt/pesign/pesign-113.ebuild | 52 +++++++++++++++++++++++++++++
3 files changed, 100 insertions(+)
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index 51dcd1c94d6..0dca49cdc75 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1 +1,2 @@
DIST pesign-0.112.tar.gz 107632 BLAKE2B 737b75aec7efa9f41dbdb509405dede914cd5aa563572f0d2ede96a321f4a669170c696c7bd93bad1a5c1a6f2c65715b66317544fa6fc55d6b7f85436d778e8a SHA512 9a0cd266f973fbd7bbbd23939d0be3c34dbccd9ab20941bf967ca1b18aa5bf5d2c41cdef0799399e09e7b0fc59a0b34bc660afb6da292eb1c127db2893362018
+DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24
diff --git a/app-crypt/pesign/files/pesign-113-nss.patch b/app-crypt/pesign/files/pesign-113-nss.patch
new file mode 100644
index 00000000000..5a227a87268
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-113-nss.patch
@@ -0,0 +1,47 @@
+From b535d1ac5cbcdf18a97d97a92581e38080d9e521 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones@redhat.com>
+Date: Tue, 14 May 2019 11:28:38 -0400
+Subject: [PATCH] efikeygen: Fix the build with nss 3.44
+
+NSS 3.44 adds some certificate types, which changes a type and makes
+some encoding stuff weird. As a result, we get:
+
+gcc8 -I/wrkdirs/usr/ports/sysutils/pesign/work/pesign-0.110/include -O2 -pipe -fstack-protector-strong -Wl,-rpath=/usr/local/lib/gcc8 -isystem /usr/local/include -fno-strict-aliasing -g -O0 -g -O0 -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants --std=gnu99 -D_GNU_SOURCE -Wno-unused-result -Wno-unused-function -I../include/ -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include/nspr -Werror -fPIC -isystem /usr/local/include -DCONFIG_amd64 -DCONFIG_amd64 -c efikeygen.c -o efikeygen.o
+In file included from /usr/local/include/nss/nss/cert.h:22,
+ from efikeygen.c:39:
+efikeygen.c: In function 'add_cert_type':
+/usr/local/include/nss/nss/certt.h:445:5: error: unsigned conversion from 'int' to 'unsigned char' changes value from '496' to '240' [-Werror=overflow]
+ (NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_SSL_SERVER | NS_CERT_TYPE_EMAIL | \
+ ^
+efikeygen.c:208:23: note: in expansion of macro 'NS_CERT_TYPE_APP'
+ unsigned char type = NS_CERT_TYPE_APP;
+ ^~~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+
+This is fixed by just making it an int.
+
+Fixes github issue #48.
+
+Signed-off-by: Peter Jones <pjones@redhat.com>
+Upstream-Status: Accepted
+[https://github.com/rhboot/pesign/commit/b535d1ac5cbcdf18a97d97a92581e38080d9e521]
+---
+ src/efikeygen.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/efikeygen.c b/src/efikeygen.c
+index ede76ef..2cd953e 100644
+--- a/src/efikeygen.c
++++ b/src/efikeygen.c
+@@ -208,7 +208,7 @@ static int
+ add_cert_type(cms_context *cms, void *extHandle, int is_ca)
+ {
+ SECItem bitStringValue;
+- unsigned char type = NS_CERT_TYPE_APP;
++ int type = NS_CERT_TYPE_APP;
+
+ if (is_ca)
+ type |= NS_CERT_TYPE_SSL_CA |
+--
+2.22.0
+
diff --git a/app-crypt/pesign/pesign-113.ebuild b/app-crypt/pesign/pesign-113.ebuild
new file mode 100644
index 00000000000..40d481c35cc
--- /dev/null
+++ b/app-crypt/pesign/pesign-113.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
+HOMEPAGE="https://github.com/rhboot/pesign"
+SRC_URI="https://github.com/rhboot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl"
+
+RDEPEND="
+ dev-libs/nspr
+ dev-libs/nss
+ dev-libs/popt
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sys-apps/util-linux
+ sys-libs/efivar
+"
+DEPEND="${RDEPEND}
+ sys-apps/help2man
+ sys-boot/gnu-efi
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-113-nss.patch )
+
+src_compile() {
+ emake AR="$(tc-is-gcc && echo "$(tc-getCC)-ar" || tc-getAR)" \
+ ARFLAGS="-cvqs" \
+ AS="$(tc-getAS)" \
+ CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ RANLIB="$(tc-getRANLIB)"
+}
+
+src_install() {
+ emake DESTDIR="${ED}" VERSION="${PVR}" install
+ einstalldocs
+
+ # remove some files that don't make sense for Gentoo installs
+ rm -rf "${ED%/}/etc/" "${ED%/}/var/" \
+ "${ED%/}/usr/share/doc/${PF}/COPYING" || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pesign/files/, app-crypt/pesign/
@ 2023-10-04 16:50 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-10-04 16:50 UTC (permalink / raw
To: gentoo-commits
commit: 611739f6d355367906a758a61282ecce8ed82f7a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 4 16:02:49 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 16:47:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=611739f6
app-crypt/pesign: add 116
Bug: https://bugs.gentoo.org/842228
Bug: https://bugs.gentoo.org/897706
Closes: https://bugs.gentoo.org/892932
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/pesign/Manifest | 1 +
app-crypt/pesign/files/pesign-116-no-werror.patch | 11 +++++
app-crypt/pesign/pesign-116.ebuild | 57 +++++++++++++++++++++++
3 files changed, 69 insertions(+)
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index e3ca7ffe3ede..aaf05c8e4530 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1 +1,2 @@
DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab
+DIST pesign-116.tar.bz2 120424 BLAKE2B a1bce804c13a0aba1eb5fdf0b3963d658011484d4708d58bd9265b6ad8a3d2d3e3156a49736e6fb029bd5d8cc175f6440e62dbc34722357888a239e4d7e7d9e2 SHA512 be3e1083f5e9f889cb8f7c50a8ebe723542fb2f6d1de8de9b04a9f21526ebaa8ab1efc7d4be11bcb0bc9862fa4bc6f78ee35e4d3496dd3b8927170b97795d25c
diff --git a/app-crypt/pesign/files/pesign-116-no-werror.patch b/app-crypt/pesign/files/pesign-116-no-werror.patch
new file mode 100644
index 000000000000..0563a749baf6
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-116-no-werror.patch
@@ -0,0 +1,11 @@
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -60,7 +60,7 @@ cflags = $(CFLAGS) $(ARCH3264) \
+ -Wall -Wextra -Wsign-compare -Wno-unused-result \
+ -Wno-unused-function -Wno-missing-field-initializers \
+ $(call enabled,ENABLE_LEAK_CHECKER,-Wno-analyzer-malloc-leak,) \
+- -Werror -Wno-error=cpp -Wno-free-nonheap-object \
++ -Wno-error=cpp -Wno-free-nonheap-object \
+ -std=gnu11 -fshort-wchar -fPIC -fno-strict-aliasing \
+ -D_GNU_SOURCE -DCONFIG_$(ARCH) -I${TOPDIR}/include \
+ '-DRUNDIR="$(rundir)"' \
diff --git a/app-crypt/pesign/pesign-116.ebuild b/app-crypt/pesign/pesign-116.ebuild
new file mode 100644
index 000000000000..d890d561aad2
--- /dev/null
+++ b/app-crypt/pesign/pesign-116.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
+HOMEPAGE="https://github.com/rhboot/pesign"
+SRC_URI="https://github.com/rhboot/pesign/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/nspr
+ dev-libs/nss
+ dev-libs/openssl:=
+ dev-libs/popt
+ sys-apps/util-linux
+ >=sys-libs/efivar-38
+"
+DEPEND="
+ ${RDEPEND}
+ sys-boot/gnu-efi
+"
+BDEPEND="
+ sys-apps/help2man
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-116-no-werror.patch
+)
+
+src_compile() {
+ emake \
+ AR="$(tc-getAR)" \
+ ARFLAGS="-cvqs" \
+ AS="$(tc-getAS)" \
+ CC="$(tc-getCC)" \
+ CPPFLAGS="${CPPFLAGS}" \
+ LD="$(tc-getLD)" \
+ OBJCOPY="$(tc-getOBJCOPY)" \
+ PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+ RANLIB="$(tc-getRANLIB)" \
+ rundir="${EPREFIX}/var/run"
+}
+
+src_install() {
+ emake DESTDIR="${ED}" VERSION="${PVR}" rundir="${EPREFIX}/var/run" install
+ einstalldocs
+
+ # remove some files that don't make sense for Gentoo installs
+ rm -rf "${ED}/etc" "${ED}/var" "${ED}/usr/share/doc/${PF}/COPYING" || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/pesign/files/, app-crypt/pesign/
@ 2024-12-02 10:52 Petr Vaněk
0 siblings, 0 replies; 4+ messages in thread
From: Petr Vaněk @ 2024-12-02 10:52 UTC (permalink / raw
To: gentoo-commits
commit: d91f6f1d43e4429dfcc2b7cda24cfc0a51df3070
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 2 10:47:23 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Mon Dec 2 10:51:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91f6f1d
app-crypt/pesign: drop 114
Bug: https://bugs.gentoo.org/842228
Bug: https://bugs.gentoo.org/897706
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
app-crypt/pesign/Manifest | 1 -
.../pesign/files/pesign-114-format-string.patch | 111 ---------------------
app-crypt/pesign/files/pesign-114-no-werror.patch | 13 ---
.../files/pesign-114-wanalyzer-diagnostic.patch | 19 ----
app-crypt/pesign/pesign-114.ebuild | 58 -----------
5 files changed, 202 deletions(-)
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index aaf05c8e4530..a687221a070a 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1,2 +1 @@
-DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab
DIST pesign-116.tar.bz2 120424 BLAKE2B a1bce804c13a0aba1eb5fdf0b3963d658011484d4708d58bd9265b6ad8a3d2d3e3156a49736e6fb029bd5d8cc175f6440e62dbc34722357888a239e4d7e7d9e2 SHA512 be3e1083f5e9f889cb8f7c50a8ebe723542fb2f6d1de8de9b04a9f21526ebaa8ab1efc7d4be11bcb0bc9862fa4bc6f78ee35e4d3496dd3b8927170b97795d25c
diff --git a/app-crypt/pesign/files/pesign-114-format-string.patch b/app-crypt/pesign/files/pesign-114-format-string.patch
deleted file mode 100644
index 2361cb4a2660..000000000000
--- a/app-crypt/pesign/files/pesign-114-format-string.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://github.com/rhboot/pesign/commit/df8783ed4ed87fef850268098690985049916ee9.patch
-
-From df8783ed4ed87fef850268098690985049916ee9 Mon Sep 17 00:00:00 2001
-From: Robbie Harwood <rharwood@redhat.com>
-Date: Tue, 1 Feb 2022 17:37:14 -0500
-Subject: [PATCH] Fix format strings for 32-bit arches
-
-Sadly, in 2022, this remains a thing.
-
-Signed-off-by: Robbie Harwood <rharwood@redhat.com>
----
- src/cms_pe_common.c | 16 +++++++++-------
- src/password.c | 7 ++++---
- 2 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/src/cms_pe_common.c b/src/cms_pe_common.c
-index 964f0d9..3a3921b 100644
---- a/src/cms_pe_common.c
-+++ b/src/cms_pe_common.c
-@@ -49,7 +49,7 @@ check_pointer_and_size(cms_context *cms, Pe *pe, void *ptr, size_t size)
-
- if (p + size > m + map_size)
- cmsreterr(0, cms,
-- "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %lu)",
-+ "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %zu)",
- (void *)((uintptr_t)p + size),
- (void *)((uintptr_t)m + map_size),
- p + size - m,
-@@ -189,7 +189,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- if (!check_pointer_and_size(cms, pe, hash_base, hash_size))
- cmsgotoerr(error, cms, "PE header is invalid");
- dprintf("beginning of hash");
-- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+ dprintf("digesting %tx + %zx", hash_base - map, hash_size);
- generate_digest_step(cms, hash_base, hash_size);
-
- /* 5. Skip over the image checksum
-@@ -209,7 +209,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- cmsgotoerr(error, cms, "PE data directory is invalid");
-
- generate_digest_step(cms, hash_base, hash_size);
-- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+ dprintf("digesting %tx + %zx", hash_base - map, hash_size);
-
- /* 8. Skip over the crt dir
- * 9. Hash everything up to the end of the image header. */
-@@ -222,7 +222,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- cmsgotoerr(error, cms, "PE relocations table is invalid");
-
- generate_digest_step(cms, hash_base, hash_size);
-- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+ dprintf("digesting %tx + %zx", hash_base - map, hash_size);
-
- /* 10. Set SUM_OF_BYTES_HASHED to the size of the header. */
- hashed_bytes = pe32opthdr ? pe32opthdr->header_size
-@@ -265,7 +265,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- }
-
- generate_digest_step(cms, hash_base, hash_size);
-- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+ dprintf("digesting %tx + %zx", hash_base - map, hash_size);
-
- hashed_bytes += hash_size;
- }
-@@ -285,10 +285,12 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
- memset(tmp_array, '\0', tmp_size);
- memcpy(tmp_array, hash_base, hash_size);
- generate_digest_step(cms, tmp_array, tmp_size);
-- dprintf("digesting %lx + %lx", (unsigned long)tmp_array, tmp_size);
-+ dprintf("digesting %tx + %zx", (ptrdiff_t)tmp_array,
-+ tmp_size);
- } else {
- generate_digest_step(cms, hash_base, hash_size);
-- dprintf("digesting %lx + %lx", hash_base - map, hash_size);
-+ dprintf("digesting %tx + %zx", hash_base - map,
-+ hash_size);
- }
- }
- dprintf("end of hash");
-diff --git a/src/password.c b/src/password.c
-index 644f362..05add9a 100644
---- a/src/password.c
-+++ b/src/password.c
-@@ -213,7 +213,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
- dprintf("non-whitespace span is %zd", span);
-
- if (line[span] == '\0') {
-- dprintf("returning %ld", (line + span) - start);
-+ dprintf("returning %td", (line + span) - start);
- return (line + span) - start;
- }
- line[span] = '\0';
-@@ -241,7 +241,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
- dprintf("Setting token pass %p to { %p, %p }", tp, tp->token, tp->pass);
- dprintf("token:\"%s\"", tp->token);
- dprintf("pass:\"%s\"", tp->pass);
-- dprintf("returning %ld", (line + span) - start);
-+ dprintf("returning %td", (line + span) - start);
- return (line + span) - start;
- }
-
-@@ -330,7 +330,8 @@ SECU_FilePasswd(PK11SlotInfo *slot, PRBool retry, void *arg)
- if (c != '\0')
- span++;
- start += span;
-- dprintf("start is file[%ld] == '\\x%02hhx'", start - file, start[0]);
-+ dprintf("start is file[%td] == '\\x%02hhx'", start - file,
-+ start[0]);
- }
-
- qsort(phrases, nphrases, sizeof(struct token_pass), token_pass_cmp);
diff --git a/app-crypt/pesign/files/pesign-114-no-werror.patch b/app-crypt/pesign/files/pesign-114-no-werror.patch
deleted file mode 100644
index 3937873e80bd..000000000000
--- a/app-crypt/pesign/files/pesign-114-no-werror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Make.defaults b/Make.defaults
-index fdb961a..cdbb064 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -58,7 +58,7 @@ cflags = $(CFLAGS) $(ARCH3264) \
- -Wall -Wextra -Wsign-compare -Wno-unused-result \
- -Wno-unused-function -Wno-missing-field-initializers \
- -Wno-analyzer-malloc-leak \
-- -Werror -Wno-error=cpp -Wno-free-nonheap-object \
-+ -Wno-error=cpp -Wno-free-nonheap-object \
- -std=gnu11 -fshort-wchar -fPIC -fno-strict-aliasing \
- -D_GNU_SOURCE -DCONFIG_$(ARCH) -I${TOPDIR}/include \
- '-DRUNDIR="$(rundir)"' \
diff --git a/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch b/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
deleted file mode 100644
index 43bc0d84c44c..000000000000
--- a/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/rhboot/pesign/issues/78
-
-daemon.c:922:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas]
- 922 | #pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-cc1: all warnings being treated as errors
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -916,10 +916,6 @@ do_shutdown(context *ctx, int nsockets, struct pollfd *pollfds)
- free(pollfds);
- }
-
--/* GCC -fanalyzer has trouble with realloc
-- * https://bugzilla.redhat.com/show_bug.cgi?id=2047926 */
--#pragma GCC diagnostic push
--#pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
- static int
- handle_events(context *ctx)
- {
diff --git a/app-crypt/pesign/pesign-114.ebuild b/app-crypt/pesign/pesign-114.ebuild
deleted file mode 100644
index bd65febf96c3..000000000000
--- a/app-crypt/pesign/pesign-114.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
-HOMEPAGE="https://github.com/rhboot/pesign"
-SRC_URI="https://github.com/rhboot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- dev-libs/nspr
- dev-libs/nss
- dev-libs/openssl:=
- dev-libs/popt
- sys-apps/util-linux
- >=sys-libs/efivar-38
-"
-DEPEND="${RDEPEND}
- sys-boot/gnu-efi
-"
-BDEPEND="
- sys-apps/help2man
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-114-wanalyzer-diagnostic.patch
- "${FILESDIR}"/${PN}-114-no-werror.patch
-
- "${FILESDIR}"/${P}-format-string.patch
-)
-
-src_compile() {
- emake \
- AR="$(tc-getAR)" \
- ARFLAGS="-cvqs" \
- AS="$(tc-getAS)" \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- OBJCOPY="$(tc-getOBJCOPY)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- RANLIB="$(tc-getRANLIB)" \
- rundir="${EPREFIX}/var/run"
-}
-
-src_install() {
- emake DESTDIR="${ED}" VERSION="${PVR}" rundir="${EPREFIX}/var/run" install
- einstalldocs
-
- # remove some files that don't make sense for Gentoo installs
- rm -rf "${ED}/etc" "${ED}/var" "${ED}/usr/share/doc/${PF}/COPYING" || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-02 10:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-04 16:50 [gentoo-commits] repo/gentoo:master commit in: app-crypt/pesign/files/, app-crypt/pesign/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-12-02 10:52 Petr Vaněk
2019-07-27 0:22 Stefan Strogin
2017-02-09 23:41 Göktürk Yüksek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox