mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
w32: Add missing manifests and set a requestedExecutionLevel.
* agent/gpg-agent.w32-manifest.in: New. * dirmngr/dirmngr-client-w32info.rc: New. * dirmngr/dirmngr-client.w32-manifest.in: New. * dirmngr/dirmngr-w32info.rc: New. * dirmngr/dirmngr.w32-manifest.in: New. * dirmngr/dirmngr_ldap-w32info.rc: New. * dirmngr/dirmngr_ldap.w32-manifest.in: New. * g10/gpgv-w32info.rc: New. * g10/gpgv.w32-manifest.in: New. * kbx/keyboxd.w32-manifest.in: New. * scd/scdaemon.w32-manifest.in: New. * sm/gpgsm.w32-manifest.in: New. -- This avoids the use of the VirtualStore uner Windows. GnuPG-bug-id: 6503
This commit is contained in:
Werner Koch
parent
48b5648554
commit
3fbe10172f
31 changed files with 534 additions and 22 deletions
|
|
@ -21,7 +21,14 @@
|
|||
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem
|
||||
EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem \
|
||||
dirmngr-w32info.rc dirmngr.w32-manifest.in \
|
||||
dirmngr_ldap-w32info.rc dirmngr_ldap.w32-manifest.in \
|
||||
dirmngr-client-w32info.rc dirmngr-client.w32-manifest.in
|
||||
|
||||
|
||||
|
||||
|
||||
dist_pkgdata_DATA = sks-keyservers.netCA.pem
|
||||
|
||||
bin_PROGRAMS = dirmngr dirmngr-client
|
||||
|
|
@ -43,6 +50,16 @@ AM_CPPFLAGS =
|
|||
|
||||
include $(top_srcdir)/am/cmacros.am
|
||||
|
||||
if HAVE_W32_SYSTEM
|
||||
dirmngr_rc_objs = dirmngr-w32info.o
|
||||
dirmngr_ldap_rc_objs = dirmngr_ldap-w32info.o
|
||||
dirmngr_client_rc_objs = dirmngr-client-w32info.o
|
||||
|
||||
dirmngr-w32info.o : dirmngr.w32-manifest ../common/w32info-rc.h
|
||||
dirmngr_ldap-w32info.o : dirmngr_ldap.w32-manifest ../common/w32info-rc.h
|
||||
dirmngr-client-w32info.o : dirmngr-client.w32-manifest ../common/w32info-rc.h
|
||||
endif
|
||||
|
||||
AM_CFLAGS = $(USE_C99_CFLAGS) \
|
||||
$(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) \
|
||||
$(GPG_ERROR_CFLAGS) $(NPTH_CFLAGS) $(NTBTLS_CFLAGS) \
|
||||
|
|
@ -89,12 +106,13 @@ dirmngr_LDADD = $(libcommonpth) \
|
|||
$(DNSLIBS) $(LIBASSUAN_LIBS) \
|
||||
$(KSBA_LIBS) $(NPTH_LIBS) $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \
|
||||
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
|
||||
$(NETLIBS)
|
||||
$(NETLIBS) $(dirmngr_rc_objs)
|
||||
|
||||
if USE_LDAP
|
||||
dirmngr_LDADD += $(ldaplibs) $(LBER_LIBS)
|
||||
endif
|
||||
dirmngr_LDFLAGS =
|
||||
dirmngr_DEPENDENCIES = $(dirmngr_rc_objs)
|
||||
|
||||
if USE_LDAP
|
||||
dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
|
||||
|
|
@ -102,14 +120,18 @@ dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
|
|||
dirmngr_ldap_LDFLAGS =
|
||||
dirmngr_ldap_LDADD = $(libcommon) \
|
||||
$(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
|
||||
$(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
|
||||
$(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
|
||||
$(dirmngr_ldap_rc_objs)
|
||||
dirmngr_ldap_DEPENDENCIES = $(dirmngr_ldap_rc_objs)
|
||||
endif
|
||||
|
||||
dirmngr_client_SOURCES = dirmngr-client.c
|
||||
dirmngr_client_LDADD = $(libcommon) \
|
||||
$(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
|
||||
$(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV)
|
||||
$(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV) \
|
||||
$(dirmngr_client_rc_objs)
|
||||
dirmngr_client_LDFLAGS =
|
||||
dirmngr_client_DEPENDENCIES = $(dirmngr_client_rc_objs)
|
||||
|
||||
|
||||
t_common_src = t-support.h t-support.c
|
||||
|
|
|
|||
52
dirmngr/dirmngr-client-w32info.rc
Normal file
52
dirmngr/dirmngr-client-w32info.rc
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
/* dirmngr-client-w32info.rc -*- c -*-
|
||||
* Copyright (C) 2023 g10 Code GmbH
|
||||
*
|
||||
* This file is free software; as a special exception the author gives
|
||||
* unlimited permission to copy and/or distribute it, with or without
|
||||
* modifications, as long as this notice is preserved.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
#include "afxres.h"
|
||||
#include "../common/w32info-rc.h"
|
||||
|
||||
1 ICON "../common/gnupg.ico"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION W32INFO_VI_FILEVERSION
|
||||
PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x01L /* VS_FF_DEBUG (0x1)*/
|
||||
#else
|
||||
FILEFLAGS 0x00L
|
||||
#endif
|
||||
FILEOS 0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4) */
|
||||
FILETYPE 0x1L /* VFT_APP (0x1) */
|
||||
FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
|
||||
BEGIN
|
||||
VALUE "FileDescription", L"GnuPG\x2019s dirmngr client\0"
|
||||
VALUE "InternalName", "dirmngr-client\0"
|
||||
VALUE "OriginalFilename", "dirmngr-client.exe\0"
|
||||
VALUE "ProductName", W32INFO_PRODUCTNAME
|
||||
VALUE "ProductVersion", W32INFO_PRODUCTVERSION
|
||||
VALUE "CompanyName", W32INFO_COMPANYNAME
|
||||
VALUE "FileVersion", W32INFO_FILEVERSION
|
||||
VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
|
||||
VALUE "Comments", W32INFO_COMMENTS
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 0x4b0
|
||||
END
|
||||
END
|
||||
|
||||
1 RT_MANIFEST "dirmngr-client.w32-manifest"
|
||||
25
dirmngr/dirmngr-client.w32-manifest.in
Normal file
25
dirmngr/dirmngr-client.w32-manifest.in
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<description>GNU Privacy Guard (Dirmngr Client)</description>
|
||||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="GnuPG.dirmngr.client"
|
||||
version="@BUILD_VERSION@"
|
||||
/>
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
|
||||
</application>
|
||||
</compatibility>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level="asInvoker"/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
</assembly>
|
||||
52
dirmngr/dirmngr-w32info.rc
Normal file
52
dirmngr/dirmngr-w32info.rc
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
/* dirmngr-w32info.rc -*- c -*-
|
||||
* Copyright (C) 2023 g10 Code GmbH
|
||||
*
|
||||
* This file is free software; as a special exception the author gives
|
||||
* unlimited permission to copy and/or distribute it, with or without
|
||||
* modifications, as long as this notice is preserved.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
#include "afxres.h"
|
||||
#include "../common/w32info-rc.h"
|
||||
|
||||
1 ICON "../common/gnupg.ico"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION W32INFO_VI_FILEVERSION
|
||||
PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x01L /* VS_FF_DEBUG (0x1)*/
|
||||
#else
|
||||
FILEFLAGS 0x00L
|
||||
#endif
|
||||
FILEOS 0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4) */
|
||||
FILETYPE 0x1L /* VFT_APP (0x1) */
|
||||
FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
|
||||
BEGIN
|
||||
VALUE "FileDescription", L"GnuPG\x2019s network access daemon\0"
|
||||
VALUE "InternalName", "dirmngr\0"
|
||||
VALUE "OriginalFilename", "dirmngr.exe\0"
|
||||
VALUE "ProductName", W32INFO_PRODUCTNAME
|
||||
VALUE "ProductVersion", W32INFO_PRODUCTVERSION
|
||||
VALUE "CompanyName", W32INFO_COMPANYNAME
|
||||
VALUE "FileVersion", W32INFO_FILEVERSION
|
||||
VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
|
||||
VALUE "Comments", W32INFO_COMMENTS
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 0x4b0
|
||||
END
|
||||
END
|
||||
|
||||
1 RT_MANIFEST "dirmngr.w32-manifest"
|
||||
25
dirmngr/dirmngr.w32-manifest.in
Normal file
25
dirmngr/dirmngr.w32-manifest.in
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<description>GNU Privacy Guard (Archive tool)</description>
|
||||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="GnuPG.dirmngr"
|
||||
version="@BUILD_VERSION@"
|
||||
/>
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
|
||||
</application>
|
||||
</compatibility>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level="asInvoker"/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
</assembly>
|
||||
52
dirmngr/dirmngr_ldap-w32info.rc
Normal file
52
dirmngr/dirmngr_ldap-w32info.rc
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
/* dirmngr_ldap-w32info.rc -*- c -*-
|
||||
* Copyright (C) 2023 g10 Code GmbH
|
||||
*
|
||||
* This file is free software; as a special exception the author gives
|
||||
* unlimited permission to copy and/or distribute it, with or without
|
||||
* modifications, as long as this notice is preserved.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
*/
|
||||
|
||||
#include "afxres.h"
|
||||
#include "../common/w32info-rc.h"
|
||||
|
||||
1 ICON "../common/gnupg.ico"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION W32INFO_VI_FILEVERSION
|
||||
PRODUCTVERSION W32INFO_VI_PRODUCTVERSION
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x01L /* VS_FF_DEBUG (0x1)*/
|
||||
#else
|
||||
FILEFLAGS 0x00L
|
||||
#endif
|
||||
FILEOS 0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4) */
|
||||
FILETYPE 0x1L /* VFT_APP (0x1) */
|
||||
FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
|
||||
BEGIN
|
||||
VALUE "FileDescription", L"GnuPG\x2019s LDAP helper\0"
|
||||
VALUE "InternalName", "dirmngr_ldap\0"
|
||||
VALUE "OriginalFilename", "dirmngr_ldap.exe\0"
|
||||
VALUE "ProductName", W32INFO_PRODUCTNAME
|
||||
VALUE "ProductVersion", W32INFO_PRODUCTVERSION
|
||||
VALUE "CompanyName", W32INFO_COMPANYNAME
|
||||
VALUE "FileVersion", W32INFO_FILEVERSION
|
||||
VALUE "LegalCopyright", W32INFO_LEGALCOPYRIGHT
|
||||
VALUE "Comments", W32INFO_COMMENTS
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 0x4b0
|
||||
END
|
||||
END
|
||||
|
||||
1 RT_MANIFEST "dirmngr_ldap.w32-manifest"
|
||||
25
dirmngr/dirmngr_ldap.w32-manifest.in
Normal file
25
dirmngr/dirmngr_ldap.w32-manifest.in
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<description>GNU Privacy Guard (LDAP Helper)</description>
|
||||
<assemblyIdentity
|
||||
type="win32"
|
||||
name="GnuPG.dirmngr.ldap"
|
||||
version="@BUILD_VERSION@"
|
||||
/>
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/><!-- 10 -->
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/><!-- 8.1 -->
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/><!-- 8 -->
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/><!-- 7 -->
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/><!-- Vista -->
|
||||
</application>
|
||||
</compatibility>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level="asInvoker"/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
</assembly>
|
||||
Loading…
Add table
Add a link
Reference in a new issue