From c6c27d690477175d3d4e7a3619c6f8dfeb936d89 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 30 Oct 2011 07:29:51 +0000 Subject: [PATCH] - updated to 1.4.0 (note: deprecated APIs removed, new soname) - updated diet patch, removed obsolete pl.po-update patch Changed files: cryptsetup-luks-pl.po-update.patch -> 1.3 cryptsetup.spec -> 1.56 diet.patch -> 1.7 --- cryptsetup-luks-pl.po-update.patch | 58 ------------------------------ cryptsetup.spec | 12 +++---- diet.patch | 17 +++++---- 3 files changed, 13 insertions(+), 74 deletions(-) delete mode 100644 cryptsetup-luks-pl.po-update.patch diff --git a/cryptsetup-luks-pl.po-update.patch b/cryptsetup-luks-pl.po-update.patch deleted file mode 100644 index bbc12f0..0000000 --- a/cryptsetup-luks-pl.po-update.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- cryptsetup-1.3.1/po/pl.po.orig 2011-05-24 17:08:54.000000000 +0200 -+++ cryptsetup-1.3.1/po/pl.po 2011-05-28 07:37:04.133777466 +0200 -@@ -5,16 +5,17 @@ - # - msgid "" - msgstr "" --"Project-Id-Version: cryptsetup 1.3.0-rc2\n" -+"Project-Id-Version: cryptsetup 1.3.1\n" - "Report-Msgid-Bugs-To: dm-crypt@saout.de\n" - "POT-Creation-Date: 2011-05-24 16:55+0200\n" --"PO-Revision-Date: 2011-03-24 19:52+0100\n" -+"PO-Revision-Date: 2011-05-28 07:31+0200\n" - "Last-Translator: Jakub Bogusz \n" - "Language-Team: Polish \n" - "Language: pl\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=ISO-8859-2\n" - "Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - - #: lib/libdevmapper.c:181 - msgid "Cannot initialize device-mapper. Is dm_mod kernel module loaded?\n" -@@ -63,11 +64,12 @@ - msgstr "Nie mo¿na zainicjowaæ backendu kryptograficznego.\n" - - #: lib/setup.c:162 --#, fuzzy, c-format -+#, c-format - msgid "Cannot read %d byte from key file %s.\n" - msgid_plural "Cannot read %d bytes from key file %s.\n" --msgstr[0] "Nie mo¿na odczytaæ %d bajtów z pliku klucza %s.\n" -+msgstr[0] "Nie mo¿na odczytaæ %d bajtu z pliku klucza %s.\n" - msgstr[1] "Nie mo¿na odczytaæ %d bajtów z pliku klucza %s.\n" -+msgstr[2] "Nie mo¿na odczytaæ %d bajtów z pliku klucza %s.\n" - - #: lib/setup.c:177 - #, c-format -@@ -1043,19 +1045,11 @@ - msgstr "Opcja --uuid jest dozwolona tylko dla operacji luksFormat i luksUUID." - - #: src/cryptsetup.c:1270 --#, fuzzy - msgid "Option --skip is supported only for create and loopaesOpen commands.\n" --msgstr "" --"Opcja --offset jest obs³ugiwana tylko dla poleceñ create i loopaesOpen.\n" -+msgstr "Opcja --skip jest obs³ugiwana tylko dla poleceñ create i loopaesOpen.\n" - - #: src/cryptsetup.c:1275 - msgid "" - "Option --offset is supported only for create and loopaesOpen commands.\n" - msgstr "" - "Opcja --offset jest obs³ugiwana tylko dla poleceñ create i loopaesOpen.\n" -- --#~ msgid "Negative keyfile size not permitted.\n" --#~ msgstr "Ujemny rozmiar pliku klucza nie jest dozwolony.\n" -- --#~ msgid "Option --skip is supported only for create command.\n" --#~ msgstr "Opcja --skip jest obs³ugiwana tylko dla polecenia create.\n" diff --git a/cryptsetup.spec b/cryptsetup.spec index b059af8..8ed6655 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -7,21 +7,20 @@ Summary: LUKS for dm-crypt implemented in cryptsetup Summary(pl.UTF-8): LUKS dla dm-crypta zaimplementowany w cryptsetup Name: cryptsetup-luks -Version: 1.3.1 -Release: 2 +Version: 1.4.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: 1f5b5a9d538e8a3c191fb7dd85b9b013 +# Source0-md5: 4328641ba4532c229526c6ef282e5286 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}-diet.patch -Patch1: %{name}-pl.po-update.patch -Patch2: %{name}-dont-drag-more-libs.patch +Patch1: %{name}-dont-drag-more-libs.patch URL: http://code.google.com/p/cryptsetup/ BuildRequires: autoconf >= 2.67 BuildRequires: automake @@ -144,7 +143,6 @@ initramfs-tools. %setup -q -n %{realname}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 cp -a %{SOURCE5} README.initramfs @@ -235,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS ChangeLog TODO %attr(755,root,root) %{_sbindir}/cryptsetup %attr(755,root,root) /%{_lib}/libcryptsetup.so.*.*.* -%attr(755,root,root) %ghost /%{_lib}/libcryptsetup.so.1 +%attr(755,root,root) %ghost /%{_lib}/libcryptsetup.so.4 %{_mandir}/man8/cryptsetup.8* %files devel diff --git a/diet.patch b/diet.patch index ddf5ae2..1cc27e7 100644 --- a/diet.patch +++ b/diet.patch @@ -27,19 +27,19 @@ } rc = 0; out: ---- 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 @@ +--- 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 @@ + #include #include - #include +#include - #include #include #include -@@ -37,6 +38,10 @@ - #include - #include <../lib/internal.h> + #include +@@ -35,6 +36,10 @@ + #include "pbkdf.h" + #include "internal.h" +#ifndef UINT32_MAX +#define UINT32_MAX UINT_MAX @@ -48,4 +48,3 @@ #define div_round_up(a,b) ({ \ typeof(a) __a = (a); \ typeof(b) __b = (b); \ - -- 2.44.0