mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 06:52:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin/bitcoin#27179: guix: use osslsigncode 2.5

Browse source 
285edfadca 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 285edfadca

Tree-SHA512: 2ab8f65e506bd97e74e76f24e791ae20694e567a751cc57d3a27f31f0733e3530d058ef19825a35dc21d1342e3fffc52d8d643258198c669cc68b6db41bda629
This commit is contained in:
Andrew Chow 2023-03-20 12:49:47 -04:00
commit f4e42a78c7
No known key found for this signature in database
GPG key ID: 17565732E08E5E41
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/guix/libexec/codesign.sh
View file

@ -77,6 +77,7 @@ mkdir -p "$DISTSRC"
osslsigncode attach-signature \ osslsigncode attach-signature \
-in "$infile" \ -in "$infile" \
-out "${OUTDIR}/${infile_base/-unsigned}" \ -out "${OUTDIR}/${infile_base/-unsigned}" \
-CAfile "$GUIX_ENVIRONMENT/etc/ssl/certs/ca-certificates.crt" \
-sigin codesignatures/win/"$infile_base".pem -sigin codesignatures/win/"$infile_base".pem
done done
;; ;;

21
contrib/guix/manifest.scm
View file

@ -28,6 +28,7 @@
(gnu packages shells) (gnu packages shells)
(gnu packages tls) (gnu packages tls)
(gnu packages version-control) (gnu packages version-control)
(guix build-system cmake)
(guix build-system gnu) (guix build-system gnu)
(guix build-system python) (guix build-system python)
(guix build-system trivial) (guix build-system trivial)
@ -240,27 +241,20 @@ parse, modify and abstract ELF, PE and MachO formats.")
(define osslsigncode (define osslsigncode
(package (package
(name "osslsigncode") (name "osslsigncode")
(version "2.0") (version "2.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/mtrojnar/" (uri (string-append "https://github.com/mtrojnar/"
name "/archive/" version ".tar.gz")) name "/archive/" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0byri6xny770wwb2nciq44j5071122l14bvv65axdd70nfjf0q2s")))) "03by9706gg0an6dn48pljx38vcb76ziv11bgm8ilwsf293x2k4hv"))))
(build-system gnu-build-system) (build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(inputs (inputs
`(("openssl" ,openssl))) `(("openssl", openssl)))
(arguments (arguments
`(#:configure-flags '(#:configure-flags
`("--without-gsf" (list "-DCMAKE_DISABLE_FIND_PACKAGE_CURL=TRUE")))
"--without-curl"
"--disable-dependency-tracking")))
(home-page "https://github.com/mtrojnar/osslsigncode") (home-page "https://github.com/mtrojnar/osslsigncode")
(synopsis "Authenticode signing and timestamping tool") (synopsis "Authenticode signing and timestamping tool")
(description "osslsigncode is a small tool that implements part of the (description "osslsigncode is a small tool that implements part of the
@ -609,6 +603,7 @@ inspecting signatures in Mach-O binaries.")
(list zip (list zip
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
(make-nsis-for-gcc-10 nsis-x86_64) (make-nsis-for-gcc-10 nsis-x86_64)
nss-certs
osslsigncode)) osslsigncode))
((string-contains target "-linux-") ((string-contains target "-linux-")
(list (make-bitcoin-cross-toolchain target))) (list (make-bitcoin-cross-toolchain target)))