security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-21 15:01:41 +02:00
Code Activity

speedo,w32: Install ntbtls as a library

Browse Source 
* build-aux/speedo.mk (AUTHENTICODE_FILES): Sign ntbtls files.
(speedo_pkg_ntbtls_configure): Remove duplicated
32 bit entry.
* build-aux/speedo/w32/inst.nsi,
build-aux/speedo/w32/wixlib.wxs: Package ntblts dll.

--
This changes ntbtls to be built with default options both
on 64 bit and on 32 bit. Previously on 32 bit Windows it
would have been linked statically. But since the file lists
are hardcoded this should be independent of the architecture.
This commit is contained in:
Andre Heinecke 2024-08-12 12:19:36 +02:00
parent 882ab7fef9
commit d80345244c
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build-aux/speedo.mk
View File

@ -233,6 +233,7 @@ AUTHENTICODE_FILES= \
libgpgme-11.dll \ libgpgme-11.dll \
libksba-8.dll \ libksba-8.dll \
libnpth-0.dll \ libnpth-0.dll \
libntbtls-0.dll \
libsqlite3-0.dll \ libsqlite3-0.dll \
pinentry-w32.exe \ pinentry-w32.exe \
scdaemon.exe \ scdaemon.exe \
@ -498,9 +499,6 @@ speedo_pkg_libgcrypt_configure = --disable-static
speedo_pkg_libksba_configure = --disable-static speedo_pkg_libksba_configure = --disable-static
speedo_pkg_ntbtls_configure = --enable-static
ifeq ($(STATIC),1) ifeq ($(STATIC),1)
speedo_pkg_npth_configure += --disable-shared speedo_pkg_npth_configure += --disable-shared
@ -513,9 +511,6 @@ speedo_pkg_libgcrypt_configure += --disable-shared
speedo_pkg_libksba_configure += --disable-shared speedo_pkg_libksba_configure += --disable-shared
endif endif
# For now we build ntbtls only static
speedo_pkg_ntbtls_configure = --disable-shared
ifeq ($(TARGETOS),w32) ifeq ($(TARGETOS),w32)
speedo_pkg_gnupg_configure = \ speedo_pkg_gnupg_configure = \
--disable-g13 --enable-ntbtls --disable-tpm2d --disable-g13 --enable-ntbtls --disable-tpm2d

9
build-aux/speedo/w32/inst.nsi
View File

@ -858,6 +858,11 @@ Section "-sqlite" SEC_sqlite
File bin/libsqlite3-0.dll File bin/libsqlite3-0.dll
SectionEnd SectionEnd
Section "-ntbtls" SEC_ntbtls
SetOutPath "$INSTDIR\bin"
File bin/libntbtls-0.dll
SectionEnd
!ifdef WITH_GUI !ifdef WITH_GUI
Section "-libiconv" SEC_libiconv Section "-libiconv" SEC_libiconv
SetOutPath "$INSTDIR\bin" SetOutPath "$INSTDIR\bin"
@ -1442,6 +1447,10 @@ Section "-un.sqlite"
Delete "$INSTDIR\bin\libsqlite3-0.dll" Delete "$INSTDIR\bin\libsqlite3-0.dll"
SectionEnd SectionEnd
Section "-un.ntbtls"
Delete "$INSTDIR\bin\libntbtls-0.dll"
SectionEnd
Section "-un.gnupginst" Section "-un.gnupginst"
# Delete standard stuff. # Delete standard stuff.
Delete "$INSTDIR\README.txt" Delete "$INSTDIR\README.txt"

3
build-aux/speedo/w32/wixlib.wxs
View File

@ -118,6 +118,9 @@ and then manually edited:
<Component Id="cmpC056F063A80E93157FDD8E5EFB2CE016" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="20439DF2-C028-43DD-9BC1-482FDE51C8C5"> <Component Id="cmpC056F063A80E93157FDD8E5EFB2CE016" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="20439DF2-C028-43DD-9BC1-482FDE51C8C5">
<File Id="filF97663792C6DE115203B57642F12933C" KeyPath="yes" Source="$(var.SourceDir)\bin\libsqlite3-0.dll"/> <File Id="filF97663792C6DE115203B57642F12933C" KeyPath="yes" Source="$(var.SourceDir)\bin\libsqlite3-0.dll"/>
</Component> </Component>
<Component Id="cmpC056F063A80E93157FDD8E5EFB2CE017" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="304AEF03-D2EC-430E-96BF-34893AF88376">
<File Id="filF98663792C6DE115203B57642F12933E" KeyPath="yes" Source="$(var.SourceDir)\bin\libntbtls-0.dll"/>
</Component>
<Component Id="cmp1EA054F1DCA27F5E05A6BB12C0FD5037" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="C4BB5B91-A126-4E9E-9E59-194CB722E8A5"> <Component Id="cmp1EA054F1DCA27F5E05A6BB12C0FD5037" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="C4BB5B91-A126-4E9E-9E59-194CB722E8A5">
<File Id="fil52E5309B19823ED3214CA9CA0F5E434D" KeyPath="yes" Source="$(var.SourceDir)\bin\pinentry-w32.exe" Name="pinentry-basic.exe"/> <File Id="fil52E5309B19823ED3214CA9CA0F5E434D" KeyPath="yes" Source="$(var.SourceDir)\bin\pinentry-w32.exe" Name="pinentry-basic.exe"/>
</Component> </Component>