commit df4d3321d77f57ee22418b9d944044396e86cecb
Author: Jakub Bogusz <[email protected]>
Date: Sat Oct 27 10:59:25 2012 +0200
- updated to 1.5.1
- updated diet patch
cryptsetup.spec | 12 ++++++------
diet.patch | 14 +++++++-------
2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/cryptsetup.spec b/cryptsetup.spec
index 3bf6e60..0fa3c08 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -7,13 +7,13 @@
Summary: LUKS for dm-crypt implemented in cryptsetup
Summary(pl.UTF-8): LUKS dla dm-crypta zaimplementowany w cryptsetup
Name: cryptsetup
-Version: 1.5.0
-Release: 2
+Version: 1.5.1
+Release: 1
License: GPL v2
Group: Base
# Source0Download: http://code.google.com/p/cryptsetup/downloads/list
Source0:
http://cryptsetup.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 0fa7ba8923b0ce8eed2aa65f2cb9950c
+# Source0-md5: 87cc018c0c65f36043f38ceb8ffd4d81
Patch0: diet.patch
URL: http://code.google.com/p/cryptsetup/
BuildRequires: autoconf >= 2.67
@@ -33,13 +33,13 @@ BuildRequires: rpm-pythonprov
%if %{with initrd}
BuildRequires: libgpg-error-static
%if %{with dietlibc}
-BuildRequires: device-mapper-dietlibc
+BuildRequires: device-mapper-dietlibc >= 1.02.27
BuildRequires: dietlibc-static
BuildRequires: libgcrypt-dietlibc
BuildRequires: libuuid-dietlibc
BuildRequires: popt-dietlibc
%else
-BuildRequires: device-mapper-static >= 1.02.07
+BuildRequires: device-mapper-static >= 1.02.27
BuildRequires: libgcrypt-static >= 1.1.42
BuildRequires: libselinux-static
BuildRequires: libsepol-static
@@ -85,7 +85,7 @@ Summary: Header files for cryptsetup library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki cryptsetup
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: device-mapper-devel
+Requires: device-mapper-devel >= 1.02.03
Requires: libgcrypt-devel >= 1.1.42
Provides: cryptsetup-luks-devel = %{version}-%{release}
Obsoletes: cryptsetup-luks-devel < 1.4.1-2
diff --git a/diet.patch b/diet.patch
index 1cc27e7..33c7bca 100644
--- a/diet.patch
+++ b/diet.patch
@@ -27,9 +27,9 @@
}
rc = 0;
out:
---- cryptsetup-1.4.0/lib/luks1/keymanage.c.orig 2011-10-08
23:57:01.000000000 +0200
-+++ cryptsetup-1.4.0/lib/luks1/keymanage.c 2011-10-30 07:53:26.817195403
+0100
-@@ -19,6 +19,7 @@
+--- cryptsetup-1.5.1/lib/luks1/keymanage.c.orig 2012-09-19
13:55:25.000000000 +0200
++++ cryptsetup-1.5.1/lib/luks1/keymanage.c 2012-10-27 10:40:19.872153257
+0200
+@@ -20,6 +20,7 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -37,7 +37,7 @@
#include <netinet/in.h>
#include <fcntl.h>
#include <errno.h>
-@@ -35,6 +36,10 @@
+@@ -36,6 +37,10 @@
#include "pbkdf.h"
#include "internal.h"
@@ -45,6 +45,6 @@
+#define UINT32_MAX UINT_MAX
+#endif
+
- #define div_round_up(a,b) ({ \
- typeof(a) __a = (a); \
- typeof(b) __b = (b); \
+ /* Get size of struct luks_phdr with all keyslots material space */
+ static size_t LUKS_device_sectors(size_t keyLen)
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cryptsetup.git/commitdiff/df4d3321d77f57ee22418b9d944044396e86cecb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
