November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit mutt for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at Mon Nov 29 12:36:19 CET 2010. -------- --- mutt/mutt.changes 2010-11-04 15:29:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/mutt/mutt.changes 2010-11-26 20:14:53.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 26 19:44:20 CET 2010 - pth(a)suse.de + +- Update and fix the german translation. +- Update all translations so that the user edits the right translation. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mutt-1.5.21.de.po ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.pSXSbG/_old 2010-11-29 12:35:31.000000000 +0100 +++ /var/tmp/diff_new_pack.pSXSbG/_new 2010-11-29 12:35:31.000000000 +0100 @@ -32,7 +32,7 @@ #Requires: desktop-data-SuSE AutoReqProv: on Version: 1.5.21 -Release: 1 +Release: 2 Summary: Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0: %name-%version.tar.bz2 @@ -42,6 +42,7 @@ Source4: mutt.desktop Source5: skel.muttrc Source6: krb5-config +Source7: mutt-1.5.21.de.po Patch: %name-%version.dif # http://www.spinnaker.de/mutt/compressed/ Patch1: patch-%version.rr.compressed.1.bz2 @@ -74,6 +75,7 @@ %patch7 -p0 %patch8 -p0 %patch9 -p1 + cp doc/Muttrc Muttrc.SuSE cp %{S:2} . @@ -108,6 +110,8 @@ --enable-hcache \ --with-idn make -C doc clean +make -C po update-po +cp %{S:7} po/de.po make make -C doc ++++++ mutt-1.5.21.de.po ++++++ ++++ 5166 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lftp for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package lftp for openSUSE:Factory checked in at Mon Nov 29 12:35:13 CET 2010. -------- --- lftp/lftp.changes 2010-11-23 11:46:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/lftp/lftp.changes 2010-11-28 16:50:46.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 28 15:41:33 UTC 2010 - puzel(a)novell.com + +- udpate to 4.1.1 + * fixed job command line display. + * fixed some warnings and compilation with old gcc compilers + (Openwall). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lftp-4.1.0.tar.bz2 New: ---- lftp-4.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lftp.spec ++++++ --- /var/tmp/diff_new_pack.CA0ZUn/_old 2010-11-29 12:24:13.000000000 +0100 +++ /var/tmp/diff_new_pack.CA0ZUn/_new 2010-11-29 12:24:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package lftp (Version 4.1.0) +# spec file for package lftp (Version 4.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: lftp -Version: 4.1.0 +Version: 4.1.1 Release: 1 License: GPLv2+ Summary: Command Line File Transfer Program ++++++ lftp-4.1.0.tar.bz2 -> lftp-4.1.1.tar.bz2 ++++++ ++++ 1654 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/lftp-4.1.0/configure.ac new/lftp-4.1.1/configure.ac --- old/lftp-4.1.0/configure.ac 2010-11-22 11:07:16.000000000 +0100 +++ new/lftp-4.1.1/configure.ac 2010-11-24 08:47:01.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([lftp], [4.1.0], [lftp-bugs(a)lftp.yar.ru]) +AC_INIT([lftp], [4.1.1], [lftp-bugs(a)lftp.yar.ru]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_LIBOBJ_DIR([lib]) @@ -539,6 +539,13 @@ # define PRINTF_LIKE(n,m) # define __attribute__(x) #endif +/* Attribute `sentinel' was valid as of gcc 3.5. */ +#if defined(__GNUC__) && \ + (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 5)) +# define ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__)) +#else +# define ATTRIBUTE_SENTINEL +#endif #ifdef TRIO_REPLACE_STDIO /* replace all the functions */ 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/lftp-4.1.0/lftp.lsm new/lftp-4.1.1/lftp.lsm --- old/lftp-4.1.0/lftp.lsm 2010-11-22 15:53:22.000000000 +0100 +++ new/lftp-4.1.1/lftp.lsm 2010-11-24 16:11:45.000000000 +0100 @@ -1,7 +1,7 @@ Begin3 Title: LFTP command line file transfer program -Version: 4.1.0 -Entered-date: 2010-11-22 +Version: 4.1.1 +Entered-date: 2010-11-24 Description: LFTP is a shell-like command line file transfer program. It is reliable: can retry operations and does reget automatically. It can do several transfers simultaneously in background. @@ -22,7 +22,7 @@ Author: lav(a)yars.free.net (Alexander V. Lukyanov) Maintained-by: lav(a)yars.free.net (Alexander V. Lukyanov) Primary-site: ftp.yars.free.net /pub/source/lftp - 2178 kB lftp-4.1.0.tar.gz + 2178 kB lftp-4.1.1.tar.gz Alternate-site: metalab.unc.edu /pub/Linux/system/network/file-transfer Platforms: Unix, G++ Copying-policy: GNU GPL 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/lftp-4.1.0/lftp.spec new/lftp-4.1.1/lftp.spec --- old/lftp-4.1.0/lftp.spec 2010-11-22 15:53:18.000000000 +0100 +++ new/lftp-4.1.1/lftp.spec 2010-11-24 16:11:41.000000000 +0100 @@ -1,4 +1,4 @@ -%define version 4.1.0 +%define version 4.1.1 %define release 1 %define use_modules 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/lftp-4.1.0/lib/config.h.in new/lftp-4.1.1/lib/config.h.in --- old/lftp-4.1.0/lib/config.h.in 2010-11-22 11:13:33.000000000 +0100 +++ new/lftp-4.1.1/lib/config.h.in 2010-11-24 08:58:02.000000000 +0100 @@ -2214,6 +2214,13 @@ # define PRINTF_LIKE(n,m) # define __attribute__(x) #endif +/* Attribute `sentinel' was valid as of gcc 3.5. */ +#if defined(__GNUC__) && \ + (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 5)) +# define ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__)) +#else +# define ATTRIBUTE_SENTINEL +#endif #ifdef TRIO_REPLACE_STDIO /* replace all the functions */ 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/lftp-4.1.0/NEWS new/lftp-4.1.1/NEWS --- old/lftp-4.1.0/NEWS 2010-11-22 11:07:04.000000000 +0100 +++ new/lftp-4.1.1/NEWS 2010-11-24 16:10:17.000000000 +0100 @@ -1,3 +1,8 @@ +Version 4.1.1 - 2010-11-24 + +* fixed job command line display. +* fixed some warnings and compilation with old gcc compilers (Openwall). + Version 4.1.0 - 2010-11-22 * send path components to ftp server separately, unless TVFS is in FEAT reply. Files old/lftp-4.1.0/po/cs.gmo and new/lftp-4.1.1/po/cs.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/lftp-4.1.0/po/cs.po new/lftp-4.1.1/po/cs.po --- old/lftp-4.1.0/po/cs.po 2010-11-22 15:28:24.000000000 +0100 +++ new/lftp-4.1.1/po/cs.po 2010-11-24 16:10:48.000000000 +0100 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: lftp 4.0.9\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2010-06-14 21:18+0200\n" "Last-Translator: Petr Pisar <petr.pisar(a)atlas.cz>\n" "Language-Team: Czech <translation-team-cs(a)lists.sourceforge.net>\n" @@ -160,63 +160,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "Modul pro příkaz „%s“ si nezaregistroval tento příkaz.\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd uspělo, cwd=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: přijato přesměrování na „%s“\n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "Příliš mnoho přesměrování" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "Přerušení" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "Pozor: neúplný příkaz bude zahozen\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\tVykonává se vestavěný příkaz „%s“ [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "Fronta je pozastavena." -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "Nyní se vykonává:" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\tČeká se na dokončení úlohy [%d]\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\tČeká se na dokončení úloh: " -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\tBěžící\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\tČeká se na příkaz\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s: příkaz „%s“ není zakompilován.\n" Files old/lftp-4.1.0/po/de.gmo and new/lftp-4.1.1/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/lftp-4.1.0/po/de.po new/lftp-4.1.1/po/de.po --- old/lftp-4.1.0/po/de.po 2010-11-22 15:28:21.000000000 +0100 +++ new/lftp-4.1.1/po/de.po 2010-11-24 16:10:45.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2008-03-29 14:27+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -162,63 +162,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "Das Modul für den Befehl »%s« hat den Befehl nicht registriert.\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "Verzeichniswechsel OK, cwd=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: Umleitung nach »%s« empfangen\n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "Zu viele Umleitungen" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "Abbruch" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "Warnung: unvollständiger Befehl verworfen\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\tEingebautes»%s« wird ausgeführt [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "Warteschlange wurde angehalten." -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "Momentan läuft:" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\t Warte auf Beendigung von Job [%d]\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\tWarte auf Erledigung der Jobs: " -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\tWird ausgeführt\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\tWarten auf Befehl\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s: Befehl »%s« wurde nicht mitkompiliert.\n" Files old/lftp-4.1.0/po/es.gmo and new/lftp-4.1.1/po/es.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/lftp-4.1.0/po/es.po new/lftp-4.1.1/po/es.po --- old/lftp-4.1.0/po/es.po 2010-11-22 15:28:21.000000000 +0100 +++ new/lftp-4.1.1/po/es.po 2010-11-24 16:10:45.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lftp 2.6.0\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2002-08-08 19:01+0000\n" "Last-Translator: Nicol�s Lichtmaier <nick(a)debian.org>\n" "Language-Team: Spanish <es(a)li.org>\n" @@ -156,63 +156,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "El m�dulo para la orden `%s' no registro esa orden.\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd ok, dir actual=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: se recibi� redirecci�n a `%s'\n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "Demasiadas redirecciones" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "Interrupci�n" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "Aviso: descartando orden incompleta\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\tEjecutando primitiva `%s' [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "" -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "Ejecutando ahora:" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\tEsperando que termine la tarea [%d]\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\tEsperando la finalizaci�n de las siguientes tareas: " -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\tEjecutando\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\tEsperando orden\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s: la orden `%s' no fue compilada dentro del binario.\n" Files old/lftp-4.1.0/po/fr.gmo and new/lftp-4.1.1/po/fr.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/lftp-4.1.0/po/fr.po new/lftp-4.1.1/po/fr.po --- old/lftp-4.1.0/po/fr.po 2010-11-22 15:28:21.000000000 +0100 +++ new/lftp-4.1.1/po/fr.po 2010-11-24 16:10:45.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2008-04-12 12:40+0200\n" "Last-Translator: Alain PORTAL <aportal(a)univ-montp2.fr>\n" "Language-Team: Français <traduc(a)traduc.org>\n" @@ -159,63 +159,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "Le module pour la commande « %s » n'a pas enregistré la commande.\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd ok, cwd=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s : reçu une redirection vers « %s »\n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "Trop de redirections" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "Interrompu" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "Attention : commande incomplète ignorée\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\tExécution de la commande interne « %s » [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "La file d'attente est stoppée." -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "En cours d'exécution :" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\tEn attente de la fin de la tâche [%d]\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\tEn attente de la fin des tâches : " -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\tEn cours d'exécution\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\tEn attente de la commande\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s : la commande « %s » n'est pas compilée.\n" Files old/lftp-4.1.0/po/it.gmo and new/lftp-4.1.1/po/it.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/lftp-4.1.0/po/it.po new/lftp-4.1.1/po/it.po --- old/lftp-4.1.0/po/it.po 2010-11-22 15:28:22.000000000 +0100 +++ new/lftp-4.1.1/po/it.po 2010-11-24 16:10:46.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: lftp 2.2.3\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2000-06-18 10:46+02:00\n" "Last-Translator: Giovanni Bortolozzo <borto(a)pluto.linux.it>\n" "Language-Team: Italian <it(a)li.org>\n" @@ -155,63 +155,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd ok, cwd=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "Interruzione" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "Attenzione: ignoro il comando incompleto\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\tEsecuzione del comando interno `%s' [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "" -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "Ora sto eseguendo:" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\tAttendo la fine del job [%d] per terminare\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, fuzzy, c-format msgid "\tWaiting for termination of jobs: " msgstr "\tAttendo la fine del job [%d] per terminare\n" -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\tIn esecuzione\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, fuzzy, c-format msgid "\tWaiting for command\n" msgstr "parse: manca il comando filtro\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "" Files old/lftp-4.1.0/po/ja.gmo and new/lftp-4.1.1/po/ja.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/lftp-4.1.0/po/ja.po new/lftp-4.1.1/po/ja.po --- old/lftp-4.1.0/po/ja.po 2010-11-22 15:28:22.000000000 +0100 +++ new/lftp-4.1.1/po/ja.po 2010-11-24 16:10:46.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: lftp 2.3.0\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2002-04-12 00:06+0900\n" "Last-Translator: Masayuki Hatta <mhatta(a)gnu.org>\n" "Language-Team: Japanese <ja(a)li.org>\n" @@ -155,63 +155,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "��ޥ�� `%s' �ѤΥ⥸�塼�뤬��ޥ�ɤ��Ͽ��ޤ��Ǥ��\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd ��cwd=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: `%s'�ؤΥ��쥯��ޤ��\n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "��쥯��¿��ޤ�" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "��Ǥ��ޤ�" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "�ٹ�: �Դ��ʥ��ޥ�ɤ��ޤ�\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\t��¢��줿 `%s' [%s] ��¹Ԥ��ޤ�\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "" -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "��߼¹��:" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\t�� [%d] ��λ��Τ��ԤäƤ��ޤ�\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\t��֤ν�λ��ԤäƤ��ޤ�: " -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\t�¹��\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\t��ޥ�ɤ��ԤäƤ��ޤ�\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s: ��ޥ�� `%s'�ϥ��ѥ��Ȥ߹��ޤ�Ƥ��ޤ��\n" Files old/lftp-4.1.0/po/ko.gmo and new/lftp-4.1.1/po/ko.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/lftp-4.1.0/po/ko.po new/lftp-4.1.1/po/ko.po --- old/lftp-4.1.0/po/ko.po 2010-11-22 15:28:22.000000000 +0100 +++ new/lftp-4.1.1/po/ko.po 2010-11-24 16:10:46.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: lftp 2.1.1\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2001-05-27 KST\n" "Last-Translator: Dojip Kim <greendrm(a)greendrm.com>\n" "Language-Team: \n" @@ -155,63 +155,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "`%s'��ɿ� �� ϵǾ� �� ʽ��ϴ�.\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd ��, cwd=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: `%s'�� ̷�� \n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "��̷�� ʹ� ��ϴ�" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "��ͷ�Ʈ" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "��: �ҿ�� ɾ� ��\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\t�� `%s' [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "" -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "�� :" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\t�۾� [%d]�� Ḧ ��ٸ�� \n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\t�۾� ��Ḧ ��Ͽ� ��ٸ�� : " -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\t��\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\t�� ٸ�� \n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s: `%s'�� ϵ�� ʾҽ��ϴ�.\n" Files old/lftp-4.1.0/po/pl.gmo and new/lftp-4.1.1/po/pl.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/lftp-4.1.0/po/pl.po new/lftp-4.1.1/po/pl.po --- old/lftp-4.1.0/po/pl.po 2010-11-22 15:28:22.000000000 +0100 +++ new/lftp-4.1.1/po/pl.po 2010-11-24 16:10:46.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: lftp 3.7.1\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2008-05-06 21:20+0200\n" "Last-Translator: Jakub Bogusz <qboosh(a)pld-linux.org>\n" "Language-Team: Polish <translation-team-pl(a)lists.sourceforge.net>\n" @@ -160,63 +160,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "Modu� dla komendy `%s' nie zarejestrowa� komendy.\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd ok, cwd=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: otrzymano przekierowanie do `%s'\n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "Zbyt du�o przekierowa�" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "Przerwanie" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "Uwaga: niekompletna komenda zosta�a odrzucona\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\tUruchamianie wbudowanego `%s' [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "Kolejka jest zatrzymana." -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "Aktualnie wykonuj�:" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\tOczekiwanie na zako�czenie zadania [%d]\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\tOczekiwanie na zako�czenie prac: " -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\tUruchamianie\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\tOczekiwanie na komend�\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s: komenda `%s' nie zosta�a wkompilowana.\n" Files old/lftp-4.1.0/po/pt_BR.gmo and new/lftp-4.1.1/po/pt_BR.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/lftp-4.1.0/po/pt_BR.po new/lftp-4.1.1/po/pt_BR.po --- old/lftp-4.1.0/po/pt_BR.po 2010-11-22 15:28:23.000000000 +0100 +++ new/lftp-4.1.1/po/pt_BR.po 2010-11-24 16:10:47.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: lftp 1.0\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 1999-07-12 00:00+0400\n" "Last-Translator: Arnaldo Carvalho de Melo <acme(a)conectiva.com.br>\n" "Language-Team: pt_BR <pt(a)li.org>\n" @@ -154,63 +154,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "Interrup��o" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "Aten��o: descartando comando incompleto\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\tExecutando comando embutido `%s' [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "" -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\tEsperanto t�rmino do servi�o [%d]\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, fuzzy, c-format msgid "\tWaiting for termination of jobs: " msgstr "Esperando t�rmino da filtragem" -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\tExecutando\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, fuzzy, c-format msgid "\tWaiting for command\n" msgstr "Aten��o: descartando comando incompleto\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "" Files old/lftp-4.1.0/po/ru.gmo and new/lftp-4.1.1/po/ru.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/lftp-4.1.0/po/ru.po new/lftp-4.1.1/po/ru.po --- old/lftp-4.1.0/po/ru.po 2010-11-22 15:49:01.000000000 +0100 +++ new/lftp-4.1.1/po/ru.po 2010-11-24 16:10:47.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lftp 3.7.3\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2008-05-12 17:38+04:00\n" "Last-Translator: Alexander V. Lukyanov <lav(a)yars.free.net>\n" "Language-Team: Russian <ru(a)li.org>\n" @@ -159,63 +159,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "Модуль для команды `%s' не зарегистрировал эту команду\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd ok, каталог=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s: получено перенаправление на `%s'\n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "Слишком много перенаправлений" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "Прерывание" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "Предупреждение: неполный остаток команды игнорируется\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\tВыполнение примитива `%s' [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "Очередь остановлена." -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "Сейчас исполняется:" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\tОжидание завершения задания [%d]\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\tОжидание завершения заданий: " -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\tВыполнение\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\tОжидание команды\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s: команда `%s' не встроена при компиляции.\n" Files old/lftp-4.1.0/po/zh_CN.gmo and new/lftp-4.1.1/po/zh_CN.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/lftp-4.1.0/po/zh_CN.po new/lftp-4.1.1/po/zh_CN.po --- old/lftp-4.1.0/po/zh_CN.po 2010-11-22 15:28:23.000000000 +0100 +++ new/lftp-4.1.1/po/zh_CN.po 2010-11-24 16:10:47.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lftp-2.0.4\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 1999-09-10 00:50+0800\n" "Last-Translator: Wang Jian <lark(a)linux.net.cn>\n" "Language-Team: zh <zh(a)li.org>\n" @@ -156,63 +156,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd �ɹ�, ��ǰĿ¼=%s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "�ж�" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "��: ��δ��ɵ��\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\tִ��ڽ�� `%s' [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "" -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\t�ȴ�� [%d] ��ֹ\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, fuzzy, c-format msgid "\tWaiting for termination of jobs: " msgstr "�ȴ��ֹ" -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\t��\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, fuzzy, c-format msgid "\tWaiting for command\n" msgstr "parse: ȱ�ٹ��\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "" Files old/lftp-4.1.0/po/zh_HK.gmo and new/lftp-4.1.1/po/zh_HK.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/lftp-4.1.0/po/zh_HK.po new/lftp-4.1.1/po/zh_HK.po --- old/lftp-4.1.0/po/zh_HK.po 2010-11-22 15:28:24.000000000 +0100 +++ new/lftp-4.1.1/po/zh_HK.po 2010-11-24 16:10:48.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: lftp 3.5.11\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2007-05-13 20:18+0800\n" "Last-Translator: Abel Cheung <abelcheung(a)gmail.com>\n" "Language-Team: Chinese (Hong Kong) <community(a)linuxhall.org>\n" @@ -155,63 +155,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "應該和指令 ‘%s’ 有關的模組根本沒有包含該指令在內。\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd 成功，目前的目錄為 %s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s：將輸出結果重新導向至 ‘%s’\n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "重新導向次數太多" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "中斷" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "警告：忽略不完整的指令\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\t執行內置的 ‘%s’ [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "佇列已停止。" -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "現在執行：" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\t等待工作 [%d] 終止\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\t等待工作終止：" -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\t正在執行\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\t等待輸入指令\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s：編譯程式時沒有包括指令 ‘%s’ 的支援。\n" Files old/lftp-4.1.0/po/zh_TW.gmo and new/lftp-4.1.1/po/zh_TW.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/lftp-4.1.0/po/zh_TW.po new/lftp-4.1.1/po/zh_TW.po --- old/lftp-4.1.0/po/zh_TW.po 2010-11-22 15:28:24.000000000 +0100 +++ new/lftp-4.1.1/po/zh_TW.po 2010-11-24 16:10:47.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: lftp 3.5.11\n" "Report-Msgid-Bugs-To: lftp-bugs(a)lftp.yar.ru\n" -"POT-Creation-Date: 2010-11-22 17:28+0300\n" +"POT-Creation-Date: 2010-11-24 18:10+0300\n" "PO-Revision-Date: 2007-05-13 20:18+0800\n" "Last-Translator: Abel Cheung <abelcheung(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) <community(a)linuxhall.org>\n" @@ -155,63 +155,63 @@ msgid "Module for command `%s' did not register the command.\n" msgstr "應該和指令 ‘%s’ 有關的模組根本沒有包含該指令在內。\n" -#: src/CmdExec.cc:362 +#: src/CmdExec.cc:363 #, c-format msgid "cd ok, cwd=%s\n" msgstr "cd 成功，目前的目錄為 %s\n" -#: src/CmdExec.cc:383 src/MirrorJob.cc:544 +#: src/CmdExec.cc:384 src/MirrorJob.cc:544 #, c-format msgid "%s: received redirection to `%s'\n" msgstr "%s：將輸出結果重新導向至 ‘%s’\n" -#: src/CmdExec.cc:386 src/FileCopy.cc:1061 +#: src/CmdExec.cc:387 src/FileCopy.cc:1061 msgid "Too many redirections" msgstr "重新導向次數太多" -#: src/CmdExec.cc:498 src/CmdExec.cc:555 +#: src/CmdExec.cc:499 src/CmdExec.cc:556 msgid "Interrupt" msgstr "中斷" -#: src/CmdExec.cc:620 +#: src/CmdExec.cc:621 #, c-format msgid "Warning: discarding incomplete command\n" msgstr "警告：忽略不完整的指令\n" -#: src/CmdExec.cc:714 +#: src/CmdExec.cc:715 #, c-format msgid "\tExecuting builtin `%s' [%s]\n" msgstr "\t執行內建的 ‘%s’ [%s]\n" -#: src/CmdExec.cc:720 +#: src/CmdExec.cc:721 msgid "Queue is stopped." msgstr "佇列已停止。" -#: src/CmdExec.cc:725 +#: src/CmdExec.cc:726 msgid "Now executing:" msgstr "現在執行：" -#: src/CmdExec.cc:738 +#: src/CmdExec.cc:739 #, c-format msgid "\tWaiting for job [%d] to terminate\n" msgstr "\t等待工作 [%d] 終止\n" -#: src/CmdExec.cc:743 +#: src/CmdExec.cc:744 #, c-format msgid "\tWaiting for termination of jobs: " msgstr "\t等待工作終止：" -#: src/CmdExec.cc:754 +#: src/CmdExec.cc:755 #, c-format msgid "\tRunning\n" msgstr "\t正在執行\n" -#: src/CmdExec.cc:758 +#: src/CmdExec.cc:759 #, c-format msgid "\tWaiting for command\n" msgstr "\t等待輸入指令\n" -#: src/CmdExec.cc:1224 +#: src/CmdExec.cc:1225 #, c-format msgid "%s: command `%s' is not compiled in.\n" msgstr "%s：編譯程式時沒有包括指令 ‘%s’ 的支援。\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/lftp-4.1.0/src/ChangeLog new/lftp-4.1.1/src/ChangeLog --- old/lftp-4.1.0/src/ChangeLog 2010-11-22 08:46:50.000000000 +0100 +++ new/lftp-4.1.1/src/ChangeLog 2010-11-24 08:48:09.000000000 +0100 @@ -1,3 +1,12 @@ +2010-11-24 Alexander V. Lukyanov <lav(a)yars.free.net> + + * CmdExec.cc: fixed setting of cmdline in new jobs. + * Torrent.cc, lftp_rl.c, xstring.cc: fixed warnings + (patch from Openwall, Alexander Peslyak). + * complete.cc: use CmdExec::is_space for parsing. + * xstring.h: fixed compilation with non-gcc and old gcc compilers + (patch from Openwall, Alexander Peslyak). + 2010-11-22 Alexander V. Lukyanov <lav(a)yars.free.net> * MirrorJob.cc, SleepJob.cc: use parse_datetime instead of obsolete 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/lftp-4.1.0/src/CmdExec.cc new/lftp-4.1.1/src/CmdExec.cc --- old/lftp-4.1.0/src/CmdExec.cc 2010-11-22 08:47:23.000000000 +0100 +++ new/lftp-4.1.1/src/CmdExec.cc 2010-11-24 08:46:44.000000000 +0100 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: CmdExec.cc,v 1.149 2010/11/22 07:47:23 lav Exp $ */ +/* $Id: CmdExec.cc,v 1.150 2010/11/24 07:46:44 lav Exp $ */ #include <config.h> #include <stddef.h> @@ -238,8 +238,11 @@ return; } RevertToSavedSession(); - if(new_job) + if(new_job) { + if(!new_job->cmdline) + new_job->cmdline.set_allocated(cmdline.borrow()); AddNewJob(new_job); + } } } @@ -247,8 +250,6 @@ { if(new_job->jobno<0) new_job->AllocJobno(); - if(!new_job->cmdline) - new_job->cmdline.set(cmdline); new_job->SetParentFg(this,!background); AddWaiting(new_job); if(background) { 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/lftp-4.1.0/src/complete.cc new/lftp-4.1.1/src/complete.cc --- old/lftp-4.1.0/src/complete.cc 2008-11-27 06:56:35.000000000 +0100 +++ new/lftp-4.1.1/src/complete.cc 2010-11-24 08:46:45.000000000 +0100 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: complete.cc,v 1.79 2008/11/27 05:56:35 lav Exp $ */ +/* $Id: complete.cc,v 1.80 2010/11/24 07:46:45 lav Exp $ */ #include <config.h> @@ -377,7 +377,7 @@ if((*p=='>' || *p=='|') && !lftp_char_is_quoted(cmd,p-cmd)) return LOCAL; - if(!isspace((unsigned char)*p)) + if(!CmdExec::is_space(*p)) break; } @@ -428,24 +428,24 @@ int second_start=-1; for(int i=start; i>4; i--) { - if(!isspace(rl_line_buffer[i-1])) + if(!CmdExec::is_space(rl_line_buffer[i-1])) break; - if(!strncmp(rl_line_buffer+i-3,"-o",2) && isspace(rl_line_buffer[i-4])) + if(!strncmp(rl_line_buffer+i-3,"-o",2) && CmdExec::is_space(rl_line_buffer[i-4])) { was_o=true; break; } - if(!strncmp(rl_line_buffer+i-3,"-N",2) && isspace(rl_line_buffer[i-4])) + if(!strncmp(rl_line_buffer+i-3,"-N",2) && CmdExec::is_space(rl_line_buffer[i-4])) { was_N=true; break; } - if(i-14 >= 0 && !strncmp(rl_line_buffer+i-13, "--newer-than",12) && isspace(rl_line_buffer[i-14])) + if(i-14 >= 0 && !strncmp(rl_line_buffer+i-13, "--newer-than",12) && CmdExec::is_space(rl_line_buffer[i-14])) { was_N=true; break; } - if(!strncmp(rl_line_buffer+i-3,"-O",2) && isspace(rl_line_buffer[i-4])) + if(!strncmp(rl_line_buffer+i-3,"-O",2) && CmdExec::is_space(rl_line_buffer[i-4])) { was_O=true; break; 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/lftp-4.1.0/src/lftp_rl.c new/lftp-4.1.1/src/lftp_rl.c --- old/lftp-4.1.0/src/lftp_rl.c 2009-11-17 09:18:37.000000000 +0100 +++ new/lftp-4.1.1/src/lftp_rl.c 2010-11-24 08:46:45.000000000 +0100 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: lftp_rl.c,v 1.19 2009/11/17 08:18:37 lav Exp $ */ +/* $Id: lftp_rl.c,v 1.20 2010/11/24 07:46:45 lav Exp $ */ #include <config.h> #include <stdio.h> @@ -157,11 +157,11 @@ rl_attempted_completion_function =attempted_completion_function; rl_getc_function =getc_function; rl_completer_quote_characters =completer_quote_characters; - rl_completer_word_break_characters=completer_word_break_characters; + rl_completer_word_break_characters=(char*)completer_word_break_characters; rl_filename_quote_characters =filename_quote_characters; rl_filename_quoting_function =filename_quoting_function; - rl_filename_dequoting_function =filename_dequoting_function; - rl_char_is_quoted_p =char_is_quoted_p; + rl_filename_dequoting_function =(rl_dequote_func_t*)filename_dequoting_function; + rl_char_is_quoted_p =(rl_linebuf_func_t*)char_is_quoted_p; rl_completion_display_matches_hook = lftp_rl_display_match_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/lftp-4.1.0/src/Torrent.cc new/lftp-4.1.1/src/Torrent.cc --- old/lftp-4.1.0/src/Torrent.cc 2010-11-22 08:47:25.000000000 +0100 +++ new/lftp-4.1.1/src/Torrent.cc 2010-11-24 08:46:45.000000000 +0100 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: Torrent.cc,v 1.39 2010/11/22 07:47:25 lav Exp $ */ +/* $Id: Torrent.cc,v 1.40 2010/11/24 07:46:45 lav Exp $ */ #include <config.h> #include <stdlib.h> @@ -1124,7 +1124,7 @@ max_idle.toString(TimeInterval::TO_STR_TERSE+TimeInterval::TO_STR_TRANSLATE)); peers.chop(); if(max_idle<60) - decline_timer.Set(60-max_idle); + decline_timer.Set(60-max_idle.Seconds()); } } peers.qsort(complete ? PeersCompareSendRate : PeersCompareRecvRate); @@ -1226,13 +1226,13 @@ int Torrent::PeerBytesAllowed(const TorrentPeer *peer,RateLimit::dir_t dir) { float peer_rate=(dir==RateLimit::GET ? peer->peer_send_rate : peer->peer_recv_rate).Get(); - float rate=(dir==RateLimit::GET ? send_rate : recv_rate).Get(); - int min_rate = 1000; + float total_rate=(dir==RateLimit::GET ? send_rate : recv_rate).Get(); + const int min_rate = 1024; // the more is the opposite rate the more rate allowed, with a minimum - int bytes = rate_limit.BytesAllowed(dir); - bytes *= (peer_rate + min_rate); - bytes /= (rate + active_peers_count*min_rate); - return bytes; + float bytes = rate_limit.BytesAllowed(dir); + bytes *= (peer_rate + min_rate) + / (total_rate + active_peers_count*min_rate); + return (int)bytes; } void Torrent::PeerBytesUsed(int b,RateLimit::dir_t dir) { 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/lftp-4.1.0/src/xstring.cc new/lftp-4.1.1/src/xstring.cc --- old/lftp-4.1.0/src/xstring.cc 2009-12-18 18:00:12.000000000 +0100 +++ new/lftp-4.1.1/src/xstring.cc 2010-11-24 08:46:45.000000000 +0100 @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: xstring.cc,v 1.26 2009/12/18 17:00:12 lav Exp $ */ +/* $Id: xstring.cc,v 1.27 2010/11/24 07:46:45 lav Exp $ */ #include <config.h> #include <string.h> @@ -379,7 +379,7 @@ buf.appendf("%02X",(unsigned char)*s++); buf.append('>'); } else { - buf.appendf("<long binary, %d bytes>",length()); + buf.appendf("<long binary, %d bytes>",(int)length()); } } else { while(len>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/lftp-4.1.0/src/xstring.h new/lftp-4.1.1/src/xstring.h --- old/lftp-4.1.0/src/xstring.h 2010-06-07 11:11:03.000000000 +0200 +++ new/lftp-4.1.1/src/xstring.h 2010-11-24 08:02:04.000000000 +0100 @@ -104,7 +104,7 @@ const char *set(const char *s) { return xstrset(buf,s); } const char *nset(const char *s,int n) { return xstrset(buf,s,n); } const char *set_allocated(char *s) { xfree(buf); return buf=s; } - const char *vset(...) __attribute__((sentinel)); + const char *vset(...) ATTRIBUTE_SENTINEL; void truncate(size_t n) { if(buf) buf[n]=0; } char *borrow() { return replace_value(buf,(char*)0); } bool eq(const char *s) { return !xstrcmp(buf,s); } @@ -164,8 +164,8 @@ xstring& append(const xstring &s) { return append(s.get(),s.length()); } xstring& append_padding(int len,char ch); xstring& vappend(va_list); - xstring& vappend(...) __attribute__((sentinel)); - xstring& vset(...) __attribute__((sentinel)); + xstring& vappend(...) ATTRIBUTE_SENTINEL; + xstring& vset(...) ATTRIBUTE_SENTINEL; xstring& vsetf(const char *fmt, va_list ap) { truncate(0); return vappendf(fmt,ap); } xstring& setf(const char *fmt,...) PRINTF_LIKE(2,3); xstring& vappendf(const char *fmt, va_list ap); @@ -175,7 +175,7 @@ static xstring& get_tmp(const char *s,int n) { return get_tmp().nset(s,n); } static xstring& vformat(const char *fmt,va_list ap) { return get_tmp().vsetf(fmt,ap); } static xstring& format(const char *fmt,...) PRINTF_LIKE(1,2); - static xstring& cat(const char *first,...) __attribute__((sentinel)); + static xstring& cat(const char *first,...) ATTRIBUTE_SENTINEL; static xstring& join(const char *sep,int n,...); void truncate(size_t n); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon Nov 29 12:23:58 CET 2010. -------- --- kiwi/kiwi.changes 2010-11-19 16:31:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2010-11-26 15:51:23.000000000 +0100 @@ -1,0 +2,145 @@ +Fri Nov 26 15:42:17 CET 2010 - ms(a)suse.de + +- v4.66 released + +------------------------------------------------------------------- +Fri Nov 26 15:41:36 CET 2010 - ms(a)suse.de + +- fixed use of undefined value as an ARRAY reference + +------------------------------------------------------------------- +Fri Nov 26 14:50:40 CET 2010 - ms(a)suse.de + +- removed unused cleanInitrd() function + +------------------------------------------------------------------- +Fri Nov 26 11:12:27 CET 2010 - ms(a)suse.de + +- make sure bootstrap packages are handled when using a cache +- fixed time when KIWIImage.pm mounts the overlay and provide + a function getImageTree() which returns the currently used + root tree. Move the recovery creation, profile update, and + cleanup after the KIWIImage module creation + +------------------------------------------------------------------- +Fri Nov 26 00:52:00 CET 2010 - ms(a)suse.de + +- fixed overlay setup for KIWIBoot modules. Only if a cow + file exists in the given system image path it's required to + setup the overlay mount + +------------------------------------------------------------------- +Fri Nov 26 00:45:52 CET 2010 - ms(a)suse.de + +- don't create new kiwi object if there is already one available + +------------------------------------------------------------------- +Thu Nov 25 17:27:56 CET 2010 - ms(a)suse.de + +- check image type only if a preferences section is present + +------------------------------------------------------------------- +Thu Nov 25 17:25:32 CET 2010 - ms(a)suse.de + +- fixed profile check in create mode + +------------------------------------------------------------------- +Thu Nov 25 16:09:29 CET 2010 - ms(a)suse.de + +- cleanup xenconfig setup by removing conditions that no longer apply + due to the removal of the xen image type which is now handled + by the vmx/oem type flavoured with xen and xenk profiles + +------------------------------------------------------------------- +Thu Nov 25 16:02:59 CET 2010 - ms(a)suse.de + +- make sure the package manager is added only once to the + list when in --info mode + +------------------------------------------------------------------- +Thu Nov 25 15:56:42 CET 2010 - ms(a)suse.de + +- fixed dumpsolv regexp which searches for pattern names + +------------------------------------------------------------------- +Thu Nov 25 15:42:02 CET 2010 - ms(a)suse.de + +- fixed creation of boot image caches. It's required to prevent + the kernel extraction from the cache because this is done in + the preparation process which uses the cache + +- don't allow logfile option when in init-cache mode. This is + because each cache has its own logfile living in the cache + directory + +------------------------------------------------------------------- +Thu Nov 25 12:48:17 CET 2010 - ms(a)suse.de + +- fixed minor code duplication inside the RNC schema + +------------------------------------------------------------------- +Thu Nov 25 12:02:42 CET 2010 - ms(a)suse.de + +- deactivate compression for clicfs caches (faster) +- fixed and cleaned up profile evaluation and use + +------------------------------------------------------------------- +Thu Nov 25 11:43:17 CET 2010 - adrian(a)suse.de + + make "mk_listings" call during product generation optional + +------------------------------------------------------------------- +Thu Nov 25 09:50:18 CET 2010 - ms(a)suse.de + +- explicitly call SuSEconfig --module permissions. This module + is no longer called by the default SuSEconfig call so we need + to call it directly + +------------------------------------------------------------------- +Wed Nov 24 15:20:26 CET 2010 - ms(a)suse.de + +- added the following consistency checks: +* only 1 profile may be marked as default via import="true" +* only 1 type per <preference> spec may be set as default via primary="true" +* only 1 <preference> spec may reference 1 <profile> +* only 1 <preference> specification without a profiles=... attribute +* check that all references used via profiles="aName" attribute have + a definition of <profile name="aName".../> + +------------------------------------------------------------------- +Wed Nov 24 14:15:20 CET 2010 - ms(a)suse.de + +- require specific clicfs version because the version before + has severe problems when writing to a cow file + +------------------------------------------------------------------- +Tue Nov 23 13:04:06 CET 2010 - ms(a)suse.de + +- don't preserve rpm database on recovery. This could cause + an inconsistent rpm database. Not preserving it could cause + an incomplete but consistent database which is better. For + reference a copy of the old database is stored in + /var/lib/rpm.backup + +------------------------------------------------------------------- +Mon Nov 22 16:39:22 CET 2010 - ms(a)suse.de + +- follow up: make sure system filesystems and mount options corresponds + with the default settings we use in a standard installation with yast + +------------------------------------------------------------------- +Mon Nov 22 16:10:47 CET 2010 - ms(a)suse.de + +- fixed cleanImage() function to cleanly umount partitions before + calling init. Also make sure cleanImage reports its actions + as part of the boot.kiwi logfile + +- make sure system filesystems and mount options corresponds with + the default settings we use in a standard installation with yast + +------------------------------------------------------------------- +Mon Nov 22 14:58:12 CET 2010 - ms(a)suse.de + +- fixed typo in option description + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.t9k7oK/_old 2010-11-29 12:22:39.000000000 +0100 +++ /var/tmp/diff_new_pack.t9k7oK/_new 2010-11-29 12:22:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 4.65) +# spec file for package kiwi (Version 4.66) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -56,11 +56,11 @@ %ifarch %ix86 x86_64 Requires: master-boot-code %if %{suse_version} > 1110 -Requires: clicfs +Requires: clicfs >= 1.3.8 %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.65 +Version: 4.66 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: byte 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2010-11-19 16:26:02.000000000 +0100 +++ new/kiwi/kiwi.pl 2010-11-26 15:48:16.000000000 +0100 @@ -46,7 +46,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "4.65"; +our $Version = "4.66"; our $Publisher = "SUSE LINUX Products GmbH"; our $Preparer = "KIWI - http://kiwi.berlios.de"; our $openSUSE = "http://download.opensuse.org"; @@ -368,6 +368,14 @@ my $code = kiwiExit (1); return $code; } my %type = %{$xml->getImageTypeAndAttributes()}; + if ($type{type} eq "cpio") { + # /.../ + # set a faked 'clicfs' image type for cpio images to prevent + # the kernel extraction from the cache image + # ---- + $xml -> setImageType ("clicfs"); + %type = %{$xml->getImageTypeAndAttributes()}; + } #========================================== # Create cache(s)... #------------------------------------------ @@ -399,53 +407,9 @@ } my %type = %{$xml->getImageTypeAndAttributes()}; #========================================== - # Check for bootprofile in xml descr. + # print boot theme information #------------------------------------------ - if (! @Profiles) { - if ($type{"type"} eq "cpio") { - if ($type{bootprofile}) { - push @Profiles, split (/,/,$type{bootprofile}); - } - if ($type{bootkernel}) { - push @Profiles, split (/,/,$type{bootkernel}); - } - } - } - #========================================== - # Check for bootkernel in xml descr. - #------------------------------------------ if ($type{"type"} eq "cpio") { - my %phash = (); - my $found = 0; - my @pname = $xml -> getProfiles(); - foreach my $profile (@pname) { - my $name = $profile -> {name}; - my $descr= $profile -> {description}; - if ($descr =~ /KERNEL:/) { - $phash{$name} = $profile -> {description}; - } - } - foreach my $profile (@Profiles) { - if ($phash{$profile}) { - # /.../ - # ok, a kernel from the profile list is - # already selected - # ---- - $found = 1; - last; - } - } - if (! $found) { - # /.../ - # no kernel profile selected use standard (std) - # profile which is defined in each boot image - # description - # ---- - push @Profiles, "std"; - } - if (! $xml -> checkProfiles (\@Profiles)) { - my $code = kiwiExit (1); return $code; - } my $theme = $xml -> getBootTheme(); if ($theme) { $kiwi -> info ("Using boot theme: $theme"); @@ -540,14 +504,12 @@ $kiwi -> failed (); my $code = kiwiExit (1); return $code; } - if (! defined $CacheRoot) { - if (! defined $root -> init ()) { - $kiwi -> error ("Base initialization failed"); - $kiwi -> failed (); - $root -> copyBroken(); - undef $root; - my $code = kiwiExit (1); return $code; - } + if (! defined $root -> init ()) { + $kiwi -> error ("Base initialization failed"); + $kiwi -> failed (); + $root -> copyBroken(); + undef $root; + my $code = kiwiExit (1); return $code; } #========================================== # Check for pre chroot call @@ -618,37 +580,16 @@ my $code = kiwiExit (1); return $code; } #========================================== - # Check for bootprofile in xml descr + # Process system image description #------------------------------------------ - my $xml; - my %attr; - my $origcreate = $Create; - if (! @Profiles) { - $kiwi -> info ("Reading image description [Create]...\n"); - $xml = new KIWIXML ( - $kiwi,"$Create/image",\%ForeignRepo,$SetImageType - ); - if (! defined $xml) { - my $code = kiwiExit (1); return $code; - } - %attr = %{$xml->getImageTypeAndAttributes()}; - if (($attr{"type"} eq "cpio") && ($attr{bootprofile})) { - @Profiles = split (/,/,$attr{bootprofile}); - if (! $xml -> checkProfiles (\@Profiles)) { - my $code = kiwiExit (1); return $code; - } - } - } + $kiwi -> info ("Reading image description [Create]...\n"); + my $xml = new KIWIXML ( + $kiwi,"$Create/image",\%ForeignRepo,$SetImageType,\@Profiles + ); if (! defined $xml) { - $kiwi -> info ("Reading image description [Create]...\n"); - $xml = new KIWIXML ( - $kiwi,"$Create/image",undef,$SetImageType,\@Profiles - ); - if (! defined $xml) { - my $code = kiwiExit (1); return $code; - } - %attr = %{$xml->getImageTypeAndAttributes()}; + my $code = kiwiExit (1); return $code; } + my %attr = %{$xml->getImageTypeAndAttributes()}; #========================================== # Check for default destination in XML #------------------------------------------ @@ -768,26 +709,27 @@ undef $main::Upgrade; } #========================================== - # Check for overlay structure + # Create KIWIImage object #------------------------------------------ - my $overlay = new KIWIOverlay ( - $kiwi,$Create,$CacheRoot,$CacheRootMode + $image = new KIWIImage ( + $kiwi,$xml,$Create,$Destination,$StripImage, + "/base-system",$Create ); - if (! defined $overlay) { - my $code = kiwiExit (1); return $code; - } - $Create = $overlay -> mountOverlay(); - if (! defined $Create) { + if (! defined $image) { my $code = kiwiExit (1); return $code; } #========================================== + # Obtain currently used image tree path + #------------------------------------------ + my $tree = $image -> getImageTree(); + #========================================== # Cleanup the tree according to prev runs #------------------------------------------ - if (-f "$Create/rootfs.tar") { - qxx ("rm -f $Create/rootfs.tar"); + if (-f "$tree/rootfs.tar") { + qxx ("rm -f $tree/rootfs.tar"); } - if (-f "$Create/recovery.tar.gz") { - qxx ("rm -f $Create/recovery.*"); + if (-f "$tree/recovery.tar.gz") { + qxx ("rm -f $tree/recovery.*"); } #========================================== # Update .profile env, current type @@ -795,7 +737,7 @@ $kiwi -> info ("Updating type in .profile environment"); my $type = $attr{type}; qxx ( - "sed -i -e 's#kiwi_type=.*#kiwi_type=\"$type\"#' $Create/.profile" + "sed -i -e 's#kiwi_type=.*#kiwi_type=\"$type\"#' $tree/.profile" ); $kiwi -> done(); #========================================== @@ -803,7 +745,7 @@ #------------------------------------------ if ($type eq "oem") { my $configure = new KIWIConfigure ( - $kiwi,$xml,$Create,$Create."/image",$Destination + $kiwi,$xml,$tree,$tree."/image",$Destination ); if (! defined $configure) { my $code = kiwiExit (1); return $code; @@ -813,21 +755,6 @@ } } #========================================== - # Close overlay mount if active - #------------------------------------------ - undef $overlay; - $Create = $origcreate; - #========================================== - # Create KIWIImage object - #------------------------------------------ - $image = new KIWIImage ( - $kiwi,$xml,$Create,$Destination,$StripImage, - "/base-system",$Create - ); - if (! defined $image) { - my $code = kiwiExit (1); return $code; - } - #========================================== # Initialize logical image extend #------------------------------------------ my $ok; @@ -1508,6 +1435,11 @@ $kiwi -> failed (); my $code = kiwiExit (1); return $code; } + if (($InitCache) && ($LogFile)) { + $kiwi -> warning ("Logfile option not supported in init-cache mode"); + $kiwi -> skipped (); + undef $LogFile; + } if (($targetDevice) && (! -b $targetDevice)) { $kiwi -> error ("Target device $targetDevice doesn't exist"); $kiwi -> failed (); @@ -1601,7 +1533,7 @@ print " kiwi -c | --create <image-root> -d <destination>\n"; print " [ --type <image-type> ]\n"; print "Image Cache:\n"; - print " kiwi --image-cache <image-path>\n"; + print " kiwi --init-cache <image-path>\n"; print " [ --cache <dir> ]\n"; print "Image Upgrade:\n"; print " kiwi -u | --upgrade <image-root>\n"; @@ -1832,7 +1764,9 @@ #========================================== # Create log object #------------------------------------------ - $kiwi = new KIWILog("tiny"); + if (! defined $kiwi) { + $kiwi = new KIWILog("tiny"); + } #========================================== # Setup logging location #------------------------------------------ @@ -2979,7 +2913,9 @@ my $name = $xml -> getImageName(); if (($type{boot}) && ($type{boot} =~ /.*\/(.*)/)) { $CacheDistro = $1; - } elsif (($type{type} eq "cpio") && ($name =~ /initrd-.*boot-(.*)/)) { + } elsif ( + ($type{type} =~ /clicfs|cpio/) && ($name =~ /initrd-.*boot-(.*)/) + ) { $CacheDistro = $1; } else { $kiwi -> warning ("Can't setup cache without a boot type"); @@ -3160,6 +3096,7 @@ #========================================== # Variable setup and reset function #------------------------------------------ + $ENV{MKCLICFS_COMPRESSION} = 0; sub reset_sub { my $backupSurvive = $main::Survive; my @backupProfiles = @main::Profiles; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2010-11-19 15:29:38.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2010-11-26 15:48:16.000000000 +0100 @@ -106,7 +106,7 @@ $kiwi -> error ("Couldn't find image file/directory: $system"); $kiwi -> failed (); return undef; - } else { + } elsif (-f "$system/kiwi-root.cow") { #========================================== # Check for overlay structure #------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2010-08-10 13:43:44.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2010-11-26 15:48:16.000000000 +0100 @@ -1757,22 +1757,24 @@ $this->createBootPackageLinks(); ## step 9: LISTINGS - $this->logMsg("I", "Calling mk_listings:"); - my $listings = "/usr/bin/mk_listings"; - if(! (-f $listings or -x $listings)) { - $this->logMsg("W", "[createMetadata] excutable `$listings` not found. Maybe package `inst-source-utils` is not installed?"); - return; + my $make_listings = $this->{m_proddata}->getVar("MAKE_LISTINGS"); + unless (defined($make_listings) && $make_listings eq "false") { + $this->logMsg("I", "Calling mk_listings:"); + my $listings = "/usr/bin/mk_listings"; + if(! (-f $listings or -x $listings)) { + $this->logMsg("W", "[createMetadata] excutable `$listings` not found. Maybe package `inst-source-utils` is not installed?"); + return; + } + my $cmd = "$listings ".$this->{m_basesubdir}->{'1'}; + @data = qx($cmd); + undef $cmd; + $this->logMsg("I", "[createMetadata] $listings output:"); + foreach(@data) { + chomp $_; + $this->logMsg("I", "\t$_"); + } + @data = (); # clear list } - my $cmd = "$listings ".$this->{m_basesubdir}->{'1'}; - @data = qx($cmd); - undef $cmd; - $this->logMsg("I", "[createMetadata] $listings output:"); - foreach(@data) { - chomp $_; - $this->logMsg("I", "\t$_"); - } - @data = (); # clear list - ## step 7: SHA1SUMS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2010-11-19 15:29:38.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2010-11-26 15:48:16.000000000 +0100 @@ -339,6 +339,10 @@ # SuSEconfig #-------------------------------------- /sbin/SuSEconfig + #====================================== + # SuSEconfig permissions + #-------------------------------------- + SuSEconfig --module permissions } #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2010-11-19 15:29:38.000000000 +0100 +++ new/kiwi/modules/KIWIImageFormat.pm 2010-11-26 15:48:16.000000000 +0100 @@ -183,13 +183,8 @@ $kiwi -> skipped (); return undef; } - if (($type{type}) && ($type{type} eq "xen")) { - $kiwi -> info ("Starting $imgtype image machine configuration\n"); - return $this -> createXENConfiguration(); - } elsif ( - ($type{bootprofile}) && ($type{bootprofile} eq "xen") && - ($xend eq "domU") - ) { + if (($type{bootprofile}) && ($type{bootprofile} eq "xen") + && ($xend eq "domU")) { $kiwi -> info ("Starting $imgtype image machine configuration\n"); return $this -> createXENConfiguration(); } elsif ($format eq "vmdk") { @@ -503,29 +498,16 @@ my $device = $xenconfig{xen_diskdevice}; $device =~ s/\/dev\///; my $part = $device."1"; - if ($type{type} eq "xen") { - $device = $device."1"; - } my $memory = $xenconfig{xen_memory}; - if ($type{type} ne "xen") { - $image .= ".".$format; - } + $image .= ".".$format; print $FD '# -*- mode: python; -*-'."\n"; print $FD "name=\"".$this->{xml}->getImageDisplayName()."\"\n"; - if ($type{type} eq "xen") { - print $FD 'kernel="'.$kernel.'"'."\n"; - print $FD 'ramdisk="'.$initrd.'"'."\n"; - } print $FD 'memory='.$memory."\n"; - if ($type{type} ne "xen") { - my $tap = $format; - if ($tap eq "raw") { - $tap = "aio"; - } - print $FD 'disk=[ "tap:'.$tap.':'.$image.','.$device.',w" ]'."\n"; - } else { - print $FD 'disk=[ "file:'.$image.','.$part.',w" ]'."\n"; + my $tap = $format; + if ($tap eq "raw") { + $tap = "aio"; } + print $FD 'disk=[ "tap:'.$tap.':'.$image.','.$device.',w" ]'."\n"; #========================================== # network setup #------------------------------------------ @@ -553,12 +535,6 @@ print $FD " ]"."\n"; } #========================================== - # kernel boot parameters - #------------------------------------------ - if ($type{type} eq "xen") { - print $FD 'root="'.$part.' rw"'."\n"; - } - #========================================== # Process raw config options #------------------------------------------ my @userOptSettings; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm --- old/kiwi/modules/KIWIImage.pm 2010-11-19 15:29:38.000000000 +0100 +++ new/kiwi/modules/KIWIImage.pm 2010-11-26 15:48:16.000000000 +0100 @@ -118,6 +118,10 @@ $this->{baseSystem} = $baseSystem; $this->{arch} = $arch; #========================================== + # Mount overlay tree if required... + #------------------------------------------ + $this -> setupOverlay(); + #========================================== # Store a disk label ID for this object #------------------------------------------ $this -> getMBRDiskLabel(); @@ -129,6 +133,19 @@ } #========================================== +# getImageTree +#------------------------------------------ +sub getImageTree { + # ... + # return current value of system image tree. Normally + # this is the same as given in the module parameter list + # but in case of an overlay cache mount the path changes + # --- + my $this = shift; + return $this->{imageTree} +} + +#========================================== # setupOverlay #------------------------------------------ sub setupOverlay { @@ -2817,10 +2834,6 @@ my $haveExtend = shift; my $quiet = shift; #========================================== - # Mount overlay tree if required... - #------------------------------------------ - $this -> setupOverlay(); - #========================================== # Get image creation date and name #------------------------------------------ my $name = $this -> buildImageName (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2010-11-19 15:29:38.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2010-11-26 15:48:16.000000000 +0100 @@ -2085,9 +2085,11 @@ local nfstab=$prefix/etc/fstab mkdir -p $prefix/etc cat > $nfstab < /dev/null - echo "devpts /dev/pts devpts mode=0620,gid=5 0 0" >> $nfstab - echo "proc /proc proc defaults 0 0" >> $nfstab - echo "sysfs /sys sysfs noauto 0 0" >> $nfstab + echo "devpts /dev/pts devpts mode=0620,gid=5 0 0" >> $nfstab + echo "proc /proc proc defaults 0 0" >> $nfstab + echo "sysfs /sys sysfs noauto 0 0" >> $nfstab + echo "debugfs /sys/kernel/debug debugfs noauto 0 0" >> $nfstab + echo "usbfs /proc/bus/usb usbfs noauto 0 0" >> $nfstab } #====================================== # updateRootDeviceFstab @@ -2111,9 +2113,9 @@ # check for device by ID #-------------------------------------- if [ -z "$UNIONFS_CONFIG" ]; then - echo "$diskByID / $FSTYPE defaults 0 0" >> $nfstab + echo "$diskByID / $FSTYPE defaults 1 1" >> $nfstab else - echo "/dev/root / defaults 0 0" >> $nfstab + echo "/dev/root / defaults 1 1" >> $nfstab fi #====================================== # check for LVM volume setup @@ -2130,7 +2132,7 @@ [ ! $volume = "Comp" ] && \ [ ! $volume = "Swap" ] then - echo "/dev/$VGROUP/LV$volume /$mpoint $FSTYPE defaults 0 0" \ + echo "/dev/$VGROUP/LV$volume /$mpoint $FSTYPE defaults 1 1" \ >> $nfstab fi done @@ -2147,7 +2149,7 @@ local sdev=$2 local diskByID=`getDiskID $sdev` local nfstab=$prefix/etc/fstab - echo "$diskByID swap swap pri=42 0 0" >> $nfstab + echo "$diskByID swap swap defaults 0 0" >> $nfstab } #====================================== # updateLVMBootDeviceFstab @@ -2175,7 +2177,7 @@ if [ -z "$FSTYPE" ] || [ "$FSTYPE" = "unknown" ];then FSTYPE="auto" fi - echo "$diskByID $mount $FSTYPE defaults 0 0" >> $nfstab + echo "$diskByID $mount $FSTYPE defaults 1 2" >> $nfstab echo "$mount/boot /boot none bind 0 0" >> $nfstab if [ ! -z "$FSTYPE_SAVE" ];then FSTYPE=$FSTYPE_SAVE @@ -2218,9 +2220,9 @@ local diskByID=`getDiskID $sdev` local nfstab=$prefix/etc/fstab if [ $loader = "syslinux" ];then - echo "$diskByID /syslboot vfat defaults 0 0" >> $nfstab + echo "$diskByID /syslboot vfat defaults 1 2" >> $nfstab else - echo "$diskByID /syslboot ext2 defaults 0 0" >> $nfstab + echo "$diskByID /syslboot ext2 defaults 1 2" >> $nfstab fi echo "/syslboot/boot /boot none bind 0 0" >> $nfstab } @@ -2256,7 +2258,7 @@ then device=$(ddn $DISK $count) probeFileSystem $device - echo "$device $partMount $FSTYPE defaults 1 1" >> $nfstab + echo "$device $partMount $FSTYPE defaults 0 0" >> $nfstab fi done } @@ -4299,38 +4301,6 @@ rm -rf $tmpdir } #====================================== -# cleanInitrd -#-------------------------------------- -function cleanInitrd { - cp /usr/bin/chroot /bin - cp /sbin/halt /bin/reboot - if [ -x /usr/sbin/klogconsole ];then - cp /usr/sbin/klogconsole /bin - fi - for dir in /*;do - case "$dir" in - "/lib") continue ;; - "/lib64") continue ;; - "/bin") continue ;; - "/mnt") continue ;; - "/read-only") continue ;; - "/read-write") continue ;; - "/xino") continue ;; - "/dev") continue ;; - esac - rm -rf $dir/* &>/dev/null - done - if test -L /read-only;then - rm -f /read-only - fi - if test -L /read-write;then - rm -f /read-write - fi - # mount opens fstab so we give them one - touch /etc/fstab - hash -r -} -#====================================== # searchGroupConfig #-------------------------------------- function searchGroupConfig { @@ -4958,6 +4928,11 @@ # is called # ---- #====================================== + # setup logging in this mode + #-------------------------------------- + exec 2>>$ELOG_FILE + set -x + #====================================== # kill second utimer and tail #-------------------------------------- . /iprocs @@ -4991,22 +4966,37 @@ return fi #====================================== - # umount LVM root parts lazy + # umount LVM root parts #-------------------------------------- - if [ "$haveLVM" = "yes" ]; then - for i in /dev/$VGROUP/LV*;do - if [ ! -e $i ];then - continue - fi - if \ - [ ! $i = "/dev/$VGROUP/LVRoot" ] && \ - [ ! $i = "/dev/$VGROUP/LVComp" ] && \ - [ ! $i = "/dev/$VGROUP/LVSwap" ] - then - umount -l $i &>/dev/null - fi - done - fi + for i in /dev/$VGROUP/LV*;do + if [ ! -e $i ];then + continue + fi + if \ + [ ! $i = "/dev/$VGROUP/LVRoot" ] && \ + [ ! $i = "/dev/$VGROUP/LVComp" ] && \ + [ ! $i = "/dev/$VGROUP/LVSwap" ] + then + mpoint=$(echo ${i##/*/LV}) + umount $mpoint 1>&2 + fi + done + #====================================== + # umount image boot partition if any + #-------------------------------------- + for i in lvmboot btrboot clicboot xfsboot luksboot syslboot;do + if [ ! -e /$i ];then + continue + fi + umount /$i 1>&2 + done + umount /boot 1>&2 + #====================================== + # turn off swap + #-------------------------------------- + mount -t proc proc /proc + swapoff -a 1>&2 + umount /proc 1>&2 } #====================================== # bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm --- old/kiwi/modules/KIWIRoot.pm 2010-11-19 15:29:38.000000000 +0100 +++ new/kiwi/modules/KIWIRoot.pm 2010-11-26 15:48:16.000000000 +0100 @@ -337,35 +337,37 @@ # Copy/touch some defaults files #---------------------------------- $kiwi -> info ("Creating default template files for new root system"); - qxx ("mkdir -p $root/dev"); - qxx ("mkdir -m 755 -p $root/dev/pts"); - qxx ("mknod -m 666 $root/dev/null c 1 3"); - qxx ("mknod -m 666 $root/dev/zero c 1 5"); - qxx ("mknod -m 622 $root/dev/full c 1 7"); - qxx ("mknod -m 666 $root/dev/random c 1 8"); - qxx ("mknod -m 644 $root/dev/urandom c 1 9"); - qxx ("mknod -m 666 $root/dev/tty c 5 0"); - qxx ("mknod -m 666 $root/dev/ptmx c 5 2"); - qxx ("ln -s /proc/self/fd $root/dev/fd"); - qxx ("ln -s fd/2 $root/dev/stderr"); - qxx ("ln -s fd/0 $root/dev/stdin"); - qxx ("ln -s fd/1 $root/dev/stdout"); - qxx ("mknod -m 640 $root/dev/loop0 b 7 0"); - qxx ("mknod -m 640 $root/dev/loop1 b 7 1"); - qxx ("mknod -m 640 $root/dev/loop2 b 7 2"); - qxx ("mknod -m 640 $root/dev/loop3 b 7 3"); - qxx ("mkdir -p $root/etc/sysconfig"); - qxx ("mkdir -p $root/var/log/YaST2"); - # for smart we need the dpkg default file - qxx ("mkdir -p $root/var/lib/dpkg"); - qxx ("touch $root/var/lib/dpkg/status"); - qxx ("mkdir -p $root/var/lib/dpkg/updates"); - qxx ("touch $root/var/lib/dpkg/available"); - # for building in suse autobuild we need the following file - qxx ("touch $root/.buildenv"); - # need mtab at least empty for mount calls - qxx ("touch $root/etc/mtab"); - qxx ("touch $root/etc/sysconfig/bootloader"); + if (! defined $this->{cacheRoot}) { + qxx ("mkdir -p $root/dev"); + qxx ("mkdir -m 755 -p $root/dev/pts"); + qxx ("mknod -m 666 $root/dev/null c 1 3"); + qxx ("mknod -m 666 $root/dev/zero c 1 5"); + qxx ("mknod -m 622 $root/dev/full c 1 7"); + qxx ("mknod -m 666 $root/dev/random c 1 8"); + qxx ("mknod -m 644 $root/dev/urandom c 1 9"); + qxx ("mknod -m 666 $root/dev/tty c 5 0"); + qxx ("mknod -m 666 $root/dev/ptmx c 5 2"); + qxx ("ln -s /proc/self/fd $root/dev/fd"); + qxx ("ln -s fd/2 $root/dev/stderr"); + qxx ("ln -s fd/0 $root/dev/stdin"); + qxx ("ln -s fd/1 $root/dev/stdout"); + qxx ("mknod -m 640 $root/dev/loop0 b 7 0"); + qxx ("mknod -m 640 $root/dev/loop1 b 7 1"); + qxx ("mknod -m 640 $root/dev/loop2 b 7 2"); + qxx ("mknod -m 640 $root/dev/loop3 b 7 3"); + qxx ("mkdir -p $root/etc/sysconfig"); + qxx ("mkdir -p $root/var/log/YaST2"); + # for smart we need the dpkg default file + qxx ("mkdir -p $root/var/lib/dpkg"); + qxx ("touch $root/var/lib/dpkg/status"); + qxx ("mkdir -p $root/var/lib/dpkg/updates"); + qxx ("touch $root/var/lib/dpkg/available"); + # for building in suse autobuild we need the following file + qxx ("touch $root/.buildenv"); + # need mtab at least empty for mount calls + qxx ("touch $root/etc/mtab"); + qxx ("touch $root/etc/sysconfig/bootloader"); + } # need user/group files as template my $groupTemplate = "/etc/group"; my $paswdTemplate = "/etc/passwd"; @@ -396,7 +398,9 @@ #========================================== # Create package keys #------------------------------------------ - $manager -> setupPackageKeys(); + if (! defined $this->{cacheRoot}) { + $manager -> setupPackageKeys(); + } #========================================== # Setup shared cache directory #------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc --- old/kiwi/modules/KIWISchema.rnc 2010-11-19 16:26:02.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rnc 2010-11-26 15:48:16.000000000 +0100 @@ -2272,10 +2272,7 @@ "bootstrap" | "delete" | "image" | "iso" | "oem" | "pxe" | "split" | "testsuite" | "usb" | "vmx" } - k.packages.profiles.attribute = - ## Namespace this section applies to. If not specified it - ## applies to all namespaces - attribute profiles { text } + k.packages.profiles.attribute = k.profiles.attribute k.packages.patternType.attribute = ## Selection type for patterns. Could be onlyRequired ## plusSuggested or plusRecommended diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng --- old/kiwi/modules/KIWISchema.rng 2010-11-19 16:26:02.000000000 +0100 +++ new/kiwi/modules/KIWISchema.rng 2010-11-26 15:48:16.000000000 +0100 @@ -3276,10 +3276,7 @@ </attribute> </define> <define name="k.packages.profiles.attribute"> - <attribute name="profiles"> - <a:documentation>Namespace this section applies to. If not specified it -applies to all namespaces</a:documentation> - </attribute> + <ref name="k.profiles.attribute"/> </define> <define name="k.packages.patternType.attribute"> <attribute name="patternType"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2010-11-19 15:29:38.000000000 +0100 +++ new/kiwi/modules/KIWIXML.pm 2010-11-26 15:48:16.000000000 +0100 @@ -18,6 +18,7 @@ # Modules #------------------------------------------ use strict; +use warnings; require Exporter; use Carp qw (cluck); use File::Glob ':glob'; @@ -150,6 +151,12 @@ return undef; } #========================================== + # Check data consistentcy + #========================================== + if (! $this -> __validateConsistency ()) { + return undef; + } + #========================================== # Read main XML sections #------------------------------------------ my $imgnameNodeList = $systemTree -> getElementsByTagName ("image"); @@ -183,7 +190,7 @@ # Check type information from xml input #------------------------------------------ if ($optionsNodeList) { - $this -> getImageTypeAndAttributes(); + $this->{typerecord} = $this -> getImageTypeAndAttributes(); if (! $this->{typeNode}) { $kiwi -> error ("Boot type: $imageWhat not specified in xml"); $kiwi -> failed (); @@ -408,12 +415,6 @@ # Store object data (create URL list) #------------------------------------------ $this -> createURLList (); - #========================================== - # Check data consistentcy - #========================================== - if (! $this -> __validateConsistency ()) { - return undef; - } return $this; } @@ -710,6 +711,9 @@ # getImageTypeAndAttributes #------------------------------------------ sub getImageTypeAndAttributes { + # TODO + # This method is should be removed in an effort + # to remove state from the XML representation # ... # Get the image type and its attributes for beeing # able to create the appropriate logical extend @@ -1339,6 +1343,25 @@ } #========================================== +# setImageType +#------------------------------------------ +sub setImageType { + # ... + # set 'image' attribute of the selected type + # --- + my $this = shift; + my $val = shift; + my $kiwi = $this->{kiwi}; + my $tnode= $this->{typeNode}; + if ($tnode) { + $tnode-> setAttribute ("image","$val"); + } + $this->{imageWhat} = $val; + $this -> updateXML(); + return $this; +} + +#========================================== # setPackageManager #------------------------------------------ sub setPackageManager { @@ -1922,12 +1945,10 @@ my $name = $element -> getAttribute ("name"); my $desc = $element -> getAttribute ("description"); my $incl = $element -> getAttribute ("import"); - if ((defined $import) && ("$incl" ne "true")) { - next; - } my %profile = (); $profile{name} = $name; $profile{description} = $desc; + $profile{include} = $incl; push @result, { %profile }; } return @result; @@ -1937,21 +1958,60 @@ # setDefaultProfiles #------------------------------------------ sub setDefaultProfiles { + # TODO + # This method should be removed in an effort to + # remove state from the XML representattion # ... # import default profiles if no other profiles # were set on the commandline # --- - my $this = shift; - my @list = (); + my $this = shift; + my $kiwi = $this->{kiwi}; + my @list = (); + #========================================== + # check for profiles already processed + #------------------------------------------ if ((defined $this->{reqProfiles}) && (@{$this->{reqProfiles}})) { + my $info = join (",",@{$this->{reqProfiles}}); + $kiwi -> info ("Using profile(s): $info"); + $kiwi -> done (); return $this; } - my @profiles = $this -> getProfiles ("default"); + #========================================== + # read from profile section + #------------------------------------------ + my @profiles = $this -> getProfiles (); foreach my $profile (@profiles) { - push (@list,$profile->{name}); + if (($profile->{include}) && ("$profile->{include}" eq "true")) { + push (@list,$profile->{name}); + } + } + #========================================== + # read from type: bootprofile + bootkernel + #------------------------------------------ + my $record = $this -> getImageTypeAndAttributes(); + if ((defined $record->{type}) && ($record->{"type"} eq "cpio")) { + if ($record->{bootprofile}) { + push @list, split (/,/,$record->{bootprofile}); + } else { + # apply 'default' profile required for boot images + push @list, "default"; + } + if ($record->{bootkernel}) { + push @list, split (/,/,$record->{bootkernel}); + } else { + # apply 'std' kernel profile required for boot images + push @list, "std"; + } } + #========================================== + # store list + #------------------------------------------ if (@list) { + my $info = join (",",@list); + $kiwi -> info ("Using profile(s): $info"); $this->{reqProfiles} = \@list; + $kiwi -> done (); } return $this; } @@ -1991,11 +2051,6 @@ } } } - if (@prequest) { - my $info = join (",",@prequest); - $kiwi -> info ("Using profile(s): $info"); - $kiwi -> done (); - } return $this; } @@ -2008,8 +2063,9 @@ # a given element is requested to be included # in this image. # --- - my $this = shift; - my $element = shift; + my $this = shift; + my $element = shift; + if (! defined $element) { return 1; } @@ -2029,12 +2085,14 @@ foreach my $profile (@splitProfiles) { $profileHash{$profile} = 1; } - foreach my $reqprof (@{$this->{reqProfiles}}) { - # strip whitespace - $reqprof =~ s/^\s+//s; - $reqprof =~ s/\s+$//s; - if (defined $profileHash{$reqprof}) { - return 1; + if (defined $this->{reqProfiles}) { + foreach my $reqprof (@{$this->{reqProfiles}}) { + # strip whitespace + $reqprof =~ s/^\s+//s; + $reqprof =~ s/\s+$//s; + if (defined $profileHash{$reqprof}) { + return 1; + } } } return 0; @@ -2586,7 +2644,9 @@ if (@tstp) { $result{kiwi_testing} = join(" ",@tstp); } - if ((%type) && ($type{compressed} eq "true")) { + if ((%type) + && (defined $type{compressed}) + && ($type{compressed} eq "true")) { $result{kiwi_compressed} = "yes"; } if (%type) { @@ -2604,13 +2664,19 @@ if ((%type) && ($type{installboot})) { $result{kiwi_installboot} = $type{installboot}; } - if ((%type) && ($type{luks} eq "true")) { + if ((%type) + && (defined $type{luks}) + && ($type{luks} eq "true")) { $result{kiwi_luks} = "yes"; } - if ((%type) && ($type{hybrid} eq "true")) { + if ((%type) + && (defined $type{hybrid}) + && ($type{hybrid} eq "true")) { $result{kiwi_hybrid} = "yes"; } - if ((%type) && ($type{hybridpersistent} eq "true")) { + if ((%type) + && (defined $type{hybridpersistent}) + && ($type{hybridpersistent} eq "true")) { $result{kiwi_hybridpersistent} = "yes"; } if ((%type) && ($type{lvm})) { @@ -2711,17 +2777,18 @@ my $oemrecoid= $node -> getElementsByTagName ("oem-recoveryID"); my $inplace = $node -> getElementsByTagName ("oem-inplace-recovery"); if ((defined $oempinst) && ("$oempinst" eq "true")) { - $result{kiwi_oempartition_install} = "yes"; + $result{kiwi_oempartition_install} = $oempinst; } - if ((defined $oemswap) && ("$oemswap" eq "false")) { - $result{kiwi_oemswap} = "no"; - } elsif ((defined $oemswapMB) && ("$oemswapMB" > 0)) { - $result{kiwi_oemswapMB} = $oemswapMB; + if ((defined $oemswap) && ("$oemswap" eq "true")) { + $result{kiwi_oemswap} = $oemswap; + if ((defined $oemswapMB) && (int($oemswapMB) > 0)) { + $result{kiwi_oemswapMB} = $oemswapMB; + } } if ((defined $oemalign) && ("$oemalign" eq "true")) { $result{kiwi_oemalign} = $oemalign; } - if ((defined $oemrootMB) && ("$oemrootMB" > 0)) { + if ((defined $oemrootMB) && ((int "$oemrootMB") > 0)) { $result{kiwi_oemrootMB} = $oemrootMB; } if ((defined $oemtitle) && ("$oemtitle" ne "")) { @@ -3521,7 +3588,6 @@ if ($package) { push @result,$package; } - push @result,$main::PackageManager; } #========================================== # Handle pattern names @@ -3538,6 +3604,13 @@ } } } + #========================================== + # Add packagemanager in any case + #------------------------------------------ + push @result,$main::PackageManager; + #========================================== + # Run the solver... + #------------------------------------------ my $psolve = new KIWISatSolver ( $kiwi,\@result,$this->{urllist},"solve-patterns", undef,undef @@ -3550,8 +3623,9 @@ my $solf = $psolve -> getSolfile(); my @solp = $psolve -> getPackages(); my @rpat = qxx ( - "dumpsolv $solf|grep 'name: pattern'|cut -f4 -d :" + "dumpsolv $solf|grep 'solvable:name: pattern:'|cut -f4 -d :" ); + chomp @rpat; return (\%meta,\@delete,$solf,\@result,\@solp,\@rpat); } @@ -4442,6 +4516,65 @@ # Private helper methods #------------------------------------------ #========================================== +# __checkDefaultProfSetting +#------------------------------------------ +sub __checkDefaultProfSetting { + # ... + # Make sure only one profile is marked as default. + # --- + my $this = shift; + my $numDefProfs = 0; + my $systemTree = $this->{systemTree}; + my @profiles = $systemTree -> getElementsByTagName('profile'); + for my $profile (@profiles) { + my $import = $profile -> getAttribute('import'); + if (defined $import && $import eq 'true') { + $numDefProfs++; + } + if ($numDefProfs > 1) { + my $kiwi = $this->{kiwi}; + my $msg = 'Only one profile may be set as the dafault profile by ' + . 'using the "import" attrinute.'; + $kiwi -> error($msg); + $kiwi -> failed(); + return undef; + } + } + return 1; +} + +#========================================== +# __checkDefaultTypeSetting +#------------------------------------------ +sub __checkDefaultTypeSetting { + # ... + # Check that only one type is marked as primary per profile + # --- + my $this = shift; + my $systemTree = $this->{systemTree}; + my @preferences = $systemTree -> getElementsByTagName('preferences'); + for my $pref (@preferences) { + my $hasPrimary = 0; + my @types = $pref -> getChildrenByTagName('type'); + for my $typeN (@types) { + my $primary = $typeN -> getAttribute('primary'); + if (defined $primary && $primary eq 'true') { + $hasPrimary++; + } + if ($hasPrimary > 1) { + my $kiwi = $this->{kiwi}; + my $msg = 'Only one primary type my be specified per ' + . 'preferences section.'; + $kiwi -> error ($msg); + $kiwi -> failed (); + return undef; + } + } + } + return 1; +} + +#========================================== # __checkFilesysSpec #------------------------------------------ sub __checkFilesysSpec { @@ -4453,7 +4586,7 @@ my $isInvalid; my $kiwi = $this->{kiwi}; my @typeNodes = $this->{systemTree} -> getElementsByTagName("type"); - my @typesReqFS = qw /oem usb vmx/; + my @typesReqFS = qw /oem pxe usb vmx/; for my $typeN (@typeNodes) { my $imgType = $typeN -> getAttribute( "image" ); if (grep /$imgType/, @typesReqFS) { @@ -4484,8 +4617,7 @@ # --- my $this = shift; my @confNodes = $this->{systemTree} -> getElementsByTagName("oemconfig"); - if (@confNodes) { - my $oemconfig = $confNodes[0]; + for my $oemconfig (@confNodes) { my @postDumOpts = qw /oem-bootwait oem-reboot oem-reboot-interactive @@ -4515,6 +4647,83 @@ } #========================================== +# __checkPreferencesDefinition +#------------------------------------------ +sub __checkPreferencesDefinition { + # ... + # Check that only one <preference> definition exists without + # use of the profiles attribute. + # + my $this = shift; + my $kiwi = $this->{kiwi}; + my $numProfilesAttr = 0; + my $systemTree = $this->{systemTree}; + my @preferences = $systemTree -> getElementsByTagName('preferences'); + my @usedProfs = (); + for my $pref (@preferences) { + my $profName = $pref -> getAttribute('profiles'); + if (! $profName) { + $numProfilesAttr++; + } else { + if (grep /$profName/, @usedProfs) { + my $msg = 'Only one <preferences> element may reference a ' + . "given profile. $profName referenced multiple times."; + $kiwi -> error ($msg); + $kiwi -> failed (); + return undef; + } else { + push @usedProfs, $profName; + } + } + if ($numProfilesAttr > 1) { + my $msg = 'Specify only one <preferences> element without using ' + . 'the "profiles" attribute.'; + $kiwi -> error ($msg); + $kiwi -> failed(); + return undef; + } + } + return 1; +} + +#========================================== +# __checkReferencedProfDefined +#------------------------------------------ +sub __checkReferencedProfDefined { + # ... + # Check that any reference of profiles has a defined target, i.e. the + # profile must be defined + # --- + my $this = shift; + my $kiwi = $this->{kiwi}; + my $status = 1; + my $systemTree = $this->{systemTree}; + my @profiles = $systemTree -> getElementsByTagName('profile'); + my @profNames = (); + for my $prof (@profiles) { + push @profNames, $prof -> getAttribute('name'); + } + my @nodes = (); + push @nodes, $systemTree -> getElementsByTagName('drivers'); + push @nodes, $systemTree -> getElementsByTagName('packages'); + push @nodes, $systemTree -> getElementsByTagName('preferences'); + push @nodes, $systemTree -> getElementsByTagName('repository'); + for my $node (@nodes) { + my $refProf = $node -> getAttribute('profiles'); + if (defined $refProf) { + if (! grep /$refProf/, @profNames) { + my $msg = "Found reference to profile $refProf " + . 'but this profile does not exist.'; + $kiwi -> error ($msg); + $kiwi -> failed (); + $status = undef; + } + } + } + return $status; +} + +#========================================== # __checkRevision #------------------------------------------ sub __checkRevision { @@ -4523,9 +4732,11 @@ # --- my $this = shift; my $kiwi = $this->{kiwi}; + my $systemTree = $this->{systemTree}; + my $imgnameNodeList = $systemTree -> getElementsByTagName ("image"); if (open (my $FD,$main::Revision)) { my $cur_rev = <$FD>; close $FD; - my $req_rev = $this->{imgnameNodeList} + my $req_rev = $imgnameNodeList -> get_node(1) -> getAttribute ("kiwirevision"); if ((defined $req_rev) && ($cur_rev < $req_rev)) { $kiwi -> failed (); @@ -4540,9 +4751,9 @@ } #========================================== -# __checkVersionFormat +# __checkVersionDefinition #------------------------------------------ -sub __checkVersionFormat { +sub __checkVersionDefinition { # ... # Check image version format # This check should be implemented in the schema but there is a @@ -4550,7 +4761,16 @@ # --- my $this = shift; my $kiwi = $this->{kiwi}; - my $version = $this -> getImageVersion(); + my $systemTree = $this->{systemTree}; + my @versions = $systemTree -> getElementsByTagName("version"); + my $numVersions = @versions; + if ($numVersions > 1) { + my $msg = "Only one <version> definition expected, found $numVersions"; + $kiwi -> error ($msg); + $kiwi -> failed (); + return undef; + } + my $version = $versions[0] -> textContent(); if ($version !~ /^\d+\.\d+\.\d+$/) { $kiwi -> error ("Invalid version format: $version"); $kiwi -> failed (); @@ -4623,18 +4843,34 @@ # Validate XML data that cannot be validated through Schema and # structure validation. This includes conditional presence of # elements and attributes as well as certain values. + # Note that any checks need to work off $this->{systemTree}. The + # consistency check occurs prior to this object being porpulated + # with XML data. This allows us to basically have no error checking + # in any code that populates this object from XML data. # --- my $this = shift; - if (! $this -> __checkRevision()) { + if (! $this -> __checkDefaultProfSetting()) { return undef; } - if (! $this -> __checkVersionFormat()) { + if (! $this -> __checkDefaultTypeSetting()){ + return undef; + } + if (! $this -> __checkFilesysSpec()) { return undef; } if (! $this -> __checkPostDumpAction()) { return undef; } - if (! $this -> __checkFilesysSpec()) { + if (! $this -> __checkPreferencesDefinition()) { + return undef; + } + if (! $this -> __checkReferencedProfDefined()) { + return undef; + } + if (! $this -> __checkRevision()) { + return undef; + } + if (! $this -> __checkVersionDefinition()) { return undef; } return 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2010-11-19 16:26:02.000000000 +0100 +++ new/kiwi/.revision 2010-11-26 15:48:16.000000000 +0100 @@ -1 +1 @@ -965939ea277408fe99b43497dc84da20fc7b1a7c +ddd0faf5b07c2c87720543ac109b06a841825b43 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc new/kiwi/system/boot/ix86/oemboot/suse-linuxrc --- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2010-11-05 16:47:03.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2010-11-26 15:48:16.000000000 +0100 @@ -365,9 +365,9 @@ systemException "Failed to store $i" "reboot" fi done - if ! cp -a var/lib/rpm tmp/;then - rm -rf tmp/rpm; cd / ; umountSystem - systemException "Failed to store RPM database" "reboot" + if ! cp -a var/lib/rpm var/lib/rpm.backup;then + rm -rf var/lib/rpm.backup; cd / ; umountSystem + systemException "Failed to backup RPM database" "reboot" fi fi #====================================== @@ -468,12 +468,6 @@ systemException "Failed to restore $i" "reboot" fi done - mv /mnt/var/lib/rpm /mnt/var/lib/rpm.backup - if ! mv /mnt/tmp/rpm /mnt/var/lib/;then - mv /mnt/var/lib/rpm.backup /mnt/var/lib/rpm - systemException "Failed to restore RPM database" "reboot" - fi - rm -rf /mnt/var/lib/rpm.backup fi #====================================== # 16.5) restore boot files 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iputils for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package iputils for openSUSE:Factory checked in at Mon Nov 29 12:22:20 CET 2010. -------- --- iputils/iputils.changes 2010-11-19 10:55:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/iputils/iputils.changes 2010-11-24 13:16:07.000000000 +0100 @@ -6,0 +7,6 @@ +Tue Nov 16 15:41:51 UTC 2010 - lnussel(a)suse.de + +- don't verify caps as that's done by chkstat as well +- use new %set_permissions macro + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.0wjqeh/_old 2010-11-29 12:21:17.000000000 +0100 +++ /var/tmp/diff_new_pack.0wjqeh/_new 2010-11-29 12:21:17.000000000 +0100 @@ -28,7 +28,7 @@ BuildRequires: libcap-devel Summary: IPv4 and IPv6 Networking Utilities Version: s20101006 -Release: 1 +Release: 2 License: BSD3c ; GPLv2+ Group: Productivity/Networking/Other Url: http://www.skbuff.net/iputils @@ -92,11 +92,10 @@ rm -rf $RPM_BUILD_ROOT %post -%run_permissions +%set_permissions /bin/ping /bin/ping6 %verifyscript -%verify_permissions -e /bin/ping -%verify_permissions -e /bin/ping6 +%verify_permissions /bin/ping /bin/ping6 %files %defattr(-,root,root) @@ -104,8 +103,8 @@ /sbin/arping /sbin/ifenslave /sbin/clockdiff -%verify(not mode) %attr(4755,root,root) /bin/ping -%verify(not mode) %attr(4755,root,root) /bin/ping6 +%verify(not mode caps) %attr(4755,root,root) /bin/ping +%verify(not mode caps) %attr(4755,root,root) /bin/ping6 /bin/ipg /sbin/tracepath /sbin/tracepath6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit insserv for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package insserv for openSUSE:Factory checked in at Mon Nov 29 12:20:56 CET 2010. -------- --- insserv/insserv.changes 2010-06-28 08:48:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/insserv/insserv.changes 2010-11-26 15:57:15.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 26 15:50:35 CET 2010 - werner(a)suse.de + +- Warn if dependencies are not done in all runlevel +- Ignore real boot scripts for runlevel services as those + are already enabled. + +------------------------------------------------------------------- @@ -52 +59 @@ -Wed Aug 19 12:07:58 CEST 200 - werner(a)suse.de +Wed Aug 19 12:07:58 CEST 2009 - werner(a)suse.de calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ insserv.spec ++++++ --- /var/tmp/diff_new_pack.j3XUij/_old 2010-11-29 12:20:18.000000000 +0100 +++ /var/tmp/diff_new_pack.j3XUij/_new 2010-11-29 12:20:18.000000000 +0100 @@ -24,7 +24,7 @@ Provides: aaa_base:/sbin/insserv AutoReqProv: on Version: 1.14.0 -Release: 8 +Release: 13 Summary: A Program to Arrange Initialization Scripts Url: http://savannah.nongnu.org/projects/sysvinit/ Source0: http://download.savannah.gnu.org/releases/sysvinit/insserv-%{version}.tar.b… ++++++ insserv-1.14.0.dif ++++++ --- /var/tmp/diff_new_pack.j3XUij/_old 2010-11-29 12:20:18.000000000 +0100 +++ /var/tmp/diff_new_pack.j3XUij/_new 2010-11-29 12:20:18.000000000 +0100 @@ -1,6 +1,14 @@ --- insserv.c -+++ insserv.c 2010-06-10 15:18:32.218925119 +0000 -@@ -389,8 +389,8 @@ static void reversereq(service_t *restri ++++ insserv.c 2010-11-26 14:43:54.159926470 +0000 +@@ -26,6 +26,7 @@ + #define MINIMAL_MAKE 1 /* Remove disabled scripts from .depend.boot, + * .depend.start, .depend.halt, and .depend.stop */ + #define MINIMAL_RULES 1 /* ditto */ ++#define MINIMAL_DEPEND 1 /* Remove redundant dependencies */ + + #include <pwd.h> + #include <string.h> +@@ -389,8 +390,8 @@ static void reversereq(service_t *restri /* * Check required services for name */ @@ -11,7 +19,7 @@ { boolean ret = true; list_t * pos; -@@ -409,12 +409,23 @@ static boolean chkrequired(service_t *re +@@ -409,12 +410,23 @@ static boolean chkrequired(service_t *re must = getorig(must); if ((must->attr.flags & (SERV_CMDLINE|SERV_ENABLED)) == 0) { @@ -37,7 +45,7 @@ if (serv->attr.flags & (SERV_CMDLINE|SERV_ENABLED)) goto out; np_list_for_each(pos, &serv->sort.rev) { -@@ -425,9 +436,8 @@ static boolean chkrequired(service_t *re +@@ -425,9 +437,8 @@ static boolean chkrequired(service_t *re continue; must = rev->serv; must = getorig(must); @@ -48,7 +56,7 @@ serv->name, rev->serv->name); ret = false; } -@@ -476,7 +486,7 @@ static boolean chkdependencies(service_t +@@ -476,7 +487,7 @@ static boolean chkdependencies(service_t if ((cur->attr.flags & SERV_CMDLINE) && (flags & SERV_CMDLINE)) continue; @@ -57,7 +65,134 @@ name, cur->name); ret = false; } -@@ -1378,10 +1388,10 @@ static uchar scan_lsb_headers(const int +@@ -738,7 +749,7 @@ static inline void makedep(void) + FILE *halt; + #endif /* USE_KILL_IN_BOOT */ + const char *target; +- service_t *serv; ++ const service_t *serv; + + if (dryrun) { + #ifdef USE_KILL_IN_BOOT +@@ -818,6 +829,10 @@ static inline void makedep(void) + + target = (char*)0; + while ((serv = listscripts(&target, 'S', LVL_BOOT|LVL_ALL))) { ++#if defined(MINIMAL_DEPEND) && (MINIMAL_DEPEND != 0) ++ const service_t * lserv[100] = {0}; ++ unsigned long lcnt = 0; ++#endif /* not MINIMAL_DEPEND */ + boolean mark; + list_t * pos; + +@@ -841,6 +856,10 @@ static inline void makedep(void) + np_list_for_each(pos, &serv->sort.req) { + req_t * req = getreq(pos); + service_t * dep = req->serv; ++#if defined(MINIMAL_DEPEND) && (MINIMAL_DEPEND != 0) ++ boolean shadow = false; ++ unsigned long n; ++#endif /* not MINIMAL_DEPEND */ + const char * name; + + if (!dep) +@@ -870,7 +889,36 @@ static inline void makedep(void) + fprintf(out, "%s:", target); + mark = true; + } ++#if defined(MINIMAL_DEPEND) && (MINIMAL_DEPEND != 0) ++ for (n = 0; n < lcnt && lserv[n] ; n++) { ++ list_t * red; ++ if (lserv[n]->attr.sorder <= dep->attr.sorder) ++ break; ++ np_list_for_each(red, &(lserv[n])->sort.req) { ++ req_t * other = getreq(red); ++ if (other->serv->attr.flags & SERV_DUPLET) ++ continue; ++ if (other->serv->attr.ref <= 0) ++ continue; ++ if ((serv->start->lvl & other->serv->start->lvl) == 0) ++ continue; ++ if (!other->serv->attr.script) ++ continue; ++ if (other->serv != dep) ++ continue; ++ shadow = true; ++ } ++ } ++ if (shadow) ++ continue; ++#endif /* not MINIMAL_DEPEND */ + fprintf(out, " %s", name); ++ ++#if defined(MINIMAL_DEPEND) && (MINIMAL_DEPEND != 0) ++ if (lcnt >= sizeof(lserv)/sizeof(lserv[0])) ++ continue; ++ lserv[lcnt++] = dep; ++#endif /* not MINIMAL_DEPEND */ + } + + if (mark) fputc('\n', out); +@@ -927,6 +975,10 @@ static inline void makedep(void) + + target = (char*)0; + while ((serv = listscripts(&target, 'K', (LVL_NORM|LVL_BOOT)))) { ++#if defined(MINIMAL_DEPEND) && (MINIMAL_DEPEND != 0) ++ const service_t * lserv[100] = {0}; ++ unsigned long lcnt = 0; ++#endif /* not MINIMAL_DEPEND */ + boolean mark; + list_t * pos; + +@@ -953,6 +1005,10 @@ static inline void makedep(void) + np_list_for_each(pos, &serv->sort.rev) { + req_t * rev = getreq(pos); + service_t * dep = rev->serv; ++#if defined(MINIMAL_DEPEND) && (MINIMAL_DEPEND != 0) ++ boolean shadow = false; ++ unsigned long n; ++#endif /* not MINIMAL_DEPEND */ + const char * name; + + if (!dep) +@@ -976,7 +1032,36 @@ static inline void makedep(void) + fprintf(out, "%s:", target); + mark = true; + } ++#if defined(MINIMAL_DEPEND) && (MINIMAL_DEPEND != 0) ++ for (n = 0; n < lcnt && lserv[n]; n++) { ++ list_t * red; ++ if (lserv[n]->attr.korder <= dep->attr.korder) ++ break; ++ np_list_for_each(red, &(lserv[n])->sort.rev) { ++ req_t * other = getreq(red); ++ if (other->serv->attr.flags & SERV_DUPLET) ++ continue; ++ if (other->serv->attr.ref <= 0) ++ continue; ++ if ((serv->start->lvl & other->serv->start->lvl) == 0) ++ continue; ++ if (!other->serv->attr.script) ++ continue; ++ if (other->serv != dep) ++ continue; ++ shadow = true; ++ } ++ } ++ if (shadow) ++ continue; ++#endif /* not MINIMAL_DEPEND */ + fprintf(out, " %s", name); ++ ++#if defined(MINIMAL_DEPEND) && (MINIMAL_DEPEND != 0) ++ if (lcnt >= sizeof(lserv)/sizeof(lserv[0])) ++ continue; ++ lserv[lcnt++] = dep; ++#endif /* not MINIMAL_DEPEND */ + } + if (mark) fputc('\n', out); + } +@@ -1378,10 +1463,10 @@ static uchar scan_lsb_headers(const int description = empty; } @@ -72,7 +207,7 @@ } else interactive = empty; } -@@ -1416,7 +1426,7 @@ static uchar scan_lsb_headers(const int +@@ -1416,7 +1501,7 @@ static uchar scan_lsb_headers(const int char *name = basename(path); if (*name == 'S' || *name == 'K') name += 3; @@ -81,7 +216,7 @@ if (!ignore) error("exiting now!\n"); } -@@ -1432,7 +1442,7 @@ static uchar scan_lsb_headers(const int +@@ -1432,7 +1517,7 @@ static uchar scan_lsb_headers(const int char *name = basename(path); if (*name == 'S' || *name == 'K') name += 3; @@ -90,7 +225,7 @@ if (!provides) warn("missing `Provides:' entry: please add.\n"); if (provides == empty) -@@ -2338,17 +2348,18 @@ out: +@@ -2338,17 +2423,18 @@ out: static struct option long_options[] = { @@ -120,7 +255,7 @@ }; static void help(const char *restrict const name) attribute((nonnull(1))); -@@ -2364,6 +2375,8 @@ static void help(const char *restrict co +@@ -2364,6 +2450,8 @@ static void help(const char *restrict co printf(" -o <path>, --override <path> Path to replace " OVERRIDEDIR ".\n"); printf(" -c <config>, --config <config> Path to config file.\n"); printf(" -n, --dryrun Do not change the system, only talk about it.\n"); @@ -129,7 +264,7 @@ printf(" -d, --default Use default runlevels a defined in the scripts\n"); } -@@ -2386,6 +2399,8 @@ int main (int argc, char *argv[]) +@@ -2386,6 +2474,8 @@ int main (int argc, char *argv[]) boolean defaults = false; boolean ignore = false; boolean loadarg = false; @@ -138,7 +273,7 @@ myname = basename(*argv); -@@ -2400,7 +2415,7 @@ int main (int argc, char *argv[]) +@@ -2400,7 +2490,7 @@ int main (int argc, char *argv[]) for (c = 0; c < argc; c++) argr[c] = (char*)0; @@ -147,7 +282,7 @@ size_t l; switch (c) { case 'c': -@@ -2445,6 +2460,9 @@ int main (int argc, char *argv[]) +@@ -2445,6 +2535,9 @@ int main (int argc, char *argv[]) goto err; upstartjob_path = optarg; break; @@ -157,7 +292,16 @@ case '?': err: error("For help use: %s -h\n", myname); -@@ -3000,8 +3018,10 @@ int main (int argc, char *argv[]) +@@ -2612,7 +2705,7 @@ int main (int argc, char *argv[]) + * Scan scripts found in the command line to be able to resolve + * all dependcies given within those scripts. + */ +- if (argc > 1) for (c = 0; c < argc; c++) { ++ for (c = 0; c < argc; c++) { + const char *const name = argv[c]; + service_t * first = (service_t*)0; + char * provides, * begin, * token; +@@ -3000,8 +3093,10 @@ int main (int argc, char *argv[]) if (!del || (del && !isarg)) warn("script %s: service %s already provided!\n", d->d_name, token); @@ -170,7 +314,7 @@ if (!del || (del && !ignore && !isarg)) continue; -@@ -3064,9 +3084,9 @@ int main (int argc, char *argv[]) +@@ -3064,9 +3159,9 @@ int main (int argc, char *argv[]) if (del) ok = chkdependencies(service); else @@ -182,36 +326,97 @@ } if (script_inf.default_start && script_inf.default_start != empty) { -@@ -3357,6 +3377,42 @@ int main (int argc, char *argv[]) +@@ -3357,6 +3452,103 @@ int main (int argc, char *argv[]) active_script(); /* -+ * Check for recursive mode the existence of the required services ++ * Check if runlevels of required scripts are a real subset ++ * of the services handled here. + */ -+ if (recursive && !del && !ignore) { -+ c = argc; -+ while (c--) { -+ service_t * cur; -+ list_t * ptr; -+ cur = findservice(argv[c]); ++ if (!del && !ignore) { ++ list_t * ptr; ++ list_for_each(ptr, s_start) { ++ service_t * cur = getservice(ptr); ++ ushort clvl = cur->start->lvl & ~LVL_SINGLE; ++ list_t * pos; ++ + cur = getorig(cur); + if (list_empty(&cur->sort.req)) + continue; -+ np_list_for_each(ptr, &cur->sort.req) { -+ req_t *req = getreq(ptr); ++ ++ np_list_for_each(pos, &cur->sort.req) { ++ req_t *req = getreq(pos); + service_t * must; -+ ++ + if ((req->flags & REQ_MUST) == 0) + continue; + must = req->serv; + must = getorig(must); -+ -+ if (must->attr.flags & SERV_ENABLED) ++ ++ /* ++ * Check for recursive mode the existence of the required services ++ */ ++ if (cur->attr.flags & SERV_CMDLINE) { ++ ++ if (must->attr.flags & SERV_ENABLED) { ++ ushort mlvl = must->start->lvl & ~LVL_SINGLE; ++ ++ if ((mlvl & LVL_BOOT) && (clvl & LVL_BOOT) == 0) ++ continue; ++ ++ if ((mlvl & clvl) == clvl) ++ continue; ++ if (recursive) { ++ must->start->lvl |= clvl; ++ must->stopp->lvl |= clvl; ++ continue; ++ } ++ clvl &= ~mlvl; ++ if ((must->attr.flags & SERV_WARNED) == 0) ++ warn("FATAL: service %s is missed in the runlevels %s to use service %s\n", ++ must->name, lvl2str(clvl), cur->name); ++ must->attr.flags |= SERV_WARNED; ++ waserr = true; ++ continue; ++ } ++ if ((must->attr.flags & (SERV_ENFORCE|SERV_KNOWN)) == SERV_ENFORCE) { ++ if ((must->attr.flags & SERV_WARNED) == 0) ++ warn("FATAL: service %s has to exists for service %s\n", ++ must->name, cur->name); ++ must->attr.flags |= SERV_WARNED; ++ waserr = true; ++ continue; ++ } ++ if (recursive) { ++ must->start->lvl |= clvl; ++ must->stopp->lvl |= clvl; ++ continue; ++ } ++ continue; ++ } ++ if ((cur->attr.flags & SERV_ENABLED) == 0) + continue; -+ -+ if ((must->attr.flags & (SERV_ENFORCE|SERV_KNOWN)) == SERV_ENFORCE) { -+ warn("FATAL: service %s has to exists for service %s\n", -+ req->serv->name, cur->name); ++ if ((must->attr.flags & SERV_KNOWN) == 0) { ++ if ((must->attr.flags & SERV_WARNED) == 0) ++ warn("FATAL: service %s has to exists for service %s\n", ++ must->name, cur->name); ++ waserr = true; ++ must->attr.flags |= SERV_WARNED; ++ continue; ++ } ++ if (must->attr.flags & SERV_ENABLED) { ++ ushort mlvl = must->start->lvl & ~LVL_SINGLE; ++ ++ if ((mlvl & LVL_BOOT) && (clvl & LVL_BOOT) == 0) ++ continue; ++ ++ if ((mlvl & clvl) == clvl) ++ continue; ++ clvl &= ~mlvl; ++ if ((must->attr.flags & SERV_WARNED) == 0) ++ warn("FATAL: service %s is missed in the runlevels %s to use service %s\n", ++ must->name, lvl2str(clvl), cur->name); ++ must->attr.flags |= SERV_WARNED; + waserr = true; + } + } @@ -225,7 +430,7 @@ * Sorry but we support only [KS][0-9][0-9]<name> */ if (maxstart > MAX_DEEP || maxstop > MAX_DEEP) -@@ -3435,13 +3491,16 @@ int main (int argc, char *argv[]) +@@ -3435,13 +3627,16 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', lvl))) { @@ -243,7 +448,7 @@ slink = false; if ((serv->start->lvl & lvl) == 0) goto stop; -@@ -3616,7 +3675,7 @@ int main (int argc, char *argv[]) +@@ -3616,7 +3811,7 @@ int main (int argc, char *argv[]) script = (char*)0; while ((serv = listscripts(&script, 'X', seek))) { @@ -252,7 +457,7 @@ boolean found; char * clink; char mode; -@@ -3624,6 +3683,9 @@ int main (int argc, char *argv[]) +@@ -3624,6 +3819,9 @@ int main (int argc, char *argv[]) if (*script == '$') /* Do not link in virtual dependencies */ continue; @@ -263,8 +468,8 @@ if (serv->stopp->lvl & lvl) { # ifndef USE_KILL_IN_BOOT --- listing.c -+++ listing.c 2010-06-15 12:20:38.314924987 +0000 -@@ -534,13 +534,11 @@ out: ++++ listing.c 2010-11-26 14:16:31.675926125 +0000 +@@ -534,19 +534,16 @@ out: * Sort linked list of provides into start or stop order * during this set new start or stop order of the serives. */ @@ -280,7 +485,13 @@ int order; switch (type) { -@@ -554,24 +552,51 @@ void lsort(const char type) + case 'K': + for (order = 0; order <= maxstop; order++) { +- list_t * ptr, * safe; + list_for_each_safe(ptr, safe, d_start) { + dir_t * dir = getdir(ptr); + if (dir->stopp.deep == order) +@@ -554,28 +551,54 @@ void lsort(const char type) } } join(&sort, d_start); @@ -339,7 +550,11 @@ break; default: for (order = 0; order <= maxstart; order++) { -@@ -583,24 +608,52 @@ void lsort(const char type) +- list_t * ptr, * safe; + list_for_each_safe(ptr, safe, d_start) { + dir_t * dir = getdir(ptr); + if (dir->start.deep == order) +@@ -583,28 +606,54 @@ void lsort(const char type) } } join(&sort, d_start); @@ -398,9 +613,13 @@ -#endif /* SORT_REQUESTS */ break; } +- +- + } + /* --- listing.h -+++ listing.h 2010-06-15 10:52:04.446925086 +0000 ++++ listing.h 2010-06-18 15:52:03.715424383 +0000 @@ -158,6 +158,18 @@ static inline void delete(list_t *restri initial(entry); } @@ -420,7 +639,15 @@ static inline void join(list_t *restrict list, list_t *restrict head) attribute((always_inline,nonnull(1,2))); static inline void join(list_t *restrict list, list_t *restrict head) { -@@ -181,6 +193,24 @@ static inline boolean list_empty(list_t +@@ -175,12 +187,30 @@ static inline void join(list_t *restrict + } + } + +-static inline boolean list_empty(list_t *restrict head) attribute((always_inline,nonnull(1))); +-static inline boolean list_empty(list_t *restrict head) ++static inline boolean list_empty(const list_t *restrict const head) attribute((always_inline,nonnull(1))); ++static inline boolean list_empty(const list_t *restrict const head) + { return head->next == head; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit htop for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package htop for openSUSE:Factory checked in at Mon Nov 29 12:19:54 CET 2010. -------- --- htop/htop.changes 2010-10-31 13:37:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/htop/htop.changes 2010-11-29 11:16:12.000000000 +0100 @@ -1,0 +2,23 @@ +Mon Nov 29 09:54:23 UTC 2010 - puzel(a)novell.com + +- update to htop-0.9 + * Add support for "steal"/guest CPU time measurement + in virtualization environments + * Expand and collapse subtrees using '+' and '-' when in tree-view + * Support for cgroups + * Show custom thread names + * Add support for STARTTIME field + * Upgrade PLPA to version 1.3.2 + * Fix license terms with regard to PLPA + * getopt-based long options and --no-color + * BUGFIX: Fix display of nan% in CPU meters + * BUGFIX: Fix memory leak + * Add Bash/emacs style navigation keys + * Improve battery meter support + * BUGFIX: Fix IO-wait color in "Black on White" scheme + * BUGFIX: Fix search by process name when list is filtered by + user. + * BUGFIX: Fix alignment for display of memory values above 100G +- drop htop-non-printable-characters.patch (in upstream) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- htop-0.8.3.tar.bz2 htop-non-printable-characters.patch New: ---- htop-0.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ htop.spec ++++++ --- /var/tmp/diff_new_pack.sV5Or8/_old 2010-11-29 12:13:33.000000000 +0100 +++ /var/tmp/diff_new_pack.sV5Or8/_new 2010-11-29 12:13:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package htop (Version 0.8.3) +# spec file for package htop (Version 0.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,13 +21,12 @@ Name: htop Url: http://htop.sourceforge.net Summary: An Interactive text-mode Process Viewer for Linux -Version: 0.8.3 -Release: 9 +Version: 0.9 +Release: 1 License: GPLv2+ Group: System/Monitoring Source0: %{name}-%{version}.tar.bz2 -Patch0: %{name}-desktop-file-fix-thoenig-01.patch -Patch1: %{name}-non-printable-characters.patch +Patch0: htop-desktop-file-fix-thoenig-01.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ncurses-devel python BuildRequires: update-desktop-files @@ -50,11 +49,11 @@ %prep %setup %patch0 -p0 -%patch1 -p1 %build %configure \ - --enable-taskstats + --enable-taskstats \ + --enable-cgroup make %{?_smp_mflags} %install ++++++ htop-0.8.3.tar.bz2 -> htop-0.9.tar.bz2 ++++++ ++++ 71626 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit docbook5-xsl-stylesheets for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package docbook5-xsl-stylesheets for openSUSE:Factory checked in at Mon Nov 29 12:13:20 CET 2010. -------- --- docbook5-xsl-stylesheets/docbook5-xsl-stylesheets.changes 2009-08-17 10:24:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/docbook5-xsl-stylesheets/docbook5-xsl-stylesheets.changes 2010-11-22 00:57:36.000000000 +0100 @@ -1,0 +2,39 @@ +Sun Nov 21 23:54:31 UTC 2010 - toganm(a)opensuse.org + +- Updated to 1.76.1 + The following is a list of changes that have been made since the 1.76.0 +release. + +FO + + The following changes have been made to the fo code since the 1.76.0 release. + + ● Robert Stayton: docbook.xsl; xref.xsl; fop1.xsl + + Apply patch to support named destination in fop1.xsl, per Sourceforge + bug report #3029845. + +HTML + + The following changes have been made to the html code since the 1.76.0 release. + + ● Keith Fahlgren: highlight.xsl + + Implementing handling for <b> and <i>: transform to <strong> and <em> for + XHTML outputs and do not use in the highliting output (per Mauritz Jeanson) + +Params + + The following changes have been made to the params code since the 1.76.0 +release. + + ● Robert Stayton: draft.mode.xml + + Change default for draft.mode to 'no'. + +------------------------------------------------------------------- +Mon Nov 8 14:01:09 UTC 2010 - toganm(a)opensuse.org + +- Updated to 1.76.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- docbook-xsl-ns-1.75.1.tar.bz2 New: ---- docbook-xsl-ns-1.76.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook5-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.PPOF83/_old 2010-11-29 11:58:40.000000000 +0100 +++ /var/tmp/diff_new_pack.PPOF83/_new 2010-11-29 11:58:40.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package docbook5-xsl-stylesheets (Version 1.75.1) +# spec file for package docbook5-xsl-stylesheets (Version 1.76.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,8 +32,8 @@ Provides: docbkxsl PreReq: %{regcat} /usr/bin/xmlcatalog Summary: XSL Stylesheets for DocBook 5 -Version: 1.75.1 -Release: 2 +Version: 1.76.1 +Release: 1 Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-ns-%{versi… Source1: %{name}-rpmlintrc ### snap ++++++ docbook-xsl-ns-1.75.1.tar.bz2 -> docbook-xsl-ns-1.76.1.tar.bz2 ++++++ ++++ 89633 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit deja-dup for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package deja-dup for openSUSE:Factory checked in at Mon Nov 29 11:58:25 CET 2010. -------- --- GNOME/deja-dup/deja-dup.changes 2010-09-28 16:03:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/deja-dup/deja-dup.changes 2010-11-20 20:28:06.000000000 +0100 @@ -1,0 +2,13 @@ +Sat Nov 20 20:22:58 CET 2010 - badshah400(a)gmail.com + +- Update to version 16.1.1: + + Bug fixes: Fix help documentation translations +- Changes in version 16.1: + + Bug fixes: + - If backup destination does not report free size, + just continue anyway + - Fix bug preventing sudo and encryption getting along + - Don't ask for root password when restoring into the user's + home folder + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- deja-dup-16.0.tar.bz2 New: ---- deja-dup-16.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deja-dup.spec ++++++ --- /var/tmp/diff_new_pack.50aKPi/_old 2010-11-29 11:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.50aKPi/_new 2010-11-29 11:57:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package deja-dup (Version 16.0) +# spec file for package deja-dup (Version 16.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: deja-dup -Version: 16.0 +Version: 16.1.1 Release: 1 License: GPLv3+ Summary: Simple backup tool and frontend for duplicity ++++++ deja-dup-16.0.tar.bz2 -> deja-dup-16.1.1.tar.bz2 ++++++ ++++ 150628 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cherrytree for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package cherrytree for openSUSE:Factory checked in at Mon Nov 29 11:56:50 CET 2010. -------- --- GNOME/cherrytree/cherrytree.changes 2010-10-28 15:43:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/cherrytree/cherrytree.changes 2010-11-25 19:00:13.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Nov 25 17:53:45 CET 2010 - badshah400(a)gmail.com + +- Update to version 0.16: + + Improved printing of codeboxes/code nodes + + Implemented neutral nodes icons/hide nodes icons + + New: export whole tree or a single node to html + + New: insert table-of-contents for node +- Recommend lang package instead of Requiring it + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cherrytree-0.15.tar.bz2 New: ---- cherrytree-0.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cherrytree.spec ++++++ --- /var/tmp/diff_new_pack.QnJT1t/_old 2010-11-29 11:55:29.000000000 +0100 +++ /var/tmp/diff_new_pack.QnJT1t/_new 2010-11-29 11:55:29.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cherrytree (Version 0.15) +# spec file for package cherrytree (Version 0.16) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: cherrytree -Version: 0.15 +Version: 0.16 Release: 1 License: GPLv2+ Summary: A hierarchical note taking application @@ -29,11 +29,11 @@ BuildRequires: python-gtk BuildRequires: python-gtksourceview BuildRequires: update-desktop-files -Requires: %{name}-lang = %{version} Requires: python-gtk Requires: python-gtksourceview Requires(post): shared-mime-info Requires(postun): shared-mime-info +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1120 BuildArch: noarch @@ -58,6 +58,8 @@ # Remove old mime registration files rm %{buildroot}%{_datadir}/application-registry/cherrytree.* rm %{buildroot}%{_datadir}/mime-info/cherrytree.* +# Remove unnecessary source files +rm %{buildroot}%{_datadir}/cherrytree/glade/cherrytree.glade.h %find_lang %{name} %suse_update_desktop_file -G "Hierarchical Notes Utility" cherrytree TextEditor ++++++ cherrytree-0.15.tar.bz2 -> cherrytree-0.16.tar.bz2 ++++++ ++++ 24733 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ccache for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '10

29 Nov '10

Hello community, here is the log from the commit of package ccache for openSUSE:Factory checked in at Mon Nov 29 11:55:18 CET 2010. -------- --- ccache/ccache.changes 2010-11-22 12:00:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/ccache/ccache.changes 2010-11-29 10:57:38.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 29 09:56:02 UTC 2010 - puzel(a)novell.com + +- update to ccache-3.1.3 + - The -MFarg, -MTarg and -MQarg compiler options (i.e, without + space between option and argument) are now handled correctly. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ccache-3.1.2.tar.bz2 New: ---- ccache-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ccache.spec ++++++ --- /var/tmp/diff_new_pack.3RwYcg/_old 2010-11-29 11:54:55.000000000 +0100 +++ /var/tmp/diff_new_pack.3RwYcg/_new 2010-11-29 11:54:55.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ccache (Version 3.1.2) +# spec file for package ccache (Version 3.1.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: ccache Summary: Compiler Cache -Version: 3.1.2 +Version: 3.1.3 Release: 1 Group: Development/Languages/C and C++ License: GPLv3+ ++++++ ccache-3.1.2.tar.bz2 -> ccache-3.1.3.tar.bz2 ++++++ ++++ 4704 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0