summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS12
-rw-r--r--README32
-rw-r--r--configure.ac4
-rw-r--r--src/gpgme.h.in2
-rw-r--r--src/versioninfo.rc.in2
5 files changed, 23 insertions, 29 deletions
diff --git a/NEWS b/NEWS
index cbb09bf2..5d7116ca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,16 @@
-Noteworthy changes in version 2.1.1 (unreleased) [C46/A1/R_]
+Noteworthy changes in version 2.1.1 (2026-06-25) [C46/A1/R1]
------------------------------------------------
+ * gpgme_op_export now also returns operational errors. [T8287]
+
+ * w32: Improve debug output in spawn and selection functions.
+ [rMf5ad431a1c]
+
+ * w32: Improve serialization between reader and writer threads.
+ [T8264]
+
+ * w32: Add CRLF handling for armored output in gpgme-json. [T8263]
+
Release-info: https://dev.gnupg.org/T8269
diff --git a/README b/README
index de6d49e6..c8002e7c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
GPGME - GnuPG Made Easy
---------------------------
-Copyright 2001-2025 g10 Code GmbH
+Copyright 2001-2026 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
@@ -65,30 +65,14 @@ a) If you have a trusted Version of GnuPG installed, you can simply check
$ gpg --verify gpgme-x.y.z.tar.gz.sig gpgme-x.y.z.tar.gz
This checks that the detached signature gpgme-x.y.z.tar.gz.sig is
- indeed a a signature of gpgme-x.y.z.tar.gz. The key used to create
- this signature is at least one of:
+ indeed a a signature of gpgme-x.y.z.tar.gz.
- rsa2048 2011-01-12 [expires: 2019-12-31]
- Key fingerprint = D869 2123 C406 5DEA 5E0F 3AB5 249B 39D2 4F25 E3B6
- Werner Koch (dist sig)
-
- rsa2048 2014-10-29 [expires: 2019-12-31]
- Key fingerprint = 46CC 7308 65BB 5C78 EBAB ADCF 0437 6F3E E085 6959
- David Shaw (GnuPG Release Signing Key) <dshaw 'at' jabberwocky.com>
-
- rsa2048 2014-10-29 [expires: 2020-10-30]
- Key fingerprint = 031E C253 6E58 0D8E A286 A9F2 2071 B08A 33BD 3F06
- NIIBE Yutaka (GnuPG Release Key) <gniibe 'at' fsij.org>
-
- rsa3072 2017-03-17 [expires: 2027-03-15]
- Key fingerprint = 5B80 C575 4298 F0CB 55D8 ED6A BCEF 7E29 4B09 2E28
- Andre Heinecke (Release Signing Key)
-
- The keys are available at <https://gnupg.org/signature_key.html>
- and in released GnuPG tarballs in the file g10/distsigkey.gpg .
- You have to make sure that these are really the desired keys and
- not faked one. You should do this by comparing the fingerprints
- with the fingerprints published elsewhere.
+ The keys used to create a signature are available at
+ <https://gnupg.org/signature_key.html> and in released GnuPG
+ tarballs in the file g10/distsigkey.gpg . You have to make sure
+ that these are really the desired keys and not faked one. You
+ should do this by comparing the fingerprints with the fingerprints
+ published for example with all GnuPG related release announcements.
b) If you don't have any of the above programs, you have to verify
the SHA1 checksum:
diff --git a/configure.ac b/configure.ac
index 4ea1f414..ddc73c5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org])
#
LIBGPGME_LT_CURRENT=46
LIBGPGME_LT_AGE=1
-LIBGPGME_LT_REVISION=0
+LIBGPGME_LT_REVISION=1
################################################
AC_SUBST(LIBGPGME_LT_CURRENT)
@@ -729,7 +729,7 @@ AH_BOTTOM([
#define GPG_ERR_ENABLE_GETTEXT_MACROS 1
#define CRIGHTBLURB "Copyright (C) 2000 Werner Koch\n" \
- "Copyright (C) 2001--2025 g10 Code GmbH\n"
+ "Copyright (C) 2001--2026 g10 Code GmbH\n"
])
diff --git a/src/gpgme.h.in b/src/gpgme.h.in
index bfc9f490..a42453a6 100644
--- a/src/gpgme.h.in
+++ b/src/gpgme.h.in
@@ -1,6 +1,6 @@
/* gpgme.h - Public interface to GnuPG Made Easy. -*- c -*-
* Copyright (C) 2000 Werner Koch (dd9jn)
- * Copyright (C) 2001-2025 g10 Code GmbH
+ * Copyright (C) 2001-2026 g10 Code GmbH
*
* This file is part of GPGME.
*
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index 4d3091d6..586956fe 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -39,7 +39,7 @@ BEGIN
VALUE "FileDescription", "GPGME - GnuPG Made Easy\0"
VALUE "FileVersion", "@LIBGPGME_LT_CURRENT@.@LIBGPGME_LT_AGE@.@LIBGPGME_LT_REVISION@.@BUILD_REVISION@\0"
VALUE "InternalName", "gpgme\0"
- VALUE "LegalCopyright", "Copyright � 2001-2025 g10 Code GmbH\0"
+ VALUE "LegalCopyright", "Copyright � 2001-2026 g10 Code GmbH\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "gpgme.dll\0"
VALUE "PrivateBuild", "\0"