Mailinglist Archive: opensuse-commit (1059 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package cryptsetup
checked in at Wed Jan 9 21:57:23 CET 2008.

--------
--- cryptsetup/cryptsetup.changes       2007-11-29 13:50:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/cryptsetup/cryptsetup.changes  2008-01-09 
12:09:57.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Jan  9 12:07:14 CET 2008 - lnussel@xxxxxxx
+
+- upgrade to svn revision 42 which includes previous patches
+- boot.crypto:
+  * don't mount read-only as safety check (#345338)
+  * implement precheck scripts
+  * allow restarting of single volumes (#345605)
+  * status query of individual devices (#345605)
+  * add vol_id check script
+  * maintain boot.crypto stuff in revision control and use tarball
+    snapshots of it
+
+-------------------------------------------------------------------

Old:
----
  0001-cryptsetup-the-device-parameter-of-LUKS_device_ready.diff
  0002-cryptsetup-logger-function-should-return-void.diff
  0003-cryptsetup-fix-implicit-function-declarations.diff
  boot.crypto
  cryptsetup-1.0.5_SVNr38.tar.bz2
  crypttab.5
  crypttab.5.txt
  Makefile.doc

New:
----
  boot.crypto-0_200801091212.tar.bz2
  cryptsetup-1.0.5_SVNr42.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ cryptsetup.spec ++++++
--- /var/tmp/diff_new_pack.u23142/_old  2008-01-09 21:56:27.000000000 +0100
+++ /var/tmp/diff_new_pack.u23142/_new  2008-01-09 21:56:27.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package cryptsetup (Version 1.0.5_SVNr38)
+# spec file for package cryptsetup (Version 1.0.5_SVNr42)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -15,24 +15,20 @@
 BuildRequires:  device-mapper-devel e2fsprogs-devel libgcrypt-devel popt-devel
 # hashalot version
 %define haver 0.3 
+# boot.crypto version
+%define bcver 0_200801091212
 License:        BSD 3-Clause; GPL v2 or later
 Group:          System/Base
 AutoReqProv:    on
-Version:        1.0.5_SVNr38
+Version:        1.0.5_SVNr42
 Release:        1
 Summary:        Set Up dm-crypt Based Encrypted Block Devices
 Source:         cryptsetup-%{version}.tar.bz2
 Source1:        hashalot-%haver.tar.bz2
-Source50:       boot.crypto
-Source90:       Makefile.doc
-Source91:       crypttab.5.txt
-# make -f Makefile.doc
-Source92:       crypttab.5
+# http://www.suse.de/~lnussel/boot.crypto.git
+Source2:        boot.crypto-%{bcver}.tar.bz2
 # use this to create the tarball from svn
 Source99:       cryptsetup-mktar
-Patch1:         0001-cryptsetup-the-device-parameter-of-LUKS_device_ready.diff
-Patch2:         0002-cryptsetup-logger-function-should-return-void.diff
-Patch3:         0003-cryptsetup-fix-implicit-function-declarations.diff
 Patch10:        hashalot-fixes.diff
 Patch11:        hashalot-libgcrypt.diff
 Patch12:        hashalot-ctrl-d.diff
@@ -82,10 +78,7 @@
     Ben Slusky <sluskyb@xxxxxxxxxxxxxx>
 
 %prep
-%setup -q -b 1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%setup -q -b 1 -b 2
 pushd ../hashalot-%haver
 %patch10 -p1
 %patch11 -p1
@@ -130,14 +123,7 @@
 #
 #
 # boot.crypto
-install -d -m 755 %{buildroot}/etc/init.d
-install -m 755 %{SOURCE50} %{buildroot}/etc/init.d/boot.crypto
-# maybe install templates instead?
-install -m 644 /dev/null %{buildroot}/etc/cryptotab
-install -m 644 /dev/null %{buildroot}/etc/crypttab
-# man page
-install -d -m755 %{buildroot}%{_mandir}/man5
-install -m644 %{SOURCE92} %{buildroot}%{_mandir}/man5
+make -C ../boot.crypto-* install DESTDIR=$RPM_BUILD_ROOT
 #
 %find_lang %name --all-name
 
@@ -169,12 +155,12 @@
 /etc/init.d/boot.crypto
 /sbin/cryptsetup
 /sbin/hashalot
-%_datadir/locale/de/LC_MESSAGES/cryptsetup.mo
 %_mandir/man1/hashalot.1.gz
 %_mandir/man8/cryptsetup.8.gz
 %_mandir/man5/crypttab.5.gz
 /%_lib/libcryptsetup.so.0
 /%_lib/libcryptsetup.so.0.0.0
+/lib/cryptsetup
 
 %files devel
 %defattr(-,root,root)
@@ -182,6 +168,16 @@
 %{_libdir}/libcryptsetup.so
 
 %changelog
+* Wed Jan 09 2008 - lnussel@xxxxxxx
+- upgrade to svn revision 42 which includes previous patches
+- boot.crypto:
+  * don't mount read-only as safety check (#345338)
+  * implement precheck scripts
+  * allow restarting of single volumes (#345605)
+  * status query of individual devices (#345605)
+  * add vol_id check script
+  * maintain boot.crypto stuff in revision control and use tarball
+  snapshots of it
 * Thu Nov 29 2007 - lnussel@xxxxxxx
 - upgrade to svn revision 38
 * Wed Nov 07 2007 - mkoenig@xxxxxxx

++++++ cryptsetup-1.0.5_SVNr38.tar.bz2 -> cryptsetup-1.0.5_SVNr42.tar.bz2 ++++++
++++ 38045 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/lib/libcryptsetup.h 
new/cryptsetup-1.0.5_SVNr42/lib/libcryptsetup.h
--- old/cryptsetup-1.0.5_SVNr38/lib/libcryptsetup.h     2007-10-24 
22:42:20.000000000 +0200
+++ new/cryptsetup-1.0.5_SVNr42/lib/libcryptsetup.h     2007-12-01 
17:02:33.000000000 +0100
@@ -53,7 +53,8 @@
 int crypt_remove_device(struct crypt_options *options);
 int crypt_luksFormat(struct crypt_options *options);
 int crypt_luksOpen(struct crypt_options *options);
-int crypt_luksDelKey(struct crypt_options *options);
+int crypt_luksKillSlot(struct crypt_options *options);
+int crypt_luksRemoveKey(struct crypt_options *options);
 int crypt_luksAddKey(struct crypt_options *options);
 int crypt_luksUUID(struct crypt_options *options);
 int crypt_isLuks(struct crypt_options *options);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/lib/setup.c new/cryptsetup-1.0.5_SVNr42/lib/setup.c
--- old/cryptsetup-1.0.5_SVNr38/lib/setup.c     2007-11-22 14:50:26.000000000 
+0100
+++ new/cryptsetup-1.0.5_SVNr42/lib/setup.c     2007-12-01 17:02:33.000000000 
+0100
@@ -26,7 +26,7 @@
 
 #define at_least_one(a) ({ __typeof__(a) __at_least_one=(a); 
(__at_least_one)?__at_least_one:1; })
 
-static int logger(struct crypt_options *options, int class, char *format, ...) 
{
+static void logger(struct crypt_options *options, int class, char *format, 
...) {
         va_list argp;
         char *target;
 
@@ -482,10 +482,14 @@
        if(!password) {
                r = -EINVAL; goto out;
        }
-       if((r = LUKS_open_any_key(options->device, password, passwordLen, &hdr, 
&mk, backend)) < 0) {
+        
+        r = LUKS_open_any_key(options->device, password, passwordLen, &hdr, 
&mk, backend);
+       if(r < 0) {
                set_error("No key available with this passphrase.\n");
                goto out1;
-       }
+       } else
+                logger(options, CRYPT_LOG_NORMAL,"key slot %d unlocked.\n", r);
+
        
        options->offset = hdr.payloadOffset;
        asprintf(&dmCipherSpec, "%s-%s", hdr.cipherName, hdr.cipherMode);
@@ -612,7 +616,8 @@
            if(keyIndex < 0) {
                    options->icb->log(CRYPT_LOG_ERROR,"No remaining key 
available with this passphrase.\n");
                    r = -EPERM; goto out;
-           }
+           } else
+               logger(options, CRYPT_LOG_NORMAL,"key slot %d selected for 
deletion.\n", keyIndex);
            safe_free(password);
        } else {
            keyIndex = options->key_slot;
@@ -634,7 +639,8 @@
                if(openedIndex < 0 || keyIndex == openedIndex) {
                             options->icb->log(CRYPT_LOG_ERROR,"No remaining 
key available with this passphrase.\n");
                            r = -EPERM; goto out;
-               }
+               } else
+                        logger(options, CRYPT_LOG_NORMAL,"key slot %d 
verified.\n", keyIndex);
        }
        r = LUKS_del_key(device, keyIndex);
        if(r < 0) goto out;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/lib/utils.c new/cryptsetup-1.0.5_SVNr42/lib/utils.c
--- old/cryptsetup-1.0.5_SVNr38/lib/utils.c     2007-10-24 22:37:19.000000000 
+0200
+++ new/cryptsetup-1.0.5_SVNr42/lib/utils.c     2007-12-01 17:29:57.000000000 
+0100
@@ -22,40 +22,17 @@
        char    data[1];
 };
 
-static char *error;
+static char *error=NULL;
 
 void set_error_va(const char *fmt, va_list va)
 {
-       int bufsize;
 
-       bufsize = fmt ? (strlen(fmt) + 1) : 0;
-       if (bufsize < 128)
-               bufsize = 128;
-
-       if (error)
-               free(error);
-       if (!fmt) {
-               error = NULL;
-               return;
+       if(error) {
+           free(error);
+           error=NULL;
        }
 
-       error = malloc(bufsize);
-
-       for(;;) {
-               int n;
-
-               n = vsnprintf(error, bufsize, fmt, va);
-
-               if (n >= 0 && n < bufsize)
-                       break;
-
-               if (n >= 0)
-                       bufsize = n + 1;
-               else
-                       bufsize *= 2;
-
-               error = realloc(error, bufsize);
-       }
+        vasprintf(&error, fmt, va);
 }
 
 void set_error(const char *fmt, ...)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/luks/keymanage.c 
new/cryptsetup-1.0.5_SVNr42/luks/keymanage.c
--- old/cryptsetup-1.0.5_SVNr38/luks/keymanage.c        2007-11-22 
14:50:26.000000000 +0100
+++ new/cryptsetup-1.0.5_SVNr42/luks/keymanage.c        2007-12-01 
17:02:33.000000000 +0100
@@ -466,7 +466,7 @@
        return PBKDF2_performance_check()/2;
 }
 
-int LUKS_device_ready(char *device, int mode)
+int LUKS_device_ready(const char *device, int mode)
 {
         int devfd = open(device, mode | O_DIRECT | O_SYNC);
         if(devfd < 0) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/luks/luks.h new/cryptsetup-1.0.5_SVNr42/luks/luks.h
--- old/cryptsetup-1.0.5_SVNr38/luks/luks.h     2007-11-22 14:50:26.000000000 
+0100
+++ new/cryptsetup-1.0.5_SVNr42/luks/luks.h     2007-12-01 17:02:33.000000000 
+0100
@@ -132,4 +132,5 @@
                              char *key, size_t keyLength,
                              const char *device,
                              unsigned int sector, struct setup_backend 
*backend);
+int LUKS_device_ready(const char *device, int mode);
 #endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/luks/Makefile.am 
new/cryptsetup-1.0.5_SVNr42/luks/Makefile.am
--- old/cryptsetup-1.0.5_SVNr38/luks/Makefile.am        2006-10-13 
12:05:34.000000000 +0200
+++ new/cryptsetup-1.0.5_SVNr42/luks/Makefile.am        2007-12-01 
17:47:01.000000000 +0100
@@ -27,7 +27,7 @@
        -D_FILE_OFFSET_BITS=64                  \
         -I$(top_srcdir)/lib
 
-EXTRA_DIST = sha/hmac.c testing/fileDiffer.py
+EXTRA_DIST = sha/hmac.c testing/fileDiffer.py testing/compatimage.bz2
 
 ORIG_IMG = /tmp/luks-test-orig
 IMG = /tmp/luks-test
Files old/cryptsetup-1.0.5_SVNr38/po/de.gmo and 
new/cryptsetup-1.0.5_SVNr42/po/de.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/po/de.po new/cryptsetup-1.0.5_SVNr42/po/de.po
--- old/cryptsetup-1.0.5_SVNr38/po/de.po        2007-09-11 16:48:42.000000000 
+0200
+++ new/cryptsetup-1.0.5_SVNr42/po/de.po        2007-12-01 17:47:01.000000000 
+0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: cryptsetup 1.0.1.fk01\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-06 21:34+0200\n"
+"POT-Creation-Date: 2007-12-01 17:31+0100\n"
 "PO-Revision-Date: 2005-08-18 19:52+0200\n"
 "Last-Translator: Florian Knauf <i-sys@xxxxxxx>\n"
 "Language-Team: German <de@xxxxxx>\n"
@@ -16,162 +16,186 @@
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: luks/keyencryption.c:61
+#: lib/setup.c:627
+msgid ""
+"This is the last keyslot. Device will become unusable after purging this key."
+msgstr ""
+"Dies ist der letzte aktive Schl�ssel. Das Ger�t wird nach dem Entfernen des "
+"Schl�ssels unbenutzbar sein."
+
+#: luks/keyencryption.c:65
 #, c-format
 msgid "Unable to obtain sector size for %s"
 msgstr ""
 
-#: luks/keyencryption.c:109
+#: luks/keyencryption.c:129
 msgid "Failed to obtain device mapper directory."
 msgstr ""
 
-#: luks/keymanage.c:79 luks/keymanage.c:120 luks/keymanage.c:390
+#: luks/keymanage.c:82
 #, fuzzy, c-format
 msgid "Can't open device: %s\n"
 msgstr "Fehler beim �ffnen des Ger�ts: %s"
 
-#: luks/keymanage.c:86
+#: luks/keymanage.c:89
 #, c-format
 msgid "%s is not a LUKS partition\n"
 msgstr ""
 
-#: luks/keymanage.c:89
+#: luks/keymanage.c:92
 #, fuzzy
-msgid "unknown hash spec in phdr"
+msgid "unknown hash spec in phdr\n"
 msgstr "Unbekannter Hash im Partitions-Header"
 
-#: luks/keymanage.c:92
+#: luks/keymanage.c:95
 #, c-format
-msgid "unknown version %d\n"
+msgid "unknown LUKS version %d\n"
 msgstr ""
 
+#: luks/keymanage.c:123 luks/keymanage.c:391
+#, fuzzy, c-format
+msgid "Can't open device %s"
+msgstr "Fehler beim �ffnen des Ger�ts: %s"
+
 #: luks/keymanage.c:213
 #, c-format
-msgid "key %d active, purge first.\n"
+msgid "key %d active, purge first"
 msgstr ""
 
 #: luks/keymanage.c:218
 #, c-format
-msgid ""
-"key material section %d includes too few stripes. Header manipulation?\n"
+msgid "key material section %d includes too few stripes. Header manipulation?"
 msgstr ""
 
-#: luks/keymanage.c:281
+#: luks/keymanage.c:428
 #, c-format
-msgid "key %d is disabled.\n"
+msgid "Key %d not active. Can't wipe.\n"
 msgstr ""
 
-#: luks/keymanage.c:427
-#, c-format
-msgid "Key %d not active. Can't wipe.\n"
+#: luks/keymanage.c:473
+#, fuzzy, c-format
+msgid "Can't open device for %s%saccess: %s\n"
+msgstr "Fehler beim �ffnen des Ger�ts: %s"
+
+#: luks/keymanage.c:473
+msgid "exclusive "
+msgstr ""
+
+#: luks/keymanage.c:473
+msgid "writable "
 msgstr ""
 
-#: src/cryptsetup.c:56
+#: src/cryptsetup.c:59
 msgid "<name> <device>"
 msgstr ""
 
-#: src/cryptsetup.c:56
+#: src/cryptsetup.c:59
 msgid "create device"
 msgstr ""
 
-#: src/cryptsetup.c:57 src/cryptsetup.c:58 src/cryptsetup.c:59
-#: src/cryptsetup.c:60 src/cryptsetup.c:67
+#: src/cryptsetup.c:60 src/cryptsetup.c:61 src/cryptsetup.c:62
+#: src/cryptsetup.c:63 src/cryptsetup.c:72
 msgid "<name>"
 msgstr ""
 
-#: src/cryptsetup.c:57
+#: src/cryptsetup.c:60
 msgid "remove device"
 msgstr ""
 
-#: src/cryptsetup.c:58
+#: src/cryptsetup.c:61
 msgid "modify active device"
 msgstr ""
 
-#: src/cryptsetup.c:59
+#: src/cryptsetup.c:62
 #, fuzzy
 msgid "resize active device"
 msgstr "Die Gr��e des Ger�tes"
 
-#: src/cryptsetup.c:60
+#: src/cryptsetup.c:63
 msgid "show device status"
 msgstr ""
 
-#: src/cryptsetup.c:61 src/cryptsetup.c:64
+#: src/cryptsetup.c:64 src/cryptsetup.c:66
 msgid "<device> [<new key file>]"
 msgstr ""
 
-#: src/cryptsetup.c:61
+#: src/cryptsetup.c:64
 #, fuzzy
 msgid "formats a LUKS device"
 msgstr "Kein Block-Device"
 
-#: src/cryptsetup.c:62
+#: src/cryptsetup.c:65
 msgid "<device> <name> "
 msgstr ""
 
-#: src/cryptsetup.c:62
+#: src/cryptsetup.c:65
 msgid "open LUKS device as mapping <name>"
 msgstr ""
 
-#: src/cryptsetup.c:63
+#: src/cryptsetup.c:66
+msgid "add key to LUKS device"
+msgstr ""
+
+#: src/cryptsetup.c:67
+msgid "<device> [<key file]]"
+msgstr ""
+
+#: src/cryptsetup.c:67
+msgid "removes supplied key or key file from LUKS device"
+msgstr ""
+
+#: src/cryptsetup.c:68 src/cryptsetup.c:69
 msgid "<device> <key slot>"
 msgstr ""
 
-#: src/cryptsetup.c:63
+#: src/cryptsetup.c:68
 msgid "wipes key with number <key slot> from LUKS device"
 msgstr ""
 
-#: src/cryptsetup.c:64
-msgid "add key to LUKS device"
+#: src/cryptsetup.c:69
+msgid "identical to luksKillSlot, but deprecated action name"
 msgstr ""
 
-#: src/cryptsetup.c:65 src/cryptsetup.c:66 src/cryptsetup.c:68
+#: src/cryptsetup.c:70 src/cryptsetup.c:71 src/cryptsetup.c:73
 msgid "<device>"
 msgstr ""
 
-#: src/cryptsetup.c:65
+#: src/cryptsetup.c:70
 msgid "print UUID of LUKS device"
 msgstr ""
 
-#: src/cryptsetup.c:66
+#: src/cryptsetup.c:71
 msgid "tests <device> for LUKS partition header"
 msgstr ""
 
-#: src/cryptsetup.c:67
+#: src/cryptsetup.c:72
 msgid "remove LUKS mapping"
 msgstr ""
 
-#: src/cryptsetup.c:68
+#: src/cryptsetup.c:73
 msgid "dump LUKS partition information"
 msgstr ""
 
-#: src/cryptsetup.c:77
+#: src/cryptsetup.c:123
 #, c-format
 msgid "Command successful.\n"
 msgstr ""
 
-#: src/cryptsetup.c:90
+#: src/cryptsetup.c:136
 #, c-format
 msgid "Command failed"
 msgstr "Aufruf fehlgeschlagen"
 
-#: src/cryptsetup.c:226
+#: src/cryptsetup.c:260
 #, c-format
 msgid "This will overwrite data on %s irrevocably."
 msgstr "Daten auf %s werden unwiderruflich �berschrieben."
 
-#: src/cryptsetup.c:227
+#: src/cryptsetup.c:261
 msgid "memory allocation error in action_luksFormat"
 msgstr "Fehler bei der Speicherallokation in action_luksFormat"
 
-#: src/cryptsetup.c:269
-msgid ""
-"This is the last keyslot. Device will become unusable after purging this key."
-msgstr ""
-"Dies ist der letzte aktive Schl�ssel. Das Ger�t wird nach dem Entfernen des "
-"Schl�ssels unbenutzbar sein."
-
-#: src/cryptsetup.c:349
+#: src/cryptsetup.c:408
 #, c-format
 msgid ""
 "\n"
@@ -180,7 +204,7 @@
 "\n"
 "<action> ist eins der Folgenden:\n"
 
-#: src/cryptsetup.c:355
+#: src/cryptsetup.c:414
 #, c-format
 msgid ""
 "\n"
@@ -190,121 +214,121 @@
 "<key file> optional key file for the new key for luksAddKey action\n"
 msgstr ""
 
-#: src/cryptsetup.c:371
+#: src/cryptsetup.c:430
 msgid "Show this help message"
 msgstr "Diese Hilfemeldung anzeigen"
 
-#: src/cryptsetup.c:372
+#: src/cryptsetup.c:431
 msgid "Display brief usage"
 msgstr "Kurze Verwendungsbeschreibung anzeigen"
 
-#: src/cryptsetup.c:376
+#: src/cryptsetup.c:435
 msgid "Help options:"
 msgstr "Hilfe-Optionen:"
 
-#: src/cryptsetup.c:377
+#: src/cryptsetup.c:436
 #, fuzzy
 msgid "Shows more detailed error messages"
 msgstr "Diese Hilfemeldung anzeigen"
 
-#: src/cryptsetup.c:378
+#: src/cryptsetup.c:437
 msgid "The cipher used to encrypt the disk (see /proc/crypto)"
 msgstr "Der f�r die Verschl�sselung zu verwendende Cipher (siehe /proc/crypto)"
 
-#: src/cryptsetup.c:379
+#: src/cryptsetup.c:438
 msgid "The hash used to create the encryption key from the passphrase"
 msgstr ""
 "Der f�r die Erzeugung des Schl�ssels aus der Phassphrase zu verwendende Hash"
 
-#: src/cryptsetup.c:380
+#: src/cryptsetup.c:439
 msgid "Verifies the passphrase by asking for it twice"
 msgstr "�berpr�ft das Pa�wort durch eine Sicherheitsabfrage"
 
-#: src/cryptsetup.c:381
+#: src/cryptsetup.c:440
 msgid "Read the key from a file (can be /dev/random)"
 msgstr "Liest den Schl�ssel aus einer Datei (kann /dev/random sein)"
 
-#: src/cryptsetup.c:382
+#: src/cryptsetup.c:441
 msgid "The size of the encryption key"
 msgstr "Die Gr��e des Schl�ssels"
 
-#: src/cryptsetup.c:382
+#: src/cryptsetup.c:441
 msgid "BITS"
 msgstr "BITS"
 
-#: src/cryptsetup.c:383
+#: src/cryptsetup.c:442
 msgid "The size of the device"
 msgstr "Die Gr��e des Ger�tes"
 
-#: src/cryptsetup.c:383 src/cryptsetup.c:384 src/cryptsetup.c:385
-#: src/cryptsetup.c:393
+#: src/cryptsetup.c:442 src/cryptsetup.c:443 src/cryptsetup.c:444
+#: src/cryptsetup.c:452
 msgid "SECTORS"
 msgstr "SEKTOREN"
 
-#: src/cryptsetup.c:384
+#: src/cryptsetup.c:443
 msgid "The start offset in the backend device"
 msgstr "Der Start-Offset im Backend-Ger�t"
 
-#: src/cryptsetup.c:385
+#: src/cryptsetup.c:444
 msgid "How many sectors of the encrypted data to skip at the beginning"
 msgstr ""
 "Wieviele Sektoren der verschl�sselten Daten am Beginn �bersprungen werden "
 "sollen"
 
-#: src/cryptsetup.c:386
+#: src/cryptsetup.c:445
 msgid "Create a readonly mapping"
 msgstr ""
 
-#: src/cryptsetup.c:387
+#: src/cryptsetup.c:446
 msgid "PBKDF2 iteration time for LUKS (in ms)"
 msgstr ""
 
-#: src/cryptsetup.c:388
+#: src/cryptsetup.c:447
 msgid "msecs"
 msgstr ""
 
-#: src/cryptsetup.c:389
+#: src/cryptsetup.c:448
 msgid "Do not ask for confirmation"
 msgstr "Es wird nicht nach einer Best�tigung gefragt"
 
-#: src/cryptsetup.c:390
+#: src/cryptsetup.c:449
 msgid "Print package version"
 msgstr ""
 
-#: src/cryptsetup.c:391
+#: src/cryptsetup.c:450
 msgid "Timeout for interactive passphrase prompt (in seconds)"
 msgstr "Zeit in Sekunden vor Abbruch der Abfrage des Passwort"
 
-#: src/cryptsetup.c:391
+#: src/cryptsetup.c:450
 msgid "secs"
 msgstr ""
 
-#: src/cryptsetup.c:392
+#: src/cryptsetup.c:451
 msgid "How often the input of the passphrase can be retried"
 msgstr "Wie oft die Eingabe des Passwortes wiederholt werden kann"
 
-#: src/cryptsetup.c:393
+#: src/cryptsetup.c:452
 msgid "Align payload at <n> sector boundaries - for luksFormat"
 msgstr ""
 
-#: src/cryptsetup.c:409
+#: src/cryptsetup.c:468
 #, fuzzy
 msgid "[OPTION...] <action> <action-specific>]"
 msgstr "[OPTION...] <Aktion> <Name> [<Ger�t>]"
 
-#: src/cryptsetup.c:445
+#: src/cryptsetup.c:504
 msgid "Key size must be a multiple of 8 bits"
 msgstr "Schl�sselgr��e mu� ein Vielfaches von 8 Bit sein"
 
-#: src/cryptsetup.c:449
+#: src/cryptsetup.c:508
 msgid "Argument <action> missing."
 msgstr "Argument <Aktion> fehlt."
 
-#: src/cryptsetup.c:455
+#: src/cryptsetup.c:514
 msgid "Unknown action."
 msgstr "Unbekannte Aktion."
 
-#: src/cryptsetup.c:470
+#: src/cryptsetup.c:529
 #, c-format
 msgid "%s: requires %s as arguments"
 msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/po/LINGUAS new/cryptsetup-1.0.5_SVNr42/po/LINGUAS
--- old/cryptsetup-1.0.5_SVNr38/po/LINGUAS      2006-09-24 19:31:56.000000000 
+0200
+++ new/cryptsetup-1.0.5_SVNr42/po/LINGUAS      2007-12-01 18:09:51.000000000 
+0100
@@ -1 +1,3 @@
 de
+sv
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/po/sv.po new/cryptsetup-1.0.5_SVNr42/po/sv.po
--- old/cryptsetup-1.0.5_SVNr38/po/sv.po        1970-01-01 01:00:00.000000000 
+0100
+++ new/cryptsetup-1.0.5_SVNr42/po/sv.po        2007-12-01 18:09:51.000000000 
+0100
@@ -0,0 +1,337 @@
+# Swedish translation for cryptsetup.
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the cryptsetup package.
+# Daniel Nylander <po@xxxxxxxxxxxxxxxxx>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: cryptsetup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-12-01 17:31+0100\n"
+"PO-Revision-Date: 2007-09-29 20:44+0100\n"
+"Last-Translator: Daniel Nylander <po@xxxxxxxxxxxxxxxxx>\n"
+"Language-Team: Swedish <tp-sv@xxxxxxxxxxxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: lib/setup.c:627
+msgid ""
+"This is the last keyslot. Device will become unusable after purging this key."
+msgstr ""
+"Det här är sista nyckelplatsen. Enheten kommer att bli oanvändbar efter att "
+"denna nyckel tagits bort."
+
+#: luks/keyencryption.c:65
+#, c-format
+msgid "Unable to obtain sector size for %s"
+msgstr "Kunde inte få sektorstorlek för %s"
+
+#: luks/keyencryption.c:129
+msgid "Failed to obtain device mapper directory."
+msgstr "Misslyckades med att få katalog för enhetsmappare."
+
+#: luks/keymanage.c:82
+#, c-format
+msgid "Can't open device: %s\n"
+msgstr "Kan inte öppna enhet: %s\n"
+
+#: luks/keymanage.c:89
+#, c-format
+msgid "%s is not a LUKS partition\n"
+msgstr "%s är inte en LUKS-partition\n"
+
+#: luks/keymanage.c:92
+#, fuzzy
+msgid "unknown hash spec in phdr\n"
+msgstr "okänd hash angiven i phdr"
+
+#: luks/keymanage.c:95
+#, fuzzy, c-format
+msgid "unknown LUKS version %d\n"
+msgstr "okänd version %d\n"
+
+#: luks/keymanage.c:123 luks/keymanage.c:391
+#, fuzzy, c-format
+msgid "Can't open device %s"
+msgstr "Kan inte öppna enhet: %s\n"
+
+#: luks/keymanage.c:213
+#, fuzzy, c-format
+msgid "key %d active, purge first"
+msgstr "nyckel %d är aktiv, ta bort först.\n"
+
+#: luks/keymanage.c:218
+#, fuzzy, c-format
+msgid "key material section %d includes too few stripes. Header manipulation?"
+msgstr "nyckelmaterialsektion %d inkluderar för få delar. Manipulerat huvud?\n"
+
+#: luks/keymanage.c:428
+#, c-format
+msgid "Key %d not active. Can't wipe.\n"
+msgstr "Nyckel %d är inte aktiv. Kan inte rensa.\n"
+
+#: luks/keymanage.c:473
+#, fuzzy, c-format
+msgid "Can't open device for %s%saccess: %s\n"
+msgstr "Kan inte öppna enhet: %s\n"
+
+#: luks/keymanage.c:473
+msgid "exclusive "
+msgstr ""
+
+#: luks/keymanage.c:473
+msgid "writable "
+msgstr ""
+
+#: src/cryptsetup.c:59
+msgid "<name> <device>"
+msgstr "<namn> <enhet>"
+
+#: src/cryptsetup.c:59
+msgid "create device"
+msgstr "skapa enhet"
+
+#: src/cryptsetup.c:60 src/cryptsetup.c:61 src/cryptsetup.c:62
+#: src/cryptsetup.c:63 src/cryptsetup.c:72
+msgid "<name>"
+msgstr "<namn>"
+
+#: src/cryptsetup.c:60
+msgid "remove device"
+msgstr "ta bort enhet"
+
+#: src/cryptsetup.c:61
+msgid "modify active device"
+msgstr "ändra aktiv enhet"
+
+#: src/cryptsetup.c:62
+msgid "resize active device"
+msgstr "ändra storlek på aktiv enhet"
+
+#: src/cryptsetup.c:63
+msgid "show device status"
+msgstr "visa enhetsstatus"
+
+#: src/cryptsetup.c:64 src/cryptsetup.c:66
+msgid "<device> [<new key file>]"
+msgstr "<enhet> [<ny nyckelfil>]"
+
+#: src/cryptsetup.c:64
+msgid "formats a LUKS device"
+msgstr "formaterar en LUKS-enhet"
+
+#: src/cryptsetup.c:65
+msgid "<device> <name> "
+msgstr "<enhet> <namn> "
+
+#: src/cryptsetup.c:65
+msgid "open LUKS device as mapping <name>"
+msgstr "öppna LUKS-enhet som mappning <namn>"
+
+#: src/cryptsetup.c:66
+msgid "add key to LUKS device"
+msgstr "lägg till nyckel till LUKS-enhet"
+
+#: src/cryptsetup.c:67
+#, fuzzy
+msgid "<device> [<key file]]"
+msgstr "<enhet> [<ny nyckelfil>]"
+
+#: src/cryptsetup.c:67
+#, fuzzy
+msgid "removes supplied key or key file from LUKS device"
+msgstr "rensar nyckeln med nummer <nyckelplats> från LUKS-enhet"
+
+#: src/cryptsetup.c:68 src/cryptsetup.c:69
+msgid "<device> <key slot>"
+msgstr "<enhet> <nyckelplats>"
+
+#: src/cryptsetup.c:68
+msgid "wipes key with number <key slot> from LUKS device"
+msgstr "rensar nyckeln med nummer <nyckelplats> från LUKS-enhet"
+
+#: src/cryptsetup.c:69
+msgid "identical to luksKillSlot, but deprecated action name"
+msgstr ""
+
+#: src/cryptsetup.c:70 src/cryptsetup.c:71 src/cryptsetup.c:73
+msgid "<device>"
+msgstr "<enhet>"
+
+#: src/cryptsetup.c:70
+msgid "print UUID of LUKS device"
+msgstr "skriv ut UUID för LUKS-enhet"
+
+#: src/cryptsetup.c:71
+msgid "tests <device> for LUKS partition header"
+msgstr "testar <enhet> för LUKS-partitionshuvud"
+
+#: src/cryptsetup.c:72
+msgid "remove LUKS mapping"
+msgstr "ta bort LUKS-mappning"
+
+#: src/cryptsetup.c:73
+msgid "dump LUKS partition information"
+msgstr "skriv ut information om LUKS-partition"
+
+#: src/cryptsetup.c:123
+#, c-format
+msgid "Command successful.\n"
+msgstr "Kommandot lyckades.\n"
+
+#: src/cryptsetup.c:136
+#, c-format
+msgid "Command failed"
+msgstr "Kommandot misslyckades"
+
+#: src/cryptsetup.c:260
+#, c-format
+msgid "This will overwrite data on %s irrevocably."
+msgstr "Det här kommer att skriva över data permanent på %s."
+
+#: src/cryptsetup.c:261
+msgid "memory allocation error in action_luksFormat"
+msgstr "minnesallokeringsfel i action_luksFormat"
+
+#: src/cryptsetup.c:408
+#, c-format
+msgid ""
+"\n"
+"<action> is one of:\n"
+msgstr ""
+"\n"
+"<åtgärd> är en av:\n"
+
+#: src/cryptsetup.c:414
+#, c-format
+msgid ""
+"\n"
+"<name> is the device to create under %s\n"
+"<device> is the encrypted device\n"
+"<key slot> is the LUKS key slot number to modify\n"
+"<key file> optional key file for the new key for luksAddKey action\n"
+msgstr ""
+"\n"
+"<namn> är enheten att skapa under %s\n"
+"<enhet> är den krypterade enheten\n"
+"<nyckelplats> är LUKS-nyckelplatsens nummer att ändra\n"
+"<nyckelfil> valfri nyckelfil för den nya nyckeln för luksAddKey-åtgärd\n"
+
+#: src/cryptsetup.c:430
+msgid "Show this help message"
+msgstr "Visa det här hjälpmeddelandet"
+
+#: src/cryptsetup.c:431
+msgid "Display brief usage"
+msgstr "Visa kort information om användning"
+
+#: src/cryptsetup.c:435
+msgid "Help options:"
+msgstr "Hjälpflaggor:"
+
+#: src/cryptsetup.c:436
+msgid "Shows more detailed error messages"
+msgstr "Visar mer detaljerade felmeddelanden"
+
+#: src/cryptsetup.c:437
+msgid "The cipher used to encrypt the disk (see /proc/crypto)"
+msgstr "Chiffret som används för att kryptera disken (se /proc/crypto)"
+
+#: src/cryptsetup.c:438
+msgid "The hash used to create the encryption key from the passphrase"
+msgstr "Hashen som används för att skapa krypteringsnyckeln från lösenfrasen"
+
+#: src/cryptsetup.c:439
+msgid "Verifies the passphrase by asking for it twice"
+msgstr "Verifierar lösenfrasen genom att fråga efter den två gånger"
+
+#: src/cryptsetup.c:440
+msgid "Read the key from a file (can be /dev/random)"
+msgstr "Läs nyckeln från en fil (kan vara /dev/random)"
+
+#: src/cryptsetup.c:441
+msgid "The size of the encryption key"
+msgstr "Storleken på krypteringsnyckeln"
+
+#: src/cryptsetup.c:441
+msgid "BITS"
+msgstr "BITAR"
+
+#: src/cryptsetup.c:442
+msgid "The size of the device"
+msgstr "Storleken på enheten"
+
+#: src/cryptsetup.c:442 src/cryptsetup.c:443 src/cryptsetup.c:444
+#: src/cryptsetup.c:452
+msgid "SECTORS"
+msgstr "SEKTORER"
+
+#: src/cryptsetup.c:443
+msgid "The start offset in the backend device"
+msgstr "Startpositionen i bakändesenheten"
+
+#: src/cryptsetup.c:444
+msgid "How many sectors of the encrypted data to skip at the beginning"
+msgstr ""
+"Hur många sektorer av det krypterade datat som ska hoppas över i början"
+
+#: src/cryptsetup.c:445
+msgid "Create a readonly mapping"
+msgstr "Skapa en skrivskyddad mappning"
+
+#: src/cryptsetup.c:446
+msgid "PBKDF2 iteration time for LUKS (in ms)"
+msgstr "PBKDF2-iterationstid för LUKS (i ms)"
+
+#: src/cryptsetup.c:447
+msgid "msecs"
+msgstr "ms"
+
+#: src/cryptsetup.c:448
+msgid "Do not ask for confirmation"
+msgstr "Fråga inte efter bekräftelse"
+
+#: src/cryptsetup.c:449
+msgid "Print package version"
+msgstr "Skriv ut paketversion"
+
+#: src/cryptsetup.c:450
+msgid "Timeout for interactive passphrase prompt (in seconds)"
+msgstr "Tidsgräns för interaktiv prompt för lösenfras (i sekunder)"
+
+#: src/cryptsetup.c:450
+msgid "secs"
+msgstr "sekunder"
+
+#: src/cryptsetup.c:451
+msgid "How often the input of the passphrase can be retried"
+msgstr "Hur ofta inmatning av lösenfras kan upprepas"
+
+#: src/cryptsetup.c:452
+msgid "Align payload at <n> sector boundaries - for luksFormat"
+msgstr "Justera data i <n> sektorgränser - för luksFormat"
+
+#: src/cryptsetup.c:468
+msgid "[OPTION...] <action> <action-specific>]"
+msgstr "[FLAGGA...] <åtgärd> <åtgärdsspecifik>]"
+
+#: src/cryptsetup.c:504
+msgid "Key size must be a multiple of 8 bits"
+msgstr "Nyckelstorleken måste vara en multipel av 8 bitar"
+
+#: src/cryptsetup.c:508
+msgid "Argument <action> missing."
+msgstr "Argumentet <åtgärd> saknas."
+
+#: src/cryptsetup.c:514
+msgid "Unknown action."
+msgstr "Okänd åtgärd."
+
+#: src/cryptsetup.c:529
+#, c-format
+msgid "%s: requires %s as arguments"
+msgstr "%s: kräver %s som argument"
+
+#~ msgid "key %d is disabled.\n"
+#~ msgstr "nyckel %d är inaktiverad.\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude 
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh 
old/cryptsetup-1.0.5_SVNr38/src/cryptsetup.c 
new/cryptsetup-1.0.5_SVNr42/src/cryptsetup.c
--- old/cryptsetup-1.0.5_SVNr38/src/cryptsetup.c        2007-11-22 
14:50:26.000000000 +0100
+++ new/cryptsetup-1.0.5_SVNr42/src/cryptsetup.c        2007-12-01 
17:47:01.000000000 +0100
@@ -97,7 +97,7 @@
     switch(class) {
 
     case CRYPT_LOG_NORMAL:
-            puts(msg);
+            fputs(msg, stdout);
             break;
     case CRYPT_LOG_ERROR:
             fputs(msg, stderr);



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx