From f96c63cf3d7993077e916ac261ffb237137333e5 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 25 Apr 2010 15:05:11 +0000
Subject: [PATCH] 2.1.5

---
 ChangeLog              |  8 ++++++++
 configure.ac           |  2 +-
 libqpdf/QPDF.cc        |  2 +-
 libqpdf/build.mk       |  2 +-
 manual/qpdf-manual.xml | 20 ++++++++++++++++++--
 qpdf.spec              |  2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 66d9541..b17540a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-25  Jay Berkenbilt  <ejb@ql.org>
+
+	* 2.1.5: release
+
+	* libqpdf/QPDF_encryption.cc (compute_encryption_key): remove
+	restrictions on length of file identifier string.  (Fixes
+	qpdf-Bugs-2991412.)
+
 2010-04-18  Jay Berkenbilt  <ejb@ql.org>
 
 	* 2.1.4: release
diff --git a/configure.ac b/configure.ac
index 395b162..04c09e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl This config.in requires autoconf 2.5 or greater.
 
 AC_PREREQ(2.60)
-AC_INIT(qpdf,2.1.4)
+AC_INIT(qpdf,2.1.5)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 8371b38..67d0b58 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -15,7 +15,7 @@
 #include <qpdf/QPDF_Null.hh>
 #include <qpdf/QPDF_Dictionary.hh>
 
-std::string QPDF::qpdf_version = "2.1.4";
+std::string QPDF::qpdf_version = "2.1.5";
 
 void
 QPDF::InputSource::setLastOffset(off_t offset)
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index b2922a3..ac411d8 100644
--- a/libqpdf/build.mk
+++ b/libqpdf/build.mk
@@ -72,4 +72,4 @@ $(OBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.cc
 # * Otherwise, increment REVISION
 
 $(TARGETS_libqpdf): $(OBJS_libqpdf)
-	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),3,3,0)
+	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),3,4,0)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index 3c2ae1a..9611df0 100644
--- a/manual/qpdf-manual.xml
+++ b/manual/qpdf-manual.xml
@@ -5,8 +5,8 @@
 <!ENTITY mdash "&#x2014;">
 <!ENTITY ndash "&#x2013;">
 <!ENTITY nbsp "&#xA0;">
-<!ENTITY swversion "2.1.4">
-<!ENTITY lastreleased "April 18, 2010">
+<!ENTITY swversion "2.1.5">
+<!ENTITY lastreleased "April 25, 2010">
 ]>
 <book>
  <bookinfo>
@@ -2072,6 +2072,22 @@ print "\n";
   </para>
   <variablelist>
    <varlistentry>
+    <term>2.1.5: April 25, 2010</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        Remove restriction of file identifier strings to 16 bytes.
+        This unnecessary restriction was preventing qpdf from being
+        able to encrypt or decrypt files with identifier strings that
+        were not exactly 16 bytes long.  The specification imposes no
+        such restriction.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
     <term>2.1.4: April 18, 2010</term>
     <listitem>
      <itemizedlist>
diff --git a/qpdf.spec b/qpdf.spec
index 3296993..cfeb4a1 100644
--- a/qpdf.spec
+++ b/qpdf.spec
@@ -1,6 +1,6 @@
 Summary: Command-line tools and library for transforming PDF files
 Name: qpdf
-Version: 2.1.4
+Version: 2.1.5
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries
--
libgit2 0.21.4