mirror of
git://git.gnupg.org/gnupg.git
synced 2025-02-22 19:58:29 +01:00
speedo: Do not build gpgme anymore.
* build-aux/speedo.mk: Remove support gpgme. * build-aux/speedo/w32/inst.nsi: Ditto. * build-aux/speedo/w32/wixlib.wxs: Remove the gpgme components. -- GPGME is either already availabale on Unix platforms or can be installed on Widnows with gpg4win. GnuPG itself does not require gpgme.
This commit is contained in:
Werner Koch
parent
48978ccb4e
commit
bec71fdbe5
3
NEWS
3
NEWS
@ -4,6 +4,9 @@ Noteworthy changes in version 2.5.5 (unreleased)
|
||||
* gpg: Fix a verification DoS due to a malicious subkey in the
|
||||
keyring. [T7527]
|
||||
|
||||
* GPGME is not any more distributed with the Windows installer.
|
||||
Please install gpg4win to get gpgme version.
|
||||
|
||||
See-also: gnupg-announce/2025q1/000xxx.html
|
||||
Release-info: https://dev.gnupg.org/T7530
|
||||
|
||||
|
||||
@ -225,7 +225,6 @@ AUTHENTICODE_FILES= \
|
||||
gpg-wks-client.exe \
|
||||
gpg.exe \
|
||||
gpgconf.exe \
|
||||
gpgme-w32spawn.exe \
|
||||
gpgsm.exe \
|
||||
gpgtar.exe \
|
||||
gpgv.exe \
|
||||
@ -234,7 +233,6 @@ AUTHENTICODE_FILES= \
|
||||
libassuan-9.dll \
|
||||
libgcrypt-20.dll \
|
||||
libgpg-error-0.dll \
|
||||
libgpgme-11.dll \
|
||||
libksba-8.dll \
|
||||
libnpth-0.dll \
|
||||
libntbtls-0.dll \
|
||||
@ -272,10 +270,6 @@ speedo_spkgs = \
|
||||
zlib bzip2 sqlite \
|
||||
libassuan libksba ntbtls gnupg
|
||||
|
||||
ifeq ($(STATIC),0)
|
||||
speedo_spkgs += gpgme
|
||||
endif
|
||||
|
||||
ifeq ($(TARGETOS),w32)
|
||||
speedo_spkgs += pinentry
|
||||
endif
|
||||
@ -297,7 +291,7 @@ endif
|
||||
# Packages which use the gnupg autogen.sh build style
|
||||
speedo_gnupg_style = \
|
||||
libgpg-error npth libgcrypt \
|
||||
libassuan libksba ntbtls gnupg gpgme \
|
||||
libassuan libksba ntbtls gnupg \
|
||||
pinentry
|
||||
|
||||
# Packages which use only make and no build directory
|
||||
@ -351,10 +345,6 @@ ntbtls_ver := $(shell awk '$$1=="ntbtls_ver" {print $$2}' swdb.lst)
|
||||
ntbtls_sha1 := $(shell awk '$$1=="ntbtls_sha1" {print $$2}' swdb.lst)
|
||||
ntbtls_sha2 := $(shell awk '$$1=="ntbtls_sha2" {print $$2}' swdb.lst)
|
||||
|
||||
gpgme_ver := $(shell awk '$$1=="gpgme_ver" {print $$2}' swdb.lst)
|
||||
gpgme_sha1 := $(shell awk '$$1=="gpgme_sha1" {print $$2}' swdb.lst)
|
||||
gpgme_sha2 := $(shell awk '$$1=="gpgme_sha2" {print $$2}' swdb.lst)
|
||||
|
||||
pinentry_ver := $(shell awk '$$1=="pinentry_ver" {print $$2}' swdb.lst)
|
||||
pinentry_sha1 := $(shell awk '$$1=="pinentry_sha1" {print $$2}' swdb.lst)
|
||||
pinentry_sha2 := $(shell awk '$$1=="pinentry_sha2" {print $$2}' swdb.lst)
|
||||
@ -383,7 +373,6 @@ $(info Zlib ...........: $(zlib_ver))
|
||||
$(info Bzip2 ..........: $(bzip2_ver))
|
||||
$(info SQLite .........: $(sqlite_ver))
|
||||
$(info NtbTLS .. ......: $(ntbtls_ver))
|
||||
$(info GPGME ..........: $(gpgme_ver))
|
||||
$(info Pinentry .......: $(pinentry_ver))
|
||||
endif
|
||||
|
||||
@ -454,8 +443,6 @@ else ifeq ($(WHAT),git)
|
||||
speedo_pkg_libksba_gitref = master
|
||||
speedo_pkg_ntbtls_git = $(gitrep)/ntbtls
|
||||
speedo_pkg_ntbtls_gitref = master
|
||||
speedo_pkg_gpgme_git = $(gitrep)/gpgme
|
||||
speedo_pkg_gpgme_gitref = master
|
||||
speedo_pkg_pinentry_git = $(gitrep)/pinentry
|
||||
speedo_pkg_pinentry_gitref = master
|
||||
else ifeq ($(WHAT),release)
|
||||
@ -471,8 +458,6 @@ else ifeq ($(WHAT),release)
|
||||
$(pkgrep)/libksba/libksba-$(libksba_ver).tar.bz2
|
||||
speedo_pkg_ntbtls_tar = \
|
||||
$(pkgrep)/ntbtls/ntbtls-$(ntbtls_ver).tar.bz2
|
||||
speedo_pkg_gpgme_tar = \
|
||||
$(pkgrep)/gpgme/gpgme-$(gpgme_ver).tar.bz2
|
||||
speedo_pkg_pinentry_tar = \
|
||||
$(pkgrep)/pinentry/pinentry-$(pinentry_ver).tar.bz2
|
||||
else
|
||||
@ -536,13 +521,6 @@ define speedo_pkg_gnupg_post_install
|
||||
endef
|
||||
endif
|
||||
|
||||
# The LDFLAGS was needed for -lintl for glib.
|
||||
speedo_pkg_gpgme_configure = \
|
||||
--disable-static --disable-w32-glib \
|
||||
--with-gpg-error-prefix=$(idir) \
|
||||
LDFLAGS=-L$(idir)/lib
|
||||
|
||||
|
||||
speedo_pkg_pinentry_configure += \
|
||||
--disable-pinentry-qt5 \
|
||||
--disable-pinentry-qt \
|
||||
|
||||
@ -841,18 +841,6 @@ Section "-ksba" SEC_ksba
|
||||
File include/ksba.h
|
||||
SectionEnd
|
||||
|
||||
Section "-gpgme" SEC_gpgme
|
||||
SetOutPath "$INSTDIR\bin"
|
||||
File bin/libgpgme-11.dll
|
||||
File /nonfatal bin/libgpgme-glib-11.dll
|
||||
File libexec/gpgme-w32spawn.exe
|
||||
SetOutPath "$INSTDIR\lib"
|
||||
File /oname=libgpgme.imp lib/libgpgme.dll.a
|
||||
File /nonfatal /oname=libgpgme-glib.imp lib/libgpgme-glib.dll.a
|
||||
SetOutPath "$INSTDIR\include"
|
||||
File include/gpgme.h
|
||||
SectionEnd
|
||||
|
||||
Section "-sqlite" SEC_sqlite
|
||||
SetOutPath "$INSTDIR\bin"
|
||||
File bin/libsqlite3-0.dll
|
||||
@ -1225,15 +1213,6 @@ Section "-un.libiconv"
|
||||
Delete "$INSTDIR\bin\libiconv-2.dll"
|
||||
SectionEnd
|
||||
|
||||
Section "-un.gpgme"
|
||||
Delete "$INSTDIR\bin\libgpgme-11.dll"
|
||||
Delete "$INSTDIR\bin\libgpgme-glib-11.dll"
|
||||
Delete "$INSTDIR\bin\gpgme-w32spawn.exe"
|
||||
Delete "$INSTDIR\lib\libgpgme.imp"
|
||||
Delete "$INSTDIR\lib\libgpgme-glib.imp"
|
||||
Delete "$INSTDIR\include\gpgme.h"
|
||||
SectionEnd
|
||||
|
||||
Section "-un.ksba"
|
||||
Delete "$INSTDIR\bin\libksba-8.dll"
|
||||
Delete "$INSTDIR\lib\libksba.imp"
|
||||
|
||||
@ -85,9 +85,6 @@ and then manually edited:
|
||||
<Component Id="cmpAF601EA2DF4EFD403CBF65A0D5162922" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="EEF227D9-1FA3-4A96-AF86-12D1FDC12925">
|
||||
<File Id="fil00B1F6AD370147577D6F7C998ACE6122" KeyPath="yes" Source="$(var.SourceDir)\bin\gpgconf-w32.exe"/>
|
||||
</Component>
|
||||
<Component Id="cmp3BA8A06E4085F542FDAA78BAFB507AD4" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="E026569F-F37A-49FC-A529-68BDE3097218">
|
||||
<File Id="fil1A596ECA8DC19F8EC626168033269CFE" KeyPath="yes" Source="$(var.SourceDir)\libexec\gpgme-w32spawn.exe"/>
|
||||
</Component>
|
||||
<Component Id="cmp28685CE9EF72251E2DB49488E4F253A0" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="BC5A0A60-3E5C-4FDD-BFEC-EA0C3F370958">
|
||||
<File Id="fil3632B0ED7374F4D2C34F884D0AB1CD55" KeyPath="yes" Source="$(var.SourceDir)\bin\gpgsm.exe"/>
|
||||
</Component>
|
||||
@ -106,9 +103,6 @@ and then manually edited:
|
||||
<Component Id="cmpA55348E1B63D2B8001A86EBE5A88B479" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="475D7E3F-8FA7-4B68-801C-083210A63B03">
|
||||
<File Id="filEF34E24421329153F11FC15FBA8812A0" KeyPath="yes" Source="$(var.SourceDir)\bin\libgpg-error-0.dll"/>
|
||||
</Component>
|
||||
<Component Id="cmpDBDFA95FDDD0A86801D39E55BF3BC868" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="5BE73ECB-4F28-4320-9ED6-1ECC2536E547">
|
||||
<File Id="fil6AC228365277B587545F74B1089D5476" KeyPath="yes" Source="$(var.SourceDir)\bin\libgpgme-11.dll"/>
|
||||
</Component>
|
||||
<Component Id="cmp9304510805DD3179141F4262F000041B" Directory="dirAA72FFDDFA224FB221D53750596B0142" Guid="A824D70D-80C0-45E6-8FE8-A3B316384173">
|
||||
<File Id="filC065951849A7371A734CB3174EF3FE0E" KeyPath="yes" Source="$(var.SourceDir)\bin\libksba-8.dll"/>
|
||||
</Component>
|
||||
@ -139,9 +133,6 @@ and then manually edited:
|
||||
<Component Id="cmp60C98038298D866C96CD9E8B567D506E" Directory="dir39F5678CDEA54A3E48058808B3D68E81" Guid="E9EAFCE0-373A-4F8F-8804-9A478A8B3F46">
|
||||
<File Id="fil0CA9A6FD42409FBE4DE71D8307617803" KeyPath="yes" Source="$(var.SourceDir)\include\gpg-error.h"/>
|
||||
</Component>
|
||||
<Component Id="cmp6DFA25F5C06C7D4378B57B4972B9ABF9" Directory="dir39F5678CDEA54A3E48058808B3D68E81" Guid="3A0D85D2-F3FA-46FC-84A3-DB5EC1E5EFFE">
|
||||
<File Id="fil12216064300F3BD74F304FB7BBF82DF8" KeyPath="yes" Source="$(var.SourceDir)\include\gpgme.h"/>
|
||||
</Component>
|
||||
<Component Id="cmp24395F851942E67A35947276D2E7898E" Directory="dir39F5678CDEA54A3E48058808B3D68E81" Guid="3B75734A-329A-4ECA-BD49-6118D2AC1192">
|
||||
<File Id="filA775AF0DD0F9ED50A0D55FF9CDE33975" KeyPath="yes" Source="$(var.SourceDir)\include\ksba.h"/>
|
||||
</Component>
|
||||
@ -157,9 +148,6 @@ and then manually edited:
|
||||
<Component Id="cmpF41B20B2A8CAD3CBA8917622CABACA0D" Directory="dir6694D0A4AAD84EF827096DD86D1B4FA2" Guid="591391E9-D3DD-45F2-A038-14D1B8542778">
|
||||
<File Id="filA6EB6699DCA86B1FBE961D53E2E24440" KeyPath="yes" Source="$(var.SourceDir)\lib\libgpg-error.dll.a" Name="libgpg-error.imp"/>
|
||||
</Component>
|
||||
<Component Id="cmp51A12EB5E7192912DCC1637F9417A39E" Directory="dir6694D0A4AAD84EF827096DD86D1B4FA2" Guid="E15FE761-BF44-4130-B354-EBE8F6A0F5D8">
|
||||
<File Id="fil710653D37212C7F55D9AF2FCF7189BA7" KeyPath="yes" Source="$(var.SourceDir)\lib\libgpgme.dll.a" Name="libgpgme.imp"/>
|
||||
</Component>
|
||||
<Component Id="cmp30558FA612DCFC9CE144A01F3B4BC87A" Directory="dir6694D0A4AAD84EF827096DD86D1B4FA2" Guid="CBC1DADD-384C-4C28-B535-DCADD5C5D958">
|
||||
<File Id="fil972A246C4D46A8ECD31DD7C6CC4D5B58" KeyPath="yes" Source="$(var.SourceDir)\lib\libksba.dll.a" Name="libksba.imp"/>
|
||||
</Component>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user