diff --git a/AUTHORS b/AUTHORS index 14b434f1d..6980407e5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,9 +15,9 @@ copyrightable year that would otherwise be listed individually. List of Copyright holders ========================= - Copyright (C) 1997-2018 Werner Koch - Copyright (C) 1994-2018 Free Software Foundation, Inc. - Copyright (C) 2003-2013,2015-2018 g10 Code GmbH + Copyright (C) 1997-2019 Werner Koch + Copyright (C) 1994-2021 Free Software Foundation, Inc. + Copyright (C) 2003-2021 g10 Code GmbH Copyright (C) 2002 Klarälvdalens Datakonsult AB Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper Copyright (C) 1994 X Consortium diff --git a/README b/README index 56695e793..d98edf104 100644 --- a/README +++ b/README @@ -2,8 +2,9 @@ ========================= Version 2.3 (devel) - Copyright 1997-2018 Werner Koch - Copyright 1998-2018 Free Software Foundation, Inc. + Copyright 1997-2019 Werner Koch + Copyright 1998-2021 Free Software Foundation, Inc. + Copyright 2003-2021 g10 Code GmbH * INTRODUCTION diff --git a/common/w32info-rc.h.in b/common/w32info-rc.h.in index 2ff686321..94f13b054 100644 --- a/common/w32info-rc.h.in +++ b/common/w32info-rc.h.in @@ -17,7 +17,7 @@ you can redistribute it and/or modify it under the terms of the \ GNU General Public License as published by the Free Software Foundation; \ either version 3 of the License, or (at your option) any later version.\0" -#define W32INFO_COMPANYNAME "The GnuPG Project\0" +#define W32INFO_COMPANYNAME "g10 Code GmbH\0" #define W32INFO_VI_FILEVERSION @BUILD_FILEVERSION@ #define W32INFO_VI_PRODUCTVERSION @BUILD_FILEVERSION@ @@ -29,4 +29,4 @@ built on @BUILD_HOSTNAME@ at @BUILD_TIMESTAMP@\0" #define W32INFO_PRODUCTVERSION "@VERSION@\0" #define W32INFO_LEGALCOPYRIGHT "Copyright \xa9 \ -2018 Free Software Foundation, Inc.\0" +2021 g10 Code GmbH\0" diff --git a/configure.ac b/configure.ac index b2474e794..3a0bba571 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ # configure.ac - for GnuPG 2.1 -# Copyright (C) 1998-2018 Free Software Foundation, Inc. -# Copyright (C) 1998-2018 Werner Koch +# Copyright (C) 1998-2019 Werner Koch +# Copyright (C) 1998-2021 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 g10 Code GmbH # # This file is part of GnuPG. # @@ -512,8 +513,21 @@ AH_BOTTOM([ #define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d" #define GNUPG_CACHE_DIR "cache.d" +/* GnuPG has always been a part of the GNU project and thus we have + * shown the FSF as holder of the copyright. We continue to do so for + * the reason that without the FSF the free software used all over the + * world would not have come into existence. However, under Windows + * we print a different copyright string with --version because the + * copyright assignments of g10 Code and Werner Koch were terminated + * many years ago, g10 Code is still the major contributor to the + * code, and Windows is not an FSF endorsed platform. Note that the + * actual list of copyright holders can be found in the AUTHORS file. */ +#ifdef HAVE_W32_SYSTEM +#define GNUPG_DEF_COPYRIGHT_LINE "Copyright (C) 2021 g10 Code GmbH" +#else #define GNUPG_DEF_COPYRIGHT_LINE \ - "Copyright (C) 2020 Free Software Foundation, Inc." + "Copyright (C) 2021 Free Software Foundation, Inc." +#endif /* For some systems (DOS currently), we hardcode the path here. For POSIX systems the values are constructed by the Makefiles, so that @@ -2038,6 +2052,12 @@ tests/gpgsm/Makefile tests/gpgme/Makefile tests/pkits/Makefile g10/gpg.w32-manifest +tools/gpg-connect-agent.w32-manifest +tools/gpgconf.w32-manifest +tools/gpgtar.w32-manifest +tools/gpg-check-pattern.w32-manifest +tools/gpg-wks-client.w32-manifest +tools/gpg-card.w32-manifest ]) diff --git a/tools/Makefile.am b/tools/Makefile.am index 6ca596c7e..4c29f84ed 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,16 +21,29 @@ EXTRA_DIST = \ addgnupghome applygnupgdefaults \ lspgpot mail-signed-keys convert-from-106 sockprox.c \ ccidmon.c ChangeLog-2011 \ - gpg-connect-agent-w32info.rc \ - gpg-card-w32info.rc + gpg-connect-agent-w32info.rc gpg-connect-agent.w32-manifest.in \ + gpgconf-w32info.rc gpgconf.w32-manifest.in \ + gpgtar-w32info.rc gpgtar.w32-manifest.in \ + gpg-check-pattern-w32info.rc gpg-check-pattern.w32-manifest.in \ + gpg-wks-client-w32info.rc gpg-wks-client.w32-manifest.in \ + gpg-card-w32info.rc gpg-card.w32-manifest.in AM_CPPFLAGS = include $(top_srcdir)/am/cmacros.am if HAVE_W32_SYSTEM gpg_connect_agent_rc_objs = gpg-connect-agent-w32info.o -gpg_card_tool_rc_objs = gpg-card-w32info.o -resource_objs += $(gpg_connect_agent_rc_objs) $(gpg_card_tool_rc_objs) +gpgconf_rc_objs = gpgconf-w32info.o +gpg_card_rc_objs = gpg-card-w32info.o +gpgtar_rc_objs = gpgtar-w32info.o +gpg_check_pattern_rc_objs = gpg-check-pattern-w32info.o +gpg_wks_client_rc_objs = gpg-wks-client-w32info.o +resource_objs += $(gpg_connect_agent_rc_objs) +resource_objs += $(gpgconf_rc_objs) +resource_objs += $(gpg_card_tool_rc_objs) +resource_objs += $(gpgtar_rc_objs) +resource_objs += $(gpg_check_pattern_rc_objs) +resource_objs += $(gpg_wks_client_rc_objs) endif AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS) @@ -98,7 +111,8 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c # do not eliminate the supposed-to-be-unused-inline-functions). gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \ $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ - $(LIBICONV) $(W32SOCKLIBS) + $(LIBICONV) $(W32SOCKLIBS) \ + $(gpgconf_rc_objs) gpgconf_LDFLAGS = $(extra_bin_ldflags) gpgconf_w32_SOURCES = $(gpgconf_SOURCES) @@ -132,7 +146,7 @@ gpg_card_LDADD = \ $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \ $(GPG_ERROR_LIBS) \ $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ - $(gpg_card_tool_rc_objs) + $(gpg_card_rc_objs) gpg_check_pattern_SOURCES = gpg-check-pattern.c @@ -140,7 +154,8 @@ gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) gpg_check_pattern_LDADD = $(common_libs) $(regexp_libs) $(LIBGCRYPT_LIBS) \ $(GPG_ERROR_LIBS) \ $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \ - $(LIBICONV) + $(LIBICONV) \ + $(gpg_check_pattern_rc_objs) gpgtar_SOURCES = \ gpgtar.c gpgtar.h \ @@ -149,7 +164,8 @@ gpgtar_SOURCES = \ gpgtar-list.c gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) gpgtar_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) + $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \ + $(gpgtar_rc_objs) gpg_wks_server_SOURCES = \ gpg-wks-server.c \ @@ -179,7 +195,8 @@ gpg_wks_client_SOURCES = \ gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) gpg_wks_client_LDADD = $(libcommon) \ $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBINTL) $(LIBICONV) $(NETLIBS) + $(LIBINTL) $(LIBICONV) $(NETLIBS) \ + $(gpg_wks_client_rc_objs) gpg_pair_tool_SOURCES = \ gpg-pair-tool.c diff --git a/tools/gpg-card-w32info.rc b/tools/gpg-card-w32info.rc index b35ff4ce2..e333dfb9a 100644 --- a/tools/gpg-card-w32info.rc +++ b/tools/gpg-card-w32info.rc @@ -49,3 +49,5 @@ to the agent\0" VALUE "Translation", 0x409, 0x4b0 END END + +1 RT_MANIFEST "gpg-card.w32-manifest" diff --git a/tools/gpg-card.w32-manifest.in b/tools/gpg-card.w32-manifest.in new file mode 100644 index 000000000..ab853f810 --- /dev/null +++ b/tools/gpg-card.w32-manifest.in @@ -0,0 +1,18 @@ + + +GNU Privacy Guard (Card tool) + + + + + + + + + + + diff --git a/tools/gpg-check-pattern-w32info.rc b/tools/gpg-check-pattern-w32info.rc new file mode 100644 index 000000000..ed503012a --- /dev/null +++ b/tools/gpg-check-pattern-w32info.rc @@ -0,0 +1,52 @@ +/* gpg-check-pattern-w32info.rc -*- c -*- + * Copyright (C) 2020 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 pattern checker\0" + VALUE "InternalName", "gpg-check-pattern\0" + VALUE "OriginalFilename", "gpg-check-pattern.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 "gpg-check-pattern.w32-manifest" diff --git a/tools/gpg-check-pattern.w32-manifest.in b/tools/gpg-check-pattern.w32-manifest.in new file mode 100644 index 000000000..2a5f8ec72 --- /dev/null +++ b/tools/gpg-check-pattern.w32-manifest.in @@ -0,0 +1,18 @@ + + +GNU Privacy Guard (Pattern checker) + + + + + + + + + + + diff --git a/tools/gpg-connect-agent-w32info.rc b/tools/gpg-connect-agent-w32info.rc index 8c6735918..06612f8d2 100644 --- a/tools/gpg-connect-agent-w32info.rc +++ b/tools/gpg-connect-agent-w32info.rc @@ -32,8 +32,7 @@ BEGIN BLOCK "040904b0" /* US English (0409), Unicode (04b0) */ BEGIN - VALUE "FileDescription", L"GnuPG\x2019s command line access \ -to the agent\0" + VALUE "FileDescription", L"GnuPG\x2019s IPC tool\0" VALUE "InternalName", "gpg-connect-agent\0" VALUE "OriginalFilename", "gpg-connect-agent.exe\0" VALUE "ProductName", W32INFO_PRODUCTNAME @@ -49,3 +48,5 @@ to the agent\0" VALUE "Translation", 0x409, 0x4b0 END END + +1 RT_MANIFEST "gpg-connect-agent.w32-manifest" diff --git a/tools/gpg-connect-agent.w32-manifest.in b/tools/gpg-connect-agent.w32-manifest.in new file mode 100644 index 000000000..aba542052 --- /dev/null +++ b/tools/gpg-connect-agent.w32-manifest.in @@ -0,0 +1,18 @@ + + +GNU Privacy Guard (IPC tool) + + + + + + + + + + + diff --git a/tools/gpg-wks-client-w32info.rc b/tools/gpg-wks-client-w32info.rc new file mode 100644 index 000000000..60021a739 --- /dev/null +++ b/tools/gpg-wks-client-w32info.rc @@ -0,0 +1,52 @@ +/* gpg-wks-client-w32info.rc -*- c -*- + * Copyright (C) 2020 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 Web Key Service client\0" + VALUE "InternalName", "gpg-wks-client\0" + VALUE "OriginalFilename", "gpg-wks-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 "gpg-wks-client.w32-manifest" diff --git a/tools/gpg-wks-client.w32-manifest.in b/tools/gpg-wks-client.w32-manifest.in new file mode 100644 index 000000000..ba2508e5f --- /dev/null +++ b/tools/gpg-wks-client.w32-manifest.in @@ -0,0 +1,18 @@ + + +GNU Privacy Guard (Web Key Service client) + + + + + + + + + + + diff --git a/tools/gpgconf-w32info.rc b/tools/gpgconf-w32info.rc new file mode 100644 index 000000000..cd8df2945 --- /dev/null +++ b/tools/gpgconf-w32info.rc @@ -0,0 +1,52 @@ +/* gpgconf-w32info.rc -*- c -*- + * Copyright (C) 2020 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 config tool\0" + VALUE "InternalName", "gpgconf\0" + VALUE "OriginalFilename", "gpgconf.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 "gpgconf.w32-manifest" diff --git a/tools/gpgconf.w32-manifest.in b/tools/gpgconf.w32-manifest.in new file mode 100644 index 000000000..d7a1b01ec --- /dev/null +++ b/tools/gpgconf.w32-manifest.in @@ -0,0 +1,18 @@ + + +GNU Privacy Guard (Config tool) + + + + + + + + + + + diff --git a/tools/gpgtar-w32info.rc b/tools/gpgtar-w32info.rc new file mode 100644 index 000000000..211528bb2 --- /dev/null +++ b/tools/gpgtar-w32info.rc @@ -0,0 +1,52 @@ +/* gpgtar-w32info.rc -*- c -*- + * Copyright (C) 2020 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 archive tool\0" + VALUE "InternalName", "gpgtar\0" + VALUE "OriginalFilename", "gpgtar.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 "gpgtar.w32-manifest" diff --git a/tools/gpgtar.w32-manifest.in b/tools/gpgtar.w32-manifest.in new file mode 100644 index 000000000..62d5937fa --- /dev/null +++ b/tools/gpgtar.w32-manifest.in @@ -0,0 +1,18 @@ + + +GNU Privacy Guard (Archive tool) + + + + + + + + + + +