Version 1.3.0-rc2.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@479 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/ChangeLog b/ChangeLog
index 099f340eadbb1c9e1befee6384397fd13edfbace..d73ea813e0da5aeded761fe818d725636c6c3d1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        * Require the whole key read from keyfile in create command (broken in 1.2.0).
        * Fix offset option for loopaesOpen.
        * Lock memory also in luksDump command.
+       * Version 1.3.0-rc2.
 
 2011-04-14  Milan Broz  <mbroz@redhat.com>
        * Version 1.3.0-rc1.

diff --git a/configure.in b/configure.in
index fa573555f2a13a0ab44b8d2542c802a6949c8dd0..67e9392977a89c850f9bd20c5be147ffd75409c8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_PREREQ([2.67])
-AC_INIT([cryptsetup],[1.3.0-rc1])
+AC_INIT([cryptsetup],[1.3.0-rc2])
 
 dnl library version from <major>.<minor>.<release>[-<suffix>]
 LIBCRYPTSETUP_VERSION=$(echo $PACKAGE_VERSION | cut -f1 -d-)

diff --git a/docs/v1.3.0-ReleaseNotes b/docs/v1.3.0-ReleaseNotes
index de2baa61d83655f7a1b453303bda51b6051da87d..ad13140c3c9eb0d075a8cbc66b4475d3366d32b3 100644 (file)
--- a/docs/v1.3.0-ReleaseNotes
+++ b/docs/v1.3.0-ReleaseNotes
@@ -1,6 +1,19 @@
 Cryptsetup 1.3.0 Release Notes
 ==============================
 
+Changes since version 1.3.0-rc1
+
+ * Introduce maximum default keyfile size, add configure option, visible in --help.
+
+   Cryptsetup now fails if read from keyfile exceeds internal limit.
+   You can always specify keyfile size (overrides limit) by using --keyfile-size option.
+
+ * Require the whole key read from keyfile in create command (regression in 1.2.0).
+
+ * Fix offset option for loopaesOpen.
+
+ * Lock memory in luksDump command.
+
 Changes since version 1.2.0
 
 Important changes

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 037a8ef34389be4a0b49a3af5a622214074290ba..c91607a68d9d839e11fac07c950dfd4f7cd9b797 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,7 @@ lib/setup.c
 lib/utils.c
 lib/crypt_plain.c
 lib/utils_crypt.c
+lib/utils_loop.c
 lib/utils_debug.c
 lib/luks1/af.c
 lib/luks1/keyencryption.c