JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #176786 from hmenke/sbsigntool

Browse Source 
sbsigntool: 0.9.1 -> 0.9.4
This commit is contained in:
Rick van Schijndel 2022-06-11 19:40:49 +02:00 committed by GitHub
commit 42c5ac082d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/security/sbsigntool/autoconf.patch
View File

@ -1,9 +1,11 @@
--- sbsigntools/configure.ac 2018-09-25 10:30:00.878766256 -0500
+++ configure.ac.new 2018-09-25 10:34:56.231277375 -0500
@@ -71,15 +71,16 @@
diff --git a/configure.ac b/configure.ac
index 4ffb68f..d8a8265 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,15 +71,16 @@ AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = "
# no consistent view of where gnu-efi should dump the efi stuff, so find it
##
for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi; do
for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi ; do
- if test -e $path/crt0-efi-$EFI_ARCH.o; then
- CRTPATH=$path
+ if test -e @@NIX_GNUEFI@@/$path/crt0-efi-$EFI_ARCH.o; then
@ -20,7 +22,7 @@
-DEFI_FUNCTION_WRAPPER"
CPPFLAGS_save="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
@@ -90,5 +91,5 @@
@@ -90,5 +91,5 @@ AC_SUBST(EFI_ARCH, $EFI_ARCH)
AC_SUBST(CRTPATH, $CRTPATH)
AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]

10
pkgs/tools/security/sbsigntool/default.nix
View File

@ -3,14 +3,14 @@
, openssl, libuuid, gnu-efi, libbfd
}:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "sbsigntool";
version = "0.9.1";
version = "0.9.4";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git";
rev = "v0.9.1";
sha256 = "098gxmhjn8acxjw5bq59wq4xhgkpx1xn8kjvxwdzpqkwq9ivrsbp";
rev = "v${version}";
sha256 = "sha256-dbjdA+hjII/k7wABTTJV5RBdy4KlNkFlBWEaX4zn5vg=";
};
patches = [ ./autoconf.patch ];
@ -45,7 +45,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "Tools for maintaining UEFI signature databases";
homepage = "http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases";
maintainers = [ maintainers.tstrobel ];
maintainers = with maintainers; [ hmenke tstrobel ];
platforms = [ "x86_64-linux" ]; # Broken on i686
license = licenses.gpl3;
};