diff options
| author | Andrew Chow <github@achow101.com> | 2023-03-20 12:49:47 -0400 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-03-20 12:50:11 -0400 |
| commit | f4e42a78c75719ad6a99962360ec67d92a563a9d (patch) | |
| tree | ffe5fe3ee397345ecd49213a408604de79becdcf /contrib | |
| parent | b7edd55c2204e9a2119c87884697091e8112800e (diff) | |
| parent | 285edfadcacde4921c0afa2092c613daf21a55aa (diff) | |
| download | bitcoin-f4e42a78c75719ad6a99962360ec67d92a563a9d.tar.xz | |
Merge bitcoin/bitcoin#27179: guix: use osslsigncode 2.5
285edfadcacde4921c0afa2092c613daf21a55aa guix: use osslsigncode 2.5 (fanquake)
Pull request description:
Switches to using a newer version of [osslsigncode](https://github.com/mtrojnar/osslsigncode) in our Guix environment.
achow101 can you test this with some sort of WIndows code-signing dry-run (no-rush).
ACKs for top commit:
achow101:
ACK 285edfadcacde4921c0afa2092c613daf21a55aa
Tree-SHA512: 2ab8f65e506bd97e74e76f24e791ae20694e567a751cc57d3a27f31f0733e3530d058ef19825a35dc21d1342e3fffc52d8d643258198c669cc68b6db41bda629
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/guix/libexec/codesign.sh | 1 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 21 |
2 files changed, 9 insertions, 13 deletions
diff --git a/contrib/guix/libexec/codesign.sh b/contrib/guix/libexec/codesign.sh index f6322d761c..6ffa0f07b2 100755 --- a/contrib/guix/libexec/codesign.sh +++ b/contrib/guix/libexec/codesign.sh @@ -77,6 +77,7 @@ mkdir -p "$DISTSRC" osslsigncode attach-signature \ -in "$infile" \ -out "${OUTDIR}/${infile_base/-unsigned}" \ + -CAfile "$GUIX_ENVIRONMENT/etc/ssl/certs/ca-certificates.crt" \ -sigin codesignatures/win/"$infile_base".pem done ;; diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index dc42563cdd..7c1550a8d1 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -28,6 +28,7 @@ (gnu packages shells) (gnu packages tls) (gnu packages version-control) + (guix build-system cmake) (guix build-system gnu) (guix build-system python) (guix build-system trivial) @@ -240,27 +241,20 @@ parse, modify and abstract ELF, PE and MachO formats.") (define osslsigncode (package (name "osslsigncode") - (version "2.0") + (version "2.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/mtrojnar/" name "/archive/" version ".tar.gz")) (sha256 (base32 - "0byri6xny770wwb2nciq44j5071122l14bvv65axdd70nfjf0q2s")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + "03by9706gg0an6dn48pljx38vcb76ziv11bgm8ilwsf293x2k4hv")))) + (build-system cmake-build-system) (inputs - `(("openssl" ,openssl))) + `(("openssl", openssl))) (arguments - `(#:configure-flags - `("--without-gsf" - "--without-curl" - "--disable-dependency-tracking"))) + '(#:configure-flags + (list "-DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE"))) (home-page "https://github.com/mtrojnar/osslsigncode") (synopsis "Authenticode signing and timestamping tool") (description "osslsigncode is a small tool that implements part of the @@ -609,6 +603,7 @@ inspecting signatures in Mach-O binaries.") (list zip (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") (make-nsis-for-gcc-10 nsis-x86_64) + nss-certs osslsigncode)) ((string-contains target "-linux-") (list (make-bitcoin-cross-toolchain target))) |