summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2023-10-07 19:46:00 +0200
committerJay Berkenbilt <ejb@ql.org>2023-10-07 19:46:45 +0200
commitf9cf79706d723c1bed6f8e8c8edfdfcfb5b99657 (patch)
tree1b90cf53d4740e3c1e2c12d23557f45865112218
parente5cdeff4bc704cd29f499f46d9bf0e5b0bf9c11c (diff)
downloadqpdf-f9cf79706d723c1bed6f8e8c8edfdfcfb5b99657.tar.zst
Bump version to 11.6.2 and update release notes
-rw-r--r--CMakeLists.txt2
-rw-r--r--include/qpdf/DLL.h4
-rw-r--r--manual/conf.py2
-rw-r--r--manual/release-notes.rst15
4 files changed, 19 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abf17a0b..561c0e26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.16)
# the project line. When updating the version, check make_dist for all
# the places it has to be updated.
project(qpdf
- VERSION 11.6.1
+ VERSION 11.6.2
LANGUAGES C CXX)
# Enable correct rpath handling for MacOSX
diff --git a/include/qpdf/DLL.h b/include/qpdf/DLL.h
index 794363a7..3c27949e 100644
--- a/include/qpdf/DLL.h
+++ b/include/qpdf/DLL.h
@@ -26,8 +26,8 @@
/* The first version of qpdf to include the version constants is 10.6.0. */
#define QPDF_MAJOR_VERSION 11
#define QPDF_MINOR_VERSION 6
-#define QPDF_PATCH_VERSION 1
-#define QPDF_VERSION "11.6.1"
+#define QPDF_PATCH_VERSION 2
+#define QPDF_VERSION "11.6.2"
/*
* This file defines symbols that control the which functions,
diff --git a/manual/conf.py b/manual/conf.py
index ed9287d0..d6dd1f3f 100644
--- a/manual/conf.py
+++ b/manual/conf.py
@@ -16,7 +16,7 @@ project = 'QPDF'
copyright = '2005-2023, Jay Berkenbilt'
author = 'Jay Berkenbilt'
# make_dist and the CI build lexically find the release version from this file.
-release = '11.6.1'
+release = '11.6.2'
version = release
extensions = [
'sphinx_rtd_theme',
diff --git a/manual/release-notes.rst b/manual/release-notes.rst
index c07472e4..679e7f9c 100644
--- a/manual/release-notes.rst
+++ b/manual/release-notes.rst
@@ -35,6 +35,21 @@ Planned changes for future 12.x (subject to change):
.. x.y.z: not yet released
+11.6.2: not yet released
+ - Bug fixes:
+
+ - Fix a very old bug that could cause qpdf to call an internal
+ ``finish`` function twice on certain stream decoding errors.
+ With certain incorrect input files, this could cause qpdf to
+ call gnutls or openssl 1 in a way that could cause them to
+ crash.
+
+ - Development changes:
+
+ - Control some ``.idea`` files for JetBrains CLion. We will be
+ iterating on making it easier to work with qpdf in CLion in
+ coming releases.
+
11.6.1: September 5, 2023
- Bug fixes: