Skip to content

Commit f4e42a7

Browse files
committed
Merge bitcoin/bitcoin#27179: guix: use osslsigncode 2.5
285edfa 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 285edfa Tree-SHA512: 2ab8f65e506bd97e74e76f24e791ae20694e567a751cc57d3a27f31f0733e3530d058ef19825a35dc21d1342e3fffc52d8d643258198c669cc68b6db41bda629
2 parents b7edd55 + 285edfa commit f4e42a7

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

contrib/guix/libexec/codesign.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ mkdir -p "$DISTSRC"
7777
osslsigncode attach-signature \
7878
-in "$infile" \
7979
-out "${OUTDIR}/${infile_base/-unsigned}" \
80+
-CAfile "$GUIX_ENVIRONMENT/etc/ssl/certs/ca-certificates.crt" \
8081
-sigin codesignatures/win/"$infile_base".pem
8182
done
8283
;;

contrib/guix/manifest.scm

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
(gnu packages shells)
2929
(gnu packages tls)
3030
(gnu packages version-control)
31+
(guix build-system cmake)
3132
(guix build-system gnu)
3233
(guix build-system python)
3334
(guix build-system trivial)
@@ -240,27 +241,20 @@ parse, modify and abstract ELF, PE and MachO formats.")
240241
(define osslsigncode
241242
(package
242243
(name "osslsigncode")
243-
(version "2.0")
244+
(version "2.5")
244245
(source (origin
245246
(method url-fetch)
246247
(uri (string-append "https://github.com/mtrojnar/"
247248
name "/archive/" version ".tar.gz"))
248249
(sha256
249250
(base32
250-
"0byri6xny770wwb2nciq44j5071122l14bvv65axdd70nfjf0q2s"))))
251-
(build-system gnu-build-system)
252-
(native-inputs
253-
`(("pkg-config" ,pkg-config)
254-
("autoconf" ,autoconf)
255-
("automake" ,automake)
256-
("libtool" ,libtool)))
251+
"03by9706gg0an6dn48pljx38vcb76ziv11bgm8ilwsf293x2k4hv"))))
252+
(build-system cmake-build-system)
257253
(inputs
258-
`(("openssl" ,openssl)))
254+
`(("openssl", openssl)))
259255
(arguments
260-
`(#:configure-flags
261-
`("--without-gsf"
262-
"--without-curl"
263-
"--disable-dependency-tracking")))
256+
'(#:configure-flags
257+
(list "-DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE")))
264258
(home-page "https://github.com/mtrojnar/osslsigncode")
265259
(synopsis "Authenticode signing and timestamping tool")
266260
(description "osslsigncode is a small tool that implements part of the
@@ -609,6 +603,7 @@ inspecting signatures in Mach-O binaries.")
609603
(list zip
610604
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
611605
(make-nsis-for-gcc-10 nsis-x86_64)
606+
nss-certs
612607
osslsigncode))
613608
((string-contains target "-linux-")
614609
(list (make-bitcoin-cross-toolchain target)))

0 commit comments

Comments
 (0)