- updated to 1.2.0

- updated diet patch, removed obsolete nostatic patch

Changed files:
    cryptsetup-luks-diet.patch -> 1.5
    cryptsetup-luks-nostatic.patch -> 1.2
    cryptsetup-luks.spec -> 1.50

diff --git a/cryptsetup-luks-diet.patch b/cryptsetup-luks-diet.patch
index 0d08bf412af35b98f0d48db041434d9c63c8a2cf..43913127bf6f2e2df7b5c22c9c0609b24caeb7c5 100644 (file)
--- a/cryptsetup-luks-diet.patch
+++ b/cryptsetup-luks-diet.patch
@@ -1,5 +1,5 @@
---- cryptsetup-1.1.2/luks/pbkdf.c~     2009-09-11 16:11:50.000000000 +0200
-+++ cryptsetup-1.1.2/luks/pbkdf.c      2010-06-21 11:16:57.353421474 +0200
+--- cryptsetup-1.2.0/lib/luks1/pbkdf.c~        2009-09-11 16:11:50.000000000 +0200
++++ cryptsetup-1.2.0/lib/luks1/pbkdf.c 2010-06-21 11:16:57.353421474 +0200
 @@ -174,7 +174,7 @@
        if (gcry_md_setkey(prf, P, Plen))
                goto out;
@@ -27,8 +27,8 @@
        }
        rc = 0;
  out:
---- cryptsetup-1.1.2/luks/keymanage.c.org      2010-06-21 11:25:41.010034880 +0200
-+++ cryptsetup-1.1.2/luks/keymanage.c  2010-06-21 11:25:47.149697130 +0200
+--- cryptsetup-1.2.0/lib/luks1/keymanage.c.org 2010-06-21 11:25:41.010034880 +0200
++++ cryptsetup-1.2.0/lib/luks1/keymanage.c     2010-06-21 11:25:47.149697130 +0200
 @@ -20,6 +20,7 @@
  #include <sys/types.h>
  #include <sys/stat.h>

diff --git a/cryptsetup-luks-nostatic.patch b/cryptsetup-luks-nostatic.patch
deleted file mode 100644 (file)
index 8a67e06..0000000
--- a/cryptsetup-luks-nostatic.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- cryptsetup-luks-1.0.3/configure.in.orig    2006-08-22 22:59:13.083565000 +0200
-+++ cryptsetup-luks-1.0.3/configure.in 2006-08-22 23:11:52.943053250 +0200
-@@ -110,8 +110,12 @@
- 
- dnl ==========================================================================
- 
--AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static = xyes)
--AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static = xno)
-+AC_ARG_ENABLE(static-cryptsetup,
-+[  --enable-static-cryptsetup  link cryptsetup statically [[default=no]]],
-+[enable_static_cryptsetup=$enableval],[enable_static_cryptsetup=no])
-+
-+AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static_cryptsetup = xyes)
-+AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static_cryptsetup = xno)
- 
- dnl ==========================================================================
- 

diff --git a/cryptsetup-luks.spec b/cryptsetup-luks.spec
index 073f5f0b4bb0533e3e7bc5fe0ea80e63bf4c26a2..8812d31b6619ca653839510483c484de44bab1f1 100644 (file)
--- a/cryptsetup-luks.spec
+++ b/cryptsetup-luks.spec
@@ -7,28 +7,28 @@
 Summary:       LUKS for dm-crypt implemented in cryptsetup
 Summary(pl.UTF-8):     LUKS dla dm-crypta zaimplementowany w cryptsetup
 Name:          cryptsetup-luks
-Version:       1.1.3
+Version:       1.2.0
 Release:       1
 License:       GPL v2
 Group:         Base
+#Source0Download: http://code.google.com/p/cryptsetup/downloads/list
 Source0:       http://cryptsetup.googlecode.com/files/%{realname}-%{version}.tar.bz2
-# Source0-md5: 318a64470861ea5b92a52f2014f1e7c1
+# Source0-md5: b4ac29d3d8b4771a457a8ceaa8c6aa13
 Source1:       %{name}-initramfs-root-conf
 Source2:       %{name}-initramfs-root-hook
 Source3:       %{name}-initramfs-root-local-top
 Source4:       %{name}-initramfs-passdev-hook
 Source5:       %{name}-initramfs-README
-Patch0:                %{name}-nostatic.patch
-Patch1:                %{name}-diet.patch
+Patch0:                %{name}-diet.patch
 URL:           http://code.google.com/p/cryptsetup/
-BuildRequires: autoconf >= 2.57
+BuildRequires: autoconf >= 2.67
 BuildRequires: automake
 BuildRequires: device-mapper-devel >= 1.02.03
 BuildRequires: gettext-devel >= 0.15
 BuildRequires: libgcrypt-devel >= 1.1.42
 BuildRequires: libselinux-devel
 BuildRequires: libsepol-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.0
 BuildRequires: libuuid-devel
 BuildRequires: popt-devel >= 1.7
 %if %{with initrd}
@@ -141,7 +141,6 @@ initramfs-tools.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 cp -a %{SOURCE5} README.initramfs