Skip to content

Commit

Permalink
Merge bitcoin#27179: guix: use osslsigncode 2.5
Browse files Browse the repository at this point in the history
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
  • Loading branch information
achow101 authored and PastaPastaPasta committed Jan 19, 2024
1 parent ec8edc4 commit 2d01233
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
1 change: 1 addition & 0 deletions contrib/guix/libexec/codesign.sh
Expand Up @@ -70,6 +70,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
;;
Expand Down
21 changes: 8 additions & 13 deletions contrib/guix/manifest.scm
Expand Up @@ -28,6 +28,7 @@
(gnu packages bison)
(gnu packages tls)
(gnu packages version-control)
(guix build-system cmake)
(guix build-system gnu)
(guix build-system python)
(guix build-system trivial)
Expand Down Expand Up @@ -205,27 +206,20 @@ chain for " target " development."))
(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
Expand Down Expand Up @@ -609,6 +603,7 @@ parse, modify and abstract ELF, PE and MachO formats.")
(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)))
Expand Down

0 comments on commit 2d01233

Please sign in to comment.