From 8708fd373dd6ec35f718be2f958a5887bd053128 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 17 Jan 2013 09:51:04 -0500
Subject: [PATCH] Prepare 4.0.1 release

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

diff --git a/ChangeLog b/ChangeLog
index 71369f9c..fd078f98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-01-17  Jay Berkenbilt  <ejb@ql.org>
+
+	* 4.0.1: release
+
+	* Add clarifying comment in QPDF.hh for methods that return the
+	user password to state that it is no longer possible with newer
+	encryption formats to recover the user password knowing the owner
+	password.
+
+	* Fix detection of binary attachments in the test suite.  This
+	resolves false test failures on some platforms.  No changes to the
+	actual QPDF code were made.
+
 2012-12-31  Jay Berkenbilt  <ejb@ql.org>
 
 	* 4.0.0: release
diff --git a/configure.ac b/configure.ac
index dff0bd16..cb95c23e 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.68])
-AC_INIT([qpdf],[4.0.0])
+AC_INIT([qpdf],[4.0.1])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc
index 160cee4b..7a912dda 100644
--- a/libqpdf/QPDF.cc
+++ b/libqpdf/QPDF.cc
@@ -19,7 +19,7 @@
 #include <qpdf/QPDF_Null.hh>
 #include <qpdf/QPDF_Dictionary.hh>
 
-std::string QPDF::qpdf_version = "4.0.0+";
+std::string QPDF::qpdf_version = "4.0.1";
 
 static char const* EMPTY_PDF =
     "%PDF-1.3\n"
diff --git a/libqpdf/build.mk b/libqpdf/build.mk
index d64fde55..a12a0b2c 100644
--- a/libqpdf/build.mk
+++ b/libqpdf/build.mk
@@ -91,4 +91,4 @@ $(COBJS_libqpdf): libqpdf/$(OUTPUT_DIR)/%.$(LOBJ): libqpdf/%.c
 # * Otherwise, increment REVISION
 
 $(TARGETS_libqpdf): $(OBJS_libqpdf)
-	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),10,0,0)
+	$(call makelib,$(OBJS_libqpdf),$@,$(LDFLAGS),$(LIBS),10,1,0)
diff --git a/manual/qpdf-manual.xml b/manual/qpdf-manual.xml
index b5e22518..59b6c355 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 "4.0.0">
-<!ENTITY lastreleased "December 31, 2012">
+<!ENTITY swversion "4.0.1">
+<!ENTITY lastreleased "January 17, 2013">
 ]>
 <book>
  <bookinfo>
@@ -2460,6 +2460,32 @@ print "\n";
    <filename>ChangeLog</filename> in the source distribution.
   </para>
   <variablelist>
+   <varlistentry>
+    <term>4.0.1: January 17, 2013</term>
+    <listitem>
+     <itemizedlist>
+      <listitem>
+       <para>
+        Fix detection of binary attachments in test suite to avoid
+        false test failures on some platforms.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Add clarifying comment in <filename>QPDF.hh</filename> to
+        methods that return the user password explaining that it is no
+        longer possible with newer encryption formats to recover the
+        user password knowing the owner password.  In earlier
+        encryption formats, the user password was encrypted in the
+        file using the owner password.  In newer encryption formats, a
+        separate encryption key is used on the file, and that key is
+        independently encrypted using both the user password and the
+        owner password.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term>4.0.0: December 31, 2012</term>
     <listitem>
diff --git a/qpdf.spec b/qpdf.spec
index bf434e8f..c0cba7aa 100644
--- a/qpdf.spec
+++ b/qpdf.spec
@@ -1,6 +1,6 @@
 Summary: Command-line tools and library for transforming PDF files
 Name: qpdf
-Version: 4.0.0
+Version: 4.0.1
 Release: 1%{?dist}
 License: Artistic
 Group: System Environment/Libraries