* [gentoo-commits] repo/gentoo:master commit in: app-crypt/yubihsm-shell/, app-crypt/yubihsm-shell/files/
@ 2023-04-07 18:16 Jason A. Donenfeld
0 siblings, 0 replies; 3+ messages in thread
From: Jason A. Donenfeld @ 2023-04-07 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 0cb75896d9acfea6936248b325e2c37914e92383
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 7 18:15:19 2023 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 7 18:16:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb75896
app-crypt/yubihsm-shell: do not run hw-dependent tests and sanitize cflags
Closes: https://bugs.gentoo.org/903983
Closes: https://bugs.gentoo.org/903984
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>
...-shell-2.4.0-remove-hardcoded-compiler-opts.patch | 20 ++++++++++++++++++++
app-crypt/yubihsm-shell/yubihsm-shell-2.4.0.ebuild | 2 ++
2 files changed, 22 insertions(+)
diff --git a/app-crypt/yubihsm-shell/files/yubihsm-shell-2.4.0-remove-hardcoded-compiler-opts.patch b/app-crypt/yubihsm-shell/files/yubihsm-shell-2.4.0-remove-hardcoded-compiler-opts.patch
new file mode 100644
index 000000000000..633e5e05422d
--- /dev/null
+++ b/app-crypt/yubihsm-shell/files/yubihsm-shell-2.4.0-remove-hardcoded-compiler-opts.patch
@@ -0,0 +1,20 @@
+diff -ru yubihsm-shell-2.4.0-orig/cmake/SecurityFlags.cmake yubihsm-shell-2.4.0/cmake/SecurityFlags.cmake
+--- yubihsm-shell-2.4.0-orig/cmake/SecurityFlags.cmake 2023-04-07 20:11:44.438751635 +0200
++++ yubihsm-shell-2.4.0/cmake/SecurityFlags.cmake 2023-04-07 20:12:30.588873600 +0200
+@@ -4,7 +4,7 @@
+ CMAKE_C_COMPILER_ID STREQUAL "AppleClang" OR
+ CMAKE_C_COMPILER_ID STREQUAL "GNU")
+
+- add_compile_options (-Wall -Wextra -Werror)
++ add_compile_options (-Wall -Wextra)
+ add_compile_options (-Wformat -Wformat-nonliteral -Wformat-security)
+ add_compile_options (-Wshadow)
+ add_compile_options (-Wcast-qual)
+@@ -13,7 +13,6 @@
+ add_compile_options (-pedantic -pedantic-errors)
+ add_compile_options (-fpie -fpic)
+ if (NOT FUZZ)
+- add_compile_options(-O2)
+ add_definitions (-D_FORTIFY_SOURCE=2)
+ endif ()
+
diff --git a/app-crypt/yubihsm-shell/yubihsm-shell-2.4.0.ebuild b/app-crypt/yubihsm-shell/yubihsm-shell-2.4.0.ebuild
index 6ff4ec262044..acc0bbc3eb7c 100644
--- a/app-crypt/yubihsm-shell/yubihsm-shell-2.4.0.ebuild
+++ b/app-crypt/yubihsm-shell/yubihsm-shell-2.4.0.ebuild
@@ -8,10 +8,12 @@ inherit cmake
DESCRIPTION="Components used to interact with the YubiHSM 2"
HOMEPAGE="https://developers.yubico.com/yubihsm-shell/"
SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+PATCHES=( "${FILESDIR}"/${P}-remove-hardcoded-compiler-opts.patch )
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
+RESTRICT="test"
DEPEND="
dev-libs/openssl:=
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/yubihsm-shell/, app-crypt/yubihsm-shell/files/
@ 2025-05-01 4:02 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-05-01 4:02 UTC (permalink / raw
To: gentoo-commits
commit: 96624a42de14b4b98414a73b1ea69c5860d6ca27
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 1 04:01:47 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 1 04:01:47 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96624a42
app-crypt/yubihsm-shell: drop 2.4.0
Just do the security cleanup immediately. The old version wasn't
buildable anyway w/ current pcsc-lite.
Bug: https://bugs.gentoo.org/946066
Bug: https://bugs.gentoo.org/955141
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/yubihsm-shell/Manifest | 1 -
...hell-2.4.0-remove-hardcoded-compiler-opts.patch | 20 ---------------
app-crypt/yubihsm-shell/yubihsm-shell-2.4.0.ebuild | 29 ----------------------
3 files changed, 50 deletions(-)
diff --git a/app-crypt/yubihsm-shell/Manifest b/app-crypt/yubihsm-shell/Manifest
index de17eb2b5059..b8f59cf658a6 100644
--- a/app-crypt/yubihsm-shell/Manifest
+++ b/app-crypt/yubihsm-shell/Manifest
@@ -1,2 +1 @@
-DIST yubihsm-shell-2.4.0.tar.gz 334956 BLAKE2B 93a86baa1e463aa5200e31e9cc657642f37e05ec6e9897bb35f0b518df83b38c69e365766170d76aeeae6da357f3c2fce736c03665861c7ed4f2b56805a7eb3a SHA512 2b08e6e8932ff3bc12d1233d88147264a9875ce145290e29fb6b8f25eeb8e502afff9e7d02714a50454b85b0f01b09c0321d830a483d6b4f7afb962adce882d5
DIST yubihsm-shell-2.6.0.tar.gz 426458 BLAKE2B f36a44c054fc30b548a71fc50e4fe3c59fac297d747c52b31997034b538208fc128ae1ec57a2976de247302710b44ad1f3eba518be268e5996d4c3e33069c6d8 SHA512 04335fffa110fe43df2f1e46231e0ca7fcfe4f6a7305f8630dd346f7ed5d6d57bab53f6c268010bf7358729a429b05c52ffd273fe021cf60cfe97a6941ab0f56
diff --git a/app-crypt/yubihsm-shell/files/yubihsm-shell-2.4.0-remove-hardcoded-compiler-opts.patch b/app-crypt/yubihsm-shell/files/yubihsm-shell-2.4.0-remove-hardcoded-compiler-opts.patch
deleted file mode 100644
index 633e5e05422d..000000000000
--- a/app-crypt/yubihsm-shell/files/yubihsm-shell-2.4.0-remove-hardcoded-compiler-opts.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ru yubihsm-shell-2.4.0-orig/cmake/SecurityFlags.cmake yubihsm-shell-2.4.0/cmake/SecurityFlags.cmake
---- yubihsm-shell-2.4.0-orig/cmake/SecurityFlags.cmake 2023-04-07 20:11:44.438751635 +0200
-+++ yubihsm-shell-2.4.0/cmake/SecurityFlags.cmake 2023-04-07 20:12:30.588873600 +0200
-@@ -4,7 +4,7 @@
- CMAKE_C_COMPILER_ID STREQUAL "AppleClang" OR
- CMAKE_C_COMPILER_ID STREQUAL "GNU")
-
-- add_compile_options (-Wall -Wextra -Werror)
-+ add_compile_options (-Wall -Wextra)
- add_compile_options (-Wformat -Wformat-nonliteral -Wformat-security)
- add_compile_options (-Wshadow)
- add_compile_options (-Wcast-qual)
-@@ -13,7 +13,6 @@
- add_compile_options (-pedantic -pedantic-errors)
- add_compile_options (-fpie -fpic)
- if (NOT FUZZ)
-- add_compile_options(-O2)
- add_definitions (-D_FORTIFY_SOURCE=2)
- endif ()
-
diff --git a/app-crypt/yubihsm-shell/yubihsm-shell-2.4.0.ebuild b/app-crypt/yubihsm-shell/yubihsm-shell-2.4.0.ebuild
deleted file mode 100644
index acc0bbc3eb7c..000000000000
--- a/app-crypt/yubihsm-shell/yubihsm-shell-2.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Components used to interact with the YubiHSM 2"
-HOMEPAGE="https://developers.yubico.com/yubihsm-shell/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-PATCHES=( "${FILESDIR}"/${P}-remove-hardcoded-compiler-opts.patch )
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-
-DEPEND="
- dev-libs/openssl:=
- net-misc/curl
- dev-libs/libedit
- virtual/libusb:1
- sys-apps/pcsc-lite
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- dev-util/gengetopt
- virtual/pkgconfig
-"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/yubihsm-shell/, app-crypt/yubihsm-shell/files/
@ 2025-05-11 0:35 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2025-05-11 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 120df43f87df20cdbdba76c113576ddf34233d49
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Fri May 9 17:47:22 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 11 00:29:35 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120df43f
app-crypt/yubihsm-shell: fix non-lto build
Closes: https://bugs.gentoo.org/955169
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42005
Closes: https://github.com/gentoo/gentoo/pull/42005
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../yubihsm-shell-2.6.0-fix-examples-link.patch | 20 ++++++++++++++++++++
app-crypt/yubihsm-shell/yubihsm-shell-2.6.0.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/app-crypt/yubihsm-shell/files/yubihsm-shell-2.6.0-fix-examples-link.patch b/app-crypt/yubihsm-shell/files/yubihsm-shell-2.6.0-fix-examples-link.patch
new file mode 100644
index 000000000000..db6b907e7ae3
--- /dev/null
+++ b/app-crypt/yubihsm-shell/files/yubihsm-shell-2.6.0-fix-examples-link.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/955169
+
+This change is applied upstream as a part of a larger commit.
+This gets around non-lto builds failing with missing symbols.
+
+https://github.com/Yubico/yubihsm-shell/commit/ec05084df550fd25c3fe0acd7ab62ba7d2130b5c
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 28750ad..50ab0e6 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -52,6 +52,7 @@ set (
+ SOURCE_WRAP
+ wrap.c
+ ../common/util.c
++ ../common/hash.c
+ ../common/openssl-compat.c
+ )
+
+
diff --git a/app-crypt/yubihsm-shell/yubihsm-shell-2.6.0.ebuild b/app-crypt/yubihsm-shell/yubihsm-shell-2.6.0.ebuild
index 7ea1e4b8c1fc..2b4f7c8da6d5 100644
--- a/app-crypt/yubihsm-shell/yubihsm-shell-2.6.0.ebuild
+++ b/app-crypt/yubihsm-shell/yubihsm-shell-2.6.0.ebuild
@@ -30,6 +30,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-2.6.0-pcsc-lite-pkgconfig.patch
"${FILESDIR}"/${PN}-2.6.0-remove-hardcoded-compiler-opts.patch
+ "${FILESDIR}"/${PN}-2.6.0-fix-examples-link.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-05-11 0:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-11 0:35 [gentoo-commits] repo/gentoo:master commit in: app-crypt/yubihsm-shell/, app-crypt/yubihsm-shell/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-05-01 4:02 Sam James
2023-04-07 18:16 Jason A. Donenfeld
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox