Author: arekm Date: Mon Jun 21 09:32:44 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; dietlibc fixes
---- Files affected: packages/cryptsetup-luks: cryptsetup-luks.spec (1.47 -> 1.48) , cryptsetup-luks-diet.patch (1.3 -> 1.4) ---- Diffs: ================================================================ Index: packages/cryptsetup-luks/cryptsetup-luks.spec diff -u packages/cryptsetup-luks/cryptsetup-luks.spec:1.47 packages/cryptsetup-luks/cryptsetup-luks.spec:1.48 --- packages/cryptsetup-luks/cryptsetup-luks.spec:1.47 Mon Jun 21 08:26:44 2010 +++ packages/cryptsetup-luks/cryptsetup-luks.spec Mon Jun 21 11:32:38 2010 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): LUKS dla dm-crypta zaimplementowany w cryptsetup Name: cryptsetup-luks Version: 1.1.2 -Release: 1 +Release: 2 License: GPL v2 Group: Base Source0: http://cryptsetup.googlecode.com/files/%{realname}-%{version}.tar.bz2 @@ -20,6 +20,7 @@ Source4: %{name}-initramfs-passdev-hook Source5: %{name}-initramfs-README Patch0: %{name}-nostatic.patch +Patch1: %{name}-diet.patch URL: http://code.google.com/p/cryptsetup/ BuildRequires: autoconf >= 2.57 BuildRequires: automake @@ -141,6 +142,7 @@ %prep %setup -q -n %{realname}-%{version} %patch0 -p1 +%patch1 -p1 install %{SOURCE5} README.initramfs @@ -171,7 +173,7 @@ %if %{with dietlibc} # we have to do it by hand cause libtool "know better" and forces # static libs from /usr/lib -diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -I./lib -static \ +diet %{__cc} %{rpmcflags} %{rpmldflags} -Os -I. -I./lib -static \ -o cryptsetup-initrd src/cryptsetup.c ./lib/.libs/libcryptsetup.a \ -lpopt -lgcrypt -lgpg-error -ldevmapper -luuid -lcompat %else @@ -255,6 +257,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.48 2010/06/21 09:32:38 arekm +- rel 2; dietlibc fixes + Revision 1.47 2010/06/21 06:26:44 qboosh - pl for -initrd ================================================================ Index: packages/cryptsetup-luks/cryptsetup-luks-diet.patch diff -u /dev/null packages/cryptsetup-luks/cryptsetup-luks-diet.patch:1.4 --- /dev/null Mon Jun 21 11:32:44 2010 +++ packages/cryptsetup-luks/cryptsetup-luks-diet.patch Mon Jun 21 11:32:38 2010 @@ -0,0 +1,50 @@ +--- 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 +@@ -174,7 +174,7 @@ + if (gcry_md_setkey(prf, P, Plen)) + goto out; + +- for (i = 1; (uint) i <= l; i++) { ++ for (i = 1; (unsigned int) i <= l; i++) { + memset(T, 0, hLen); + + for (u = 1; u <= c ; u++) { +@@ -198,7 +198,7 @@ + + memcpy(U, p, hLen); + +- for (k = 0; (uint) k < hLen; k++) ++ for (k = 0; (unsigned int) k < hLen; k++) + T[k] ^= U[k]; + + if (perfcheck && __PBKDF2_performance) { +@@ -210,7 +210,7 @@ + __PBKDF2_global_j++; + } + +- memcpy(DK + (i - 1) * hLen, T, (uint) i == l ? r : hLen); ++ memcpy(DK + (i - 1) * hLen, T, (unsigned int) i == l ? r : hLen); + } + 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 +@@ -20,6 +20,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/ioctl.h> ++#include <limits.h> + #include <linux/fs.h> + #include <netinet/in.h> + #include <fcntl.h> +@@ -37,6 +38,10 @@ + #include <uuid/uuid.h> + #include <../lib/internal.h> + ++#ifndef UINT32_MAX ++#define UINT32_MAX UINT_MAX ++#endif ++ + #define div_round_up(a,b) ({ \ + typeof(a) __a = (a); \ + typeof(b) __b = (b); \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cryptsetup-luks/cryptsetup-luks.spec?r1=1.47&r2=1.48&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cryptsetup-luks/cryptsetup-luks-diet.patch?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
