packages: cryptsetup-luks/cryptsetup-luks-diet.patch, cryptsetup-luks/crypt...

qboosh qboosh at pld-linux.org
Sat Jan 1 12:18:55 CET 2011


Author: qboosh                       Date: Sat Jan  1 11:18:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.0
- updated diet patch, removed obsolete nostatic patch

---- Files affected:
packages/cryptsetup-luks:
   cryptsetup-luks-diet.patch (1.4 -> 1.5) , cryptsetup-luks.spec (1.49 -> 1.50) , cryptsetup-luks-nostatic.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/cryptsetup-luks/cryptsetup-luks-diet.patch
diff -u packages/cryptsetup-luks/cryptsetup-luks-diet.patch:1.4 packages/cryptsetup-luks/cryptsetup-luks-diet.patch:1.5
--- packages/cryptsetup-luks/cryptsetup-luks-diet.patch:1.4	Mon Jun 21 11:32:38 2010
+++ packages/cryptsetup-luks/cryptsetup-luks-diet.patch	Sat Jan  1 12:18:49 2011
@@ -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>

================================================================
Index: packages/cryptsetup-luks/cryptsetup-luks.spec
diff -u packages/cryptsetup-luks/cryptsetup-luks.spec:1.49 packages/cryptsetup-luks/cryptsetup-luks.spec:1.50
--- packages/cryptsetup-luks/cryptsetup-luks.spec:1.49	Sun Aug 22 21:53:22 2010
+++ packages/cryptsetup-luks/cryptsetup-luks.spec	Sat Jan  1 12:18:49 2011
@@ -8,28 +8,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}
@@ -142,7 +142,6 @@
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 cp -a %{SOURCE5} README.initramfs
 
@@ -263,6 +262,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2011/01/01 11:18:49  qboosh
+- updated to 1.2.0
+- updated diet patch, removed obsolete nostatic patch
+
 Revision 1.49  2010/08/22 19:53:22  glen
 - up to 1.1.3
 - improvements for ccache and configure cache
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cryptsetup-luks/cryptsetup-luks-diet.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cryptsetup-luks/cryptsetup-luks.spec?r1=1.49&r2=1.50&f=u



More information about the pld-cvs-commit mailing list