August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit dirmngr
by root＠Hilbert.suse.de 05 Aug '08

05 Aug '08

Hello community, here is the log from the commit of package dirmngr checked in at Wed Aug 6 01:43:21 CEST 2008. -------- --- dirmngr/dirmngr.changes 2008-03-16 05:27:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/dirmngr/dirmngr.changes 2008-08-04 14:22:38.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Aug 4 14:12:54 CEST 2008 - puzel(a)suse.cz + +- update to 1.0.2 + * new option --url for the LOOKUP command and dirmngr-client + * the LOOKUP command does now also consults the local cache + - new option --cache-only for it and --local for dirmngr-client + * port to Windows completed + * improved certificate chain construction + * support loading of PEM encoded CRLs via HTTP. +- install some certificates to %docdir/dirmngr/examples +- removed unnecessary krb5 dependency +- use %makeinstall macro + + +------------------------------------------------------------------- Old: ---- dirmngr-1.0.1-optflags.patch dirmngr-1.0.1.tar.bz2 New: ---- dirmngr-1.0.2-optflags.patch dirmngr-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dirmngr.spec ++++++ --- /var/tmp/diff_new_pack.Q28674/_old 2008-08-06 01:42:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Q28674/_new 2008-08-06 01:42:28.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package dirmngr (Version 1.0.1) +# spec file for package dirmngr (Version 1.0.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,9 +19,9 @@ Name: dirmngr -BuildRequires: db-devel krb5 libassuan-devel libgcrypt-devel libksba-devel openldap2-devel pth +BuildRequires: db-devel libassuan-devel libgcrypt-devel libksba-devel openldap2-devel pth Url: http://www.gnupg.org/aegypten/ -Version: 1.0.1 +Version: 1.0.2 Release: 1 Requires: openssl Summary: A Client for Managing and Downloading CRLs @@ -23,7 +30,7 @@ Source: ftp://ftp.gnupg.org/gcrypt/dirmngr/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq -Patch0: dirmngr-1.0.1-optflags.patch +Patch0: %{name}-%{version}-optflags.patch %description Dirmngr is a client for managing and downloading certificate revocation @@ -45,13 +52,15 @@ %build ./autogen.sh -CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" \ +export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED" %configure \ + --docdir=%{_defaultdocdir}/dirmngr \ --libexecdir=%{_prefix}/lib/dirmngr make %install -make DESTDIR=$RPM_BUILD_ROOT install +%makeinstall +install -m 644 AUTHORS COPYING ChangeLog INSTALL NEWS README %{buildroot}/%{_defaultdocdir}/dirmngr/ %find_lang %{name} %clean @@ -65,13 +74,24 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README -%_infodir/dirmngr* +%doc %{_defaultdocdir}/dirmngr +%{_infodir}/dirmngr* %{_mandir}/man1/dirmngr*.1.gz -/usr/bin/* +%{_bindir}/* %{_prefix}/lib/dirmngr %changelog +* Mon Aug 04 2008 puzel(a)suse.cz +- update to 1.0.2 + * new option --url for the LOOKUP command and dirmngr-client + * the LOOKUP command does now also consults the local cache + - new option --cache-only for it and --local for dirmngr-client + * port to Windows completed + * improved certificate chain construction + * support loading of PEM encoded CRLs via HTTP. +- install some certificates to %%docdir/dirmngr/examples +- removed unnecessary krb5 dependency +- use %%makeinstall macro * Sun Mar 16 2008 crrodriguez(a)suse.de - fix file-not-in-lang errors - fix info-files-without-install-info-* errors @@ -110,7 +130,7 @@ * Wed Jan 12 2005 postadal(a)suse.cz - updated to version 0.5.65.65.65.65.6 - removed obsoleted patch libldap.diff -* Fri Jul 23 2004 schwab(a)suse.de +* Sat Jul 24 2004 schwab(a)suse.de - Fix neededforbuild. - Fix 64-bit bugs. * Tue Jul 13 2004 adrian(a)suse.de ++++++ dirmngr-1.0.1-optflags.patch -> dirmngr-1.0.2-optflags.patch ++++++ --- dirmngr/dirmngr-1.0.1-optflags.patch 2008-03-16 05:21:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/dirmngr/dirmngr-1.0.2-optflags.patch 2008-07-31 18:36:44.000000000 +0200 @@ -1,12 +1,6 @@ -Fix: Userland CFLAGS not respected while building yat2m.c - -Signed-off-by: Cristian Rodríguez <crrodriguez(a)suse.de> - -Index: doc/Makefile.am -=================================================================== ---- doc/Makefile.am.orig 2007-08-12 14:54:19.000000000 +0200 -+++ doc/Makefile.am 2008-03-16 05:08:08.000000000 +0100 -@@ -40,7 +40,7 @@ CLEANFILES = yat2m +--- ./doc/Makefile.am.fix 2008-07-31 18:33:40.000000000 +0200 ++++ ./doc/Makefile.am 2008-07-31 18:34:23.000000000 +0200 +@@ -42,7 +42,7 @@ DISTCLEANFILES = dirmngr.ops yat2m-stamp.tmp yat2m-stamp $(myman_pages) yat2m: yat2m.c ++++++ dirmngr-1.0.1.tar.bz2 -> dirmngr-1.0.2.tar.bz2 ++++++ ++++ 21981 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 indent
by root＠Hilbert.suse.de 05 Aug '08

05 Aug '08

Hello community, here is the log from the commit of package indent checked in at Wed Aug 6 01:43:19 CEST 2008. -------- --- indent/indent.changes 2008-02-24 18:10:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/indent/indent.changes 2008-08-05 12:33:57.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Aug 5 12:09:45 CEST 2008 - prusnak(a)suse.cz + +- updated to 2.2.10 + * added --indent-label and --linux-style options to control + indentation of goto labels and supply a canned set of settings + that closely matches the preferred style for the linux kernel + * GPLv3 is used now +- removed obsoleted patches: + * overflow.patch (included in update) + +------------------------------------------------------------------- Old: ---- indent-2.2.9-nothing_is_void.diff indent-2.2.9-overflow.patch indent-2.2.9.tar.bz2 indent-2.2.9-warnings.diff New: ---- indent-2.2.10-cdw.diff indent-2.2.10-lcall.diff indent-2.2.10-man.diff indent-2.2.10-nothing_is_void.diff indent-2.2.10.tar.bz2 indent-2.2.10-warnings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ indent.spec ++++++ --- /var/tmp/diff_new_pack.i30527/_old 2008-08-06 01:43:02.000000000 +0200 +++ /var/tmp/diff_new_pack.i30527/_new 2008-08-06 01:43:02.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package indent (Version 2.2.9) +# spec file for package indent (Version 2.2.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,15 +19,17 @@ Name: indent -License: GPL v2 or later +License: GPL v3 or later Group: Development/Languages/C and C++ AutoReqProv: on -Version: 2.2.9 -Release: 288 +Version: 2.2.10 +Release: 1 Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}-overflow.patch -Patch1: %{name}-%{version}-nothing_is_void.diff -Patch2: %{name}-%{version}-warnings.diff +Patch0: %{name}-%{version}-nothing_is_void.diff +Patch1: %{name}-%{version}-warnings.diff +Patch2: %{name}-%{version}-lcall.diff +Patch3: %{name}-%{version}-cdw.diff +Patch4: %{name}-%{version}-man.diff Url: ftp://ftp.gnu.org/pub/gnu/indent/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Indent Formats C Source Code @@ -36,24 +45,29 @@ %prep %setup -q -%patch -%patch1 -p1 +%patch0 -p1 +%patch1 %patch2 +%patch3 -p1 +%patch4 %build -export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %configure --with-pic +# Parallel make doesn't work make %install -make DESTDIR=$RPM_BUILD_ROOT/ install +make DESTDIR=$RPM_BUILD_ROOT install # indent.html is installed with %doc below -rm $RPM_BUILD_ROOT/usr/doc/indent/indent.html -rm $RPM_BUILD_ROOT/usr/bin/texinfo2man -mv $RPM_BUILD_ROOT/usr/share/locale/zh_TW.Big5 \ - $RPM_BUILD_ROOT/usr/share/locale/zh_TW +rm -f $RPM_BUILD_ROOT/usr/doc/indent/indent.html $RPM_BUILD_ROOT%{_bindir}/texinfo2man $RPM_BUILD_ROOT/%{_infodir}/dir +mv $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW.Big5 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW %find_lang %{name} +%check +echo =============== TEST BEGIN =============== +make -C regression +echo =============== TEST END =============== + %clean rm -rf $RPM_BUILD_ROOT @@ -71,6 +85,14 @@ %{_mandir}/man1/indent.1.gz %changelog +* Tue Aug 05 2008 prusnak(a)suse.cz +- updated to 2.2.10 + * added --indent-label and --linux-style options to control + indentation of goto labels and supply a canned set of settings + that closely matches the preferred style for the linux kernel + * GPLv3 is used now +- removed obsoleted patches: + * overflow.patch (included in update) * Sun Feb 24 2008 crrodriguez(a)suse.de - use find_lang macro * Wed Jan 25 2006 mls(a)suse.de ++++++ indent-2.2.10-cdw.diff ++++++ --- indent-2.2.10/src/indent.c +++ indent-2.2.10/src/indent.c @@ -1033,13 +1033,10 @@ if (!*sp_sw) { /* if not if for (;;) */ - do - { if (parse (semicolon) != total_success) { *file_exit_value = indent_error; } - } while(0); *force_nl = true; /* force newline after a end of stmt */ } @@ -2818,6 +2815,18 @@ return file_exit_value; /* RETURN */ } + if (type_code == sp_paren + && parser_state_tos->p_stack[parser_state_tos->tos] == dohead + && parser_state_tos->last_token == rbrace) + { + /* This is closing `while' of `do {stuff;} while' + statement (not `do stuff; while' command). In -cdw, we + want to suppress newline. */ + if (settings.cuddle_do_while) + force_nl = false; + parser_state_tos->in_closing_br_while = true; + } + if ((type_code != comment) && (type_code != cplus_comment) && (type_code != newline) && --- indent-2.2.10/src/indent.h +++ indent-2.2.10/src/indent.h @@ -420,6 +420,9 @@ BOOLEAN in_decl; /*!< set to true when we are in a declaration * statement. The processing of braces is then * slightly different */ + BOOLEAN in_closing_br_while; /*!< set to true when we are parsing + * closing while of do {} while + * statement*/ int in_stmt; /*!< set to 1 while in a stmt */ int in_parameter_declaration; int ind_level; /*!< the current indentation level in spaces */ --- indent-2.2.10/src/parse.c +++ indent-2.2.10/src/parse.c @@ -69,6 +69,7 @@ parser_state_tos->cstk = (int *) xmalloc (INITIAL_STACK_SIZE * sizeof (int)); parser_state_tos->paren_indents_size = 8; parser_state_tos->paren_indents = (short *) xmalloc (parser_state_tos->paren_indents_size * sizeof (short)); + parser_state_tos->in_closing_br_while = false; /* Although these are supposed to grow if we reach the end, * I can find no place in the code which does this. */ @@ -428,6 +429,14 @@ parser_state_tos->ind_level = parser_state_tos->i_l_follow; parser_state_tos->il[parser_state_tos->tos] = parser_state_tos->i_l_follow; + + if (parser_state_tos->in_closing_br_while + && settings.cuddle_do_while + && !settings.btype_2) + { + parser_state_tos->ind_level += settings.brace_indent; + } + parser_state_tos->in_closing_br_while = false; } else { /* it is a while loop */ @@ -457,6 +466,12 @@ parser_state_tos->p_stack[parser_state_tos->tos] = elsehead; /* remember if with else */ parser_state_tos->search_brace = true; + + if (settings.cuddle_else + && !settings.btype_2) + { + parser_state_tos->ind_level += settings.brace_indent; + } } break; ++++++ indent-2.2.10-lcall.diff ++++++ --- src/indent.c +++ src/indent.c @@ -3290,7 +3290,7 @@ exit_values_ty exit_status; #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) && defined (HAVE_LCCTYPES) - setlocale(LC_MESSAGES, ""); + setlocale(LC_ALL, ""); #endif bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); ++++++ indent-2.2.10-man.diff ++++++ --- doc/indent.texinfo +++ doc/indent.texinfo @@ -776,7 +776,7 @@ @kindex -ce @kindex --cuddle-else -@kindex -dce +@kindex -nce @kindex --dont-cuddle-else If you are using the @option{-br} option, you probably want to also use the @option{-ce} option. This causes the @code{else} in an if-then-else @@ -1805,6 +1805,11 @@ Leave space between @samp{#} and preprocessor directive.@* @xref{Indentation}. +@item -nlps +@itemx --remove-preprocessor-space +Remove space between @samp{#} and preprocessor directive.@* +@xref{Indentation}. + @item -nbad @itemx --no-blank-lines-after-declarations Do not force blank lines after declarations.@* @@ -1977,6 +1982,11 @@ Specify the indentation for preprocessor conditional statements. @xref{Indentation}. +@item -ppi@var{n} +@itemx --preprocessor-indentation@var{n} +Request indentation of preprocessor conditional statements.@* +@xref{Indentation}. + @item -prs @itemx --space-after-parentheses Put a space after every '(' and before every ')'.@* @@ -2138,6 +2148,7 @@ \line{ --preprocessor-indentation \leaderfill -ppi@var{n}\ } \line{ --preserve-mtime \leaderfill -pmt\ } \line{ --procnames-start-lines \leaderfill -psl\ } +\line{ --remove-preprocessor-space \leaderfill -nlps\ } \line{ --space-after-cast \leaderfill -cs\ \ } \line{ --space-after-for \leaderfill -saf\ } \line{ --space-after-if \leaderfill -sai\ } @@ -2229,6 +2240,7 @@ --preserve-mtime -pmt --preprocessor-indentation -ppi@var{n} --procnames-start-lines -psl +--remove-preprocessor-space -nlps --space-after-cast -cs --space-after-for -saf --space-after-if -sai ++++++ indent-2.2.9-nothing_is_void.diff -> indent-2.2.10-nothing_is_void.diff ++++++ --- indent/indent-2.2.9-nothing_is_void.diff 2004-04-16 11:25:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/indent/indent-2.2.10-nothing_is_void.diff 2008-08-05 12:11:00.000000000 +0200 @@ -9,25 +9,3 @@ { char buf[1024]; int in_block = 0; ---- indent-2.2.9/src/output.c -+++ indent-2.2.9/src/output.c -@@ -1206,7 +1206,7 @@ - } - } - --extern inhibit_indenting( -+extern void inhibit_indenting( - BOOLEAN flag) - { - inhibited = flag; ---- indent-2.2.9/src/output.h -+++ indent-2.2.9/src/output.h -@@ -47,7 +47,7 @@ - struct stat * file_stats, - const char * filename); - --extern inhibit_indenting( -+extern void inhibit_indenting( - BOOLEAN flag); - - ++++++ indent-2.2.9.tar.bz2 -> indent-2.2.10.tar.bz2 ++++++ ++++ 62245 lines of diff (skipped) ++++++ indent-2.2.9-warnings.diff -> indent-2.2.10-warnings.diff ++++++ --- indent/indent-2.2.9-warnings.diff 2004-09-15 21:00:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/indent/indent-2.2.10-warnings.diff 2008-08-05 12:24:51.000000000 +0200 @@ -1,34 +1,25 @@ --- src/output.c +++ src/output.c -@@ -15,6 +15,8 @@ - #include <sys/types.h> - #include <utime.h> - #include <sys/stat.h> -+#include <stdlib.h> -+#include <time.h> +@@ -71,7 +71,7 @@ - #include "indent.h" - #include "sys.h" -@@ -23,7 +25,7 @@ - - RCSTAG_CC ("$Id: output.c,v 1.5 2002/12/12 17:36:49 david Exp $"); + RCSTAG_CC ("$Id$"); -static FILE * output = NULL; -+FILE * output = NULL; ++ FILE * output = NULL; static BOOLEAN inhibited = 0; static buf_break_st_ty * buf_break_list = NULL; -@@ -737,11 +739,11 @@ - - if (s[0] == '/' && (s[1] == '*' || s[1] == '/')) - { -- fprintf (output, "%.*s", e_lab - s, s); -+ fprintf (output, "%.*s", (int) (e_lab - s), s); - } - else - { -- fprintf (output, "/* %.*s */", e_lab - s, s); -+ fprintf (output, "/* %.*s */", (int) (e_lab - s), s); - } - - /* no need to update cur_col: the very next thing will +@@ -749,11 +749,11 @@ + + if (s[0] == '/' && (s[1] == '*' || s[1] == '/')) + { +- fprintf (output, "%.*s", e_lab - s, s); ++ fprintf (output, "%.*s", (int) (e_lab - s), s); + } + else + { +- fprintf (output, "/* %.*s */", e_lab - s, s); ++ fprintf (output, "/* %.*s */", (int) (e_lab - s), s); + } + + /* no need to update cur_col: the very next thing will ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 duplicity
by root＠Hilbert.suse.de 05 Aug '08

05 Aug '08

Hello community, here is the log from the commit of package duplicity checked in at Wed Aug 6 01:42:54 CEST 2008. -------- --- duplicity/duplicity.changes 2008-04-17 13:30:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/duplicity/duplicity.changes 2008-07-24 22:07:46.215869000 +0200 @@ -1,0 +2,25 @@ +Thu Jul 24 22:04:48 CEST 2008 - cthiel(a)suse.de + +- update to version 0.4.12 + * Dan Muresan created a patch to minimize the number of password + prompts. To do so, it sometimes requests a password once without + confirmation; if later it turns out that a full backup is needed, + the user is prompted for confirmation. + * bug #23540: doc bug in man page (environment FTP_PASSWORD) + https://savannah.nongnu.org/bugs/index.php?23540 + * bug #23362: Documentation for --version, --time-separator <char> + https://savannah.nongnu.org/bugs/index.php?23362 + * bug #23283: interactive passphrase query is suboptimal + https://savannah.nongnu.org/bugs/index.php?23283 + * bug #23066 was not actually applied to 0.4.11. Its here now. + https://savannah.nongnu.org/bugs/index.php?23066 + * bug #22826: regressions caused by boto 1.1c + * https://savannah.nongnu.org/bugs/index.php?22826 +- changes in 0.4.11 + * Changes applied to allow duplicity to run under Python 2.3 again. + * patch #6485: Reinstate patch #6340 with a detailed explanation. + https://savannah.nongnu.org/patch/index.php?6485 + * bug #23066: ssh uris with given portnumbers are not handled correctly + https://savannah.nongnu.org/bugs/index.php?23066 + +------------------------------------------------------------------- Old: ---- duplicity-0.4.10.tar.bz2 New: ---- duplicity-0.4.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duplicity.spec ++++++ --- /var/tmp/diff_new_pack.l28458/_old 2008-08-06 01:42:23.000000000 +0200 +++ /var/tmp/diff_new_pack.l28458/_new 2008-08-06 01:42:23.000000000 +0200 @@ -1,20 +1,28 @@ # -# spec file for package duplicity (Version 0.4.10) +# spec file for package duplicity (Version 0.4.12) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: duplicity BuildRequires: librsync >= 0.9.6 BuildRequires: python-devel python-pexpect Summary: Encrypted bandwidth-efficient backup using the rsync algorithm -Version: 0.4.10 +Version: 0.4.12 Release: 1 License: GPL v3 or later Group: Productivity/Archiving/Backup @@ -72,6 +80,28 @@ %endif %changelog +* Fri Jul 25 2008 cthiel(a)suse.de +- update to version 0.4.12 + * Dan Muresan created a patch to minimize the number of password + prompts. To do so, it sometimes requests a password once without + confirmation; if later it turns out that a full backup is needed, + the user is prompted for confirmation. + * bug #23540: doc bug in man page (environment FTP_PASSWORD) + https://savannah.nongnu.org/bugs/index.php?23540 + * bug #23362: Documentation for --version, --time-separator <char> + https://savannah.nongnu.org/bugs/index.php?23362 + * bug #23283: interactive passphrase query is suboptimal + https://savannah.nongnu.org/bugs/index.php?23283 + * bug #23066 was not actually applied to 0.4.11. Its here now. + https://savannah.nongnu.org/bugs/index.php?23066 + * bug #22826: regressions caused by boto 1.1c + * https://savannah.nongnu.org/bugs/index.php?22826 +- changes in 0.4.11 + * Changes applied to allow duplicity to run under Python 2.3 again. + * patch #6485: Reinstate patch #6340 with a detailed explanation. + https://savannah.nongnu.org/patch/index.php?6485 + * bug #23066: ssh uris with given portnumbers are not handled correctly + https://savannah.nongnu.org/bugs/index.php?23066 * Thu Apr 17 2008 cthiel(a)suse.de - update to version 0.4.10 * bug #22728: FTP backend fails on empty directory ++++++ duplicity-0.4.10.tar.bz2 -> duplicity-0.4.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/CHANGELOG new/duplicity-0.4.12/CHANGELOG --- old/duplicity-0.4.10/CHANGELOG 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/CHANGELOG 2008-07-22 17:20:04.000000000 +0200 @@ -1,28 +1,62 @@ +New in v0.4.12 (2008/07/22) +--------------------------- +Dan Muresan created a patch to minimize the number of password +prompts. To do so, it sometimes requests a password once without +confirmation; if later it turns out that a full backup is needed, +the user is prompted for confirmation. + +bug #23540: doc bug in man page (environment FTP_PASSWORD) +https://savannah.nongnu.org/bugs/index.php?23540 + +bug #23362: Documentation for --version, --time-separator <char> +https://savannah.nongnu.org/bugs/index.php?23362 + +bug #23283: interactive passphrase query is suboptimal +https://savannah.nongnu.org/bugs/index.php?23283 + +bug #23066 was not actually applied to 0.4.11. Its here now. +https://savannah.nongnu.org/bugs/index.php?23066 + +bug #22826: regressions caused by boto 1.1c +https://savannah.nongnu.org/bugs/index.php?22826 + + +New in v0.4.11 (2008/05/05) +--------------------------- +Changes applied to allow duplicity to run under Python 2.3 again. + +patch #6485: Reinstate patch #6340 with a detailed explanation. +https://savannah.nongnu.org/patch/index.php?6485 + +bug #23066: ssh uris with given portnumbers are not handled correctly +https://savannah.nongnu.org/bugs/index.php?23066 + + New in v0.4.10 (2008/03/27) --------------------------- bug #22728: FTP backend fails on empty directory -https://savannah.nongnu.org/bugs/?22728 +https://savannah.nongnu.org/bugs/index.php?22728 patch #6374: Duplicity --tempdir patch documentation. -https://savannah.nongnu.org/patch/?6374 +https://savannah.nongnu.org/patch/index.php?6374 patch #6375: Duplicity reports the epoch for a nonexistant last full backup date -https://savannah.nongnu.org/patch/?6375 +https://savannah.nongnu.org/patch/index.php?6375 patch #6380: add additional named logging levels -https://savannah.nongnu.org/patch/?6380 +https://savannah.nongnu.org/patch/index.php?6380 patch #6389: Possible Fix for pagefile.sys on Win32 systems -https://savannah.nongnu.org/patch/?6389 +https://savannah.nongnu.org/patch/index.php?6389 patch #6403: Restore by overwriting files/directories by using --force option -https://savannah.nongnu.org/patch/?6403 +https://savannah.nongnu.org/patch/index.php?6403 patch #6449: add additional debug level logging -https://savannah.nongnu.org/patch/?6449 +https://savannah.nongnu.org/patch/index.php?6449 patch #6453: handle absolute urls in webdav backend -https://savannah.nongnu.org/patch/?6453 +https://savannah.nongnu.org/patch/index.php?6453 Fix problem where S3 prefix was prepended with 'd'. This caused a failure in the regression tests. @@ -62,13 +96,13 @@ https://savannah.nongnu.org/bugs/index.php?21909 patch #6354: S3 staight typo results in a bogus exception -https://savannah.nongnu.org/patch/?6354 +https://savannah.nongnu.org/patch/index.php?6354 patch #6356: Command line option for the temporary directory root. -https://savannah.nongnu.org/patch/?6356 +https://savannah.nongnu.org/patch/index.php?6356 patch #6357: Explicit restore action is missing from the command list, -https://savannah.nongnu.org/patch/?6357 +https://savannah.nongnu.org/patch/index.php?6357 New in v0.4.8 (2007/12/15) @@ -89,10 +123,10 @@ https://savannah.nongnu.org/bugs/index.php?21752 patch #6340: S3 short filename regression -https://savannah.nongnu.org/patch/?6340 +https://savannah.nongnu.org/patch/index.php?6340 patch #6344: S3 bad bad key key handling -http://savannah.nongnu.org/patch/?6344 +http://savannah.nongnu.org/patch/index.php?6344 New in v0.4.7 (2007/12/07) @@ -107,25 +141,25 @@ https://savannah.nongnu.org/bugs/index.php?21686 patch #6292: Amazon S3 bucket creation deferral -https://savannah.nongnu.org/patch/?6292 +https://savannah.nongnu.org/patch/index.php?6292 patch #6293: left-over patch from remove-all-but-n-full -https://savannah.nongnu.org/patch/?6293 +https://savannah.nongnu.org/patch/index.php?6293 patch #6296: Generic S3 url support for Duplicity 0.4.6 -https://savannah.nongnu.org/patch/?6296 +https://savannah.nongnu.org/patch/index.php?6296 patch #6298: URI unquoting patch for FTP backend -https://savannah.nongnu.org/patch/?6298 +https://savannah.nongnu.org/patch/index.php?6298 patch #6299: re-design tempfile handling -https://savannah.nongnu.org/patch/?6299 +https://savannah.nongnu.org/patch/index.php?6299 patch #6300: Standard library replacement for ParsedUrl class -https://savannah.nongnu.org/patch/?6300 +https://savannah.nongnu.org/patch/index.php?6300 patch #6301: log sftp commands at verbosity 5 -https://savannah.nongnu.org/patch/?6301 +https://savannah.nongnu.org/patch/index.php?6301 New in v0.4.6 (2007/11/28) @@ -144,10 +178,10 @@ https://savannah.nongnu.org/bugs/index.php?21657 bug #21657: ncftpls fails to create dir in ver 0.4.5 -https://savannah.nongnu.org/patch/?6284 +https://savannah.nongnu.org/patch/index.php?6284 patch #6284: document TMPDIR and friends -https://savannah.nongnu.org/patch/?6284 +https://savannah.nongnu.org/patch/index.php?6284 patch #6285: security fix: eliminate use of mktemp() https://savannah.nongnu.org/patch/index.php?6289 @@ -270,7 +304,7 @@ DP: make tempfiles with useful names DP: do not ask for a passphrase if none is required! -https://savannah.nongnu.org/bugs/?21123 +https://savannah.nongnu.org/bugs/index.php?21123 duplicity 0.4.3 ftpBackend did not find backup sets when there was more than 20 files in directory. @@ -307,7 +341,7 @@ Note: do not add spaces in the string value. Fixed bug 20764 - unable to use port in ssh backend. -https://savannah.nongnu.org/bugs/?20764 +https://savannah.nongnu.org/bugs/index.php?20764 Remove ssh_command option, add ssh_options. This adds options to the scp and sftp commands that are used by @@ -325,7 +359,7 @@ ------------------------------- Fix index out of range in Bug 20730, triggered when there is only one incremental in the list. -https://savannah.nongnu.org/bugs/?20730 +https://savannah.nongnu.org/bugs/index.php?20730 Changed the file:, ftp:, and ssh: backends so that the target directory will be created at start. @@ -475,7 +509,7 @@ dAniel hAhler submitted a patch to change "Error initializing file foo" (log level 2), where foo was a socket, to "Skipping socket foo" -(log level 7). https://savannah.nongnu.org/patch/?5985 +(log level 7). https://savannah.nongnu.org/patch/index.php?5985 Change logging to flush after every write, unbuffering stdout and stderr, thus producing logs that are coherent. @@ -502,26 +536,26 @@ ------------------------------ Fixed bug in tarfile.py that was causing ValueError exception. Thanks to dAniel hAhler for the patch that fixed the problem. Refer to: -http://savannah.nongnu.org/bugs/?19998 +http://savannah.nongnu.org/bugs/index.php?19998 New in v0.4.3.RC1 (2007/05/26) ------------------------------ Applied patches: - https://savannah.nongnu.org/patch/?4486 - https://savannah.nongnu.org/patch/?5183 - https://savannah.nongnu.org/patch/?5185 - https://savannah.nongnu.org/patch/?5412 - https://savannah.nongnu.org/patch/?5413 - https://savannah.nongnu.org/patch/?5680 - https://savannah.nongnu.org/patch/?5681 - https://savannah.nongnu.org/patch/?5682 - https://savannah.nongnu.org/patch/?5794 - https://savannah.nongnu.org/patch/?5830 + https://savannah.nongnu.org/patch/index.php?4486 + https://savannah.nongnu.org/patch/index.php?5183 + https://savannah.nongnu.org/patch/index.php?5185 + https://savannah.nongnu.org/patch/index.php?5412 + https://savannah.nongnu.org/patch/index.php?5413 + https://savannah.nongnu.org/patch/index.php?5680 + https://savannah.nongnu.org/patch/index.php?5681 + https://savannah.nongnu.org/patch/index.php?5682 + https://savannah.nongnu.org/patch/index.php?5794 + https://savannah.nongnu.org/patch/index.php?5830 Fixed bugs: - https://savannah.nongnu.org/bugs/?2441 - https://savannah.nongnu.org/bugs/?16711 + https://savannah.nongnu.org/bugs/index.php?2441 + https://savannah.nongnu.org/bugs/index.php?16711 ProFTPD resets the connection after returning 226 when NLSTing an empty directory, so changed code to allow that exception. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/duplicity new/duplicity-0.4.12/duplicity --- old/duplicity-0.4.10/duplicity 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/duplicity 2008-07-22 17:20:04.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python # duplicity -- Encrypted bandwidth efficient backup -# Version 0.4.10 released September 29, 2002 +# Version 0.4.12 released September 29, 2002 # # Copyright (C) 2002 Ben Escoto <bescoto(a)stanford.edu> # @@ -34,8 +34,13 @@ exit_val = None -def get_passphrase(): - """Get passphrase from environment or, failing that, from user""" +def get_passphrase(n): + """Get passphrase from environment or, failing that, from user + + If n=3, a password is requested and verified. If n=2, the current + password is verified. If n=1, a password is requested without + verification for the time being.""" + try: return os.environ['PASSPHRASE'] except KeyError: @@ -43,13 +48,23 @@ log.Log("PASSPHRASE variable not set, asking user.", 5) while 1: - pass1 = getpass.getpass("GnuPG passphrase: ") - pass2 = getpass.getpass("Retype to confirm: ") + if n == 2: + pass1 = globals.gpg_profile.passphrase + else: + pass1 = getpass.getpass("GnuPG passphrase: ") + + if n == 1: + pass2 = pass1 + else: + pass2 = getpass.getpass("Retype passphrase to confirm: ") + if not pass1 == pass2: print "First and second passphrases do not match! Please try again." + n = 3 continue if not pass1 and not globals.gpg_profile.recipients: print "Cannot use empty passphrase with symmetric encryption! Please try again." + n = 3 continue return pass1 @@ -147,6 +162,8 @@ local_sig_filename)) return fh +def pubkey_only(): + return not globals.gpg_profile.sign_key and globals.gpg_profile.recipients and globals.encryption def full_backup(col_stats): """Do full backup of directory to backend, using archive_dir""" @@ -402,9 +419,6 @@ os.umask(077) # for public key encryption (without signing!), no passphrase is required. - pubkey_only = (not globals.gpg_profile.sign_key and - globals.gpg_profile.recipients and - globals.encryption) # cases where we do not need to get a passphrase: # full: with pubkey enc. doesn't depend on old encrypted info @@ -412,17 +426,16 @@ # with encryption disabled # listing files: needs a manifest, but the archive dir has that # collection status only looks at a repository - if ((action == "full" and pubkey_only) or - (action == "inc" and pubkey_only and globals.archive_dir) or - (not globals.encryption) or + # NOTE: both full and inc are handled later + if ((not globals.encryption) or (action == "list-current" and globals.archive_dir) or - action in ["collection-status", + action in ["full", "inc", "collection-status", "remove-older-then", "remove-all-but-n-full", ]): globals.gpg_profile.passphrase = "" else: - globals.gpg_profile.passphrase = get_passphrase() + globals.gpg_profile.passphrase = get_passphrase(1) if action == "restore": restore(col_stats) @@ -441,11 +454,17 @@ else: assert action == "inc" or action == "full", action if action == "full": + if not pubkey_only(): + globals.gpg_profile.passphrase = get_passphrase(3) full_backup(col_stats) - else: + else: # attempt incremental + if not (pubkey_only() and globals.archive_dir): + globals.gpg_profile.passphrase = get_passphrase(1) check_last_manifest(col_stats) # not needed for full backup sig_chain = check_sig_chain(col_stats) if not sig_chain: + if not pubkey_only(): + globals.gpg_profile.passphrase = get_passphrase(2) full_backup(col_stats) else: incremental_backup(sig_chain) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/duplicity.1 new/duplicity-0.4.12/duplicity.1 --- old/duplicity-0.4.10/duplicity.1 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/duplicity.1 2008-07-22 17:20:04.000000000 +0200 @@ -1,4 +1,4 @@ -.TH RDIFFDIR 1 "March 2008" "Version 0.4.10" "User Manuals" +.TH RDIFFDIR 1 "July 2008" "Version 0.4.12" "User Manuals" .SH NAME duplicity \- Encrypted backup using rsync algorithm @@ -131,7 +131,7 @@ password: .PP .RS -FTP_PASSWORD=mypassword; duplicity /local/dir ftp://user@other.host/some_dir +FTP_PASSWORD=mypassword duplicity /local/dir ftp://user@other.host/some_dir .SH ACTIONS .TP @@ -410,10 +410,18 @@ .BI -t time ", --restore-time " time When restoring, specify the time to restore to. .TP +.BI "--time-separator " char +Use +.IR char +as the time separator in filenames instead of colon (":"). +.TP .BI -v [0-9] ", --verbosity " [0-9] Specify verbosity level (0 is total silent, 3 is the default, and 9 is noisiest). .TP +.BI --version +Print duplicity's version and quit. +.TP .BI "--volsize " number Change the volume size to .IR number diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/rdiffdir new/duplicity-0.4.12/rdiffdir --- old/duplicity-0.4.10/rdiffdir 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/rdiffdir 2008-07-22 17:20:04.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python # rdiffdir -- Extend rdiff functionality to directories -# Version 0.4.10 released June 30, 2002 +# Version 0.4.12 released June 30, 2002 # # Copyright (C) 2002 Ben Escoto <bescoto(a)stanford.edu> # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/rdiffdir.1 new/duplicity-0.4.12/rdiffdir.1 --- old/duplicity-0.4.10/rdiffdir.1 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/rdiffdir.1 2008-07-22 17:20:04.000000000 +0200 @@ -1,4 +1,4 @@ -.TH RDIFFDIR 1 "March 2008" "Version 0.4.10" "User Manuals" +.TH RDIFFDIR 1 "July 2008" "Version 0.4.12" "User Manuals" .SH NAME rdiffdir \- compute and apply signatures and diffs to directories .SH SYNOPSIS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/README new/duplicity-0.4.12/README --- old/duplicity-0.4.10/README 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/README 2008-07-22 17:20:04.000000000 +0200 @@ -19,7 +19,7 @@ REQUIREMENTS: - * Python v2.4 or later (http://www.python.org) + * Python v2.3 or later (http://www.python.org) * librsync v0.9.6 or later (http://librsync.sourceforge.net) * GnuPG for encryption (http://www.gnupg.org) * GnuPGInterface 0.3.2 or later (http://py-gnupg.sourceforge.net) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/setup.py new/duplicity-0.4.12/setup.py --- old/duplicity-0.4.10/setup.py 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/setup.py 2008-07-22 17:20:04.000000000 +0200 @@ -3,10 +3,10 @@ import sys, os, getopt from distutils.core import setup, Extension -version_string = "0.4.10" +version_string = "0.4.12" -if sys.version_info[:2] < (2,4): - print "Sorry, duplicity requires version 2.4 or later of python" +if sys.version_info[:2] < (2,3): + print "Sorry, duplicity requires version 2.3 or later of python" sys.exit(1) try: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/src/backends.py new/duplicity-0.4.12/src/backends.py --- old/duplicity-0.4.10/src/backends.py 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/src/backends.py 2008-07-22 17:20:04.000000000 +0200 @@ -331,7 +331,7 @@ "python-pexpect from your distro's repository.") # host string of form user@hostname:port - self.host_string = parsed_url.netloc + self.host_string = parsed_url.username + "@" + parsed_url.hostname # make sure remote_dir is always valid if parsed_url.path: # remove leading '/' @@ -594,8 +594,8 @@ def delete(self, filename_list): """Delete files in filename_list""" for filename in filename_list: - commandline = "ncftpls -x '' %s -X 'DELE %s' '%s%s'" % \ - (self.flags, filename, self.url_string, filename) + commandline = "ncftpls -x '' %s -X 'DELE %s' '%s'" % \ + (self.flags, filename, self.url_string) self.popen_persist(commandline) @@ -700,6 +700,15 @@ from boto.s3.connection import S3Connection from boto.s3.key import Key assert hasattr(S3Connection, 'lookup') + + # Newer versions of boto default to using virtual hosting for + # buckets. This is bad because it will break backups stored in + # buckets that contain upper-case characters in the name. + try: + from boto.s3.connection import OrdinaryCallingFormat + calling_format = OrdinaryCallingFormat() + except ImportError: + calling_format = None except ImportError: log.FatalError("This backend requires boto library, version 0.9d or later, " "(http://code.google.com/p/boto/).") @@ -717,6 +726,9 @@ assert parsed_url.scheme == 's3' self.conn = S3Connection(host=parsed_url.hostname) + if hasattr(self.conn, 'calling_format'): + self.conn.calling_format = calling_format + # This folds the null prefix and all null parts, which means that: # //MyBucket/ and //MyBucket are equivalent. # //MyBucket//My///My/Prefix/ and //MyBucket/My/Prefix are equivalent. @@ -778,6 +790,15 @@ def list(self): filename_list = [] if self.bucket: + # We add a 'd' to the prefix to make sure it is not null (for boto) and + # to optimize the listing of our filenames, which always begin with 'd'. + # This will cause a failure in the regression tests as below: + # FAIL: Test basic backend operations + # <tracback snipped> + # AssertionError: Got list: [] + # Wanted: ['testfile'] + # Because of the need for this optimization, it should be left as is. + #for k in self.bucket.list(prefix = self.key_prefix + 'd', delimiter = '/'): for k in self.bucket.list(prefix = self.key_prefix, delimiter = '/'): try: filename = k.key.replace(self.key_prefix, '', 1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/src/collections.py new/duplicity-0.4.12/src/collections.py --- old/duplicity-0.4.10/src/collections.py 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/src/collections.py 2008-07-22 17:20:04.000000000 +0200 @@ -789,6 +789,10 @@ NOTE: n = 1 -> time of latest available chain (n = 0 is not a valid input). Thus the second-to-last is obtained with n=2 rather than n=1.""" + + def mycmp(x, y): + return cmp(x.get_first().time, y.get_first().time) + assert self.values_set assert n > 0 @@ -796,9 +800,9 @@ return None sorted = self.all_backup_chains[:] - sorted.sort(reverse = True, - key = lambda chain: chain.get_first().time) + sorted.sort(mycmp) + sorted.reverse() return sorted[n - 1] def get_older_than(self, t): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/src/commandline.py new/duplicity-0.4.12/src/commandline.py --- old/duplicity-0.4.10/src/commandline.py 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/src/commandline.py 2008-07-22 17:20:04.000000000 +0200 @@ -329,6 +329,8 @@ --tempdir <directory> --timeout <seconds> -t<time>, --restore-time <time> + --time-separator <char> + --version --volsize <number> -v[0-9], --verbosity [0-9] """ % (globals.version, sys.platform)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/src/file_naming.py new/duplicity-0.4.12/src/file_naming.py --- old/duplicity-0.4.10/src/file_naming.py 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/src/file_naming.py 2008-07-22 17:20:04.000000000 +0200 @@ -23,16 +23,19 @@ full_vol_re = re.compile("^duplicity-full\\.(?P<time>.*?)\\.vol(?P<num>[0-9]+)\\.difftar($|\\.)") full_vol_re_short = re.compile("^df\\.(?P<time>[0-9a-z]+?)\\.(?P<num>[0-9a-z]+)\\.dt($|\\.)") + full_manifest_re = re.compile("^duplicity-full\\.(?P<time>.*?)\\.manifest($|\\.)") full_manifest_re_short = re.compile("^df\\.(?P<time>[0-9a-z]+?)\\.m($|\\.)") inc_vol_re = re.compile("^duplicity-inc\\.(?P<start_time>.*?)\\.to\\.(?P<end_time>.*?)\\.vol(?P<num>[0-9]+)\\.difftar($|\\.)") inc_vol_re_short = re.compile("^di\\.(?P<start_time>[0-9a-z]+?)\\.(?P<end_time>[0-9a-z]+?)\\.(?P<num>[0-9a-z]+)\\.dt($|\\.)") + inc_manifest_re = re.compile("^duplicity-inc\\.(?P<start_time>.*?)\\.to\\.(?P<end_time>.*?)\\.manifest(\\.|$)") inc_manifest_re_short = re.compile("^di\\.(?P<start_time>[0-9a-z]+?)\\.(?P<end_time>[0-9a-z]+?)\\.m(\\.|$)") full_sig_re = re.compile("^duplicity-full-signatures\\.(?P<time>.*?)\\.sigtar(\\.|$)") full_sig_re_short = re.compile("^dfs\\.(?P<time>[0-9a-z]+?)\\.st(\\.|$)") + new_sig_re = re.compile("^duplicity-new-signatures\\.(?P<start_time>.*?)\\.to\\.(?P<end_time>.*?)\\.sigtar(\\.|$)") new_sig_re_short = re.compile("^dns\\.(?P<start_time>[0-9a-z]+?)\\.(?P<end_time>[0-9a-z]+?)\\.st(\\.|$)") @@ -190,7 +193,7 @@ if t1 and t2: if m1: return ParseResults("inc", start_time = t1, - end_time = t2, volume_number = get_vol_num(m1.group("num"))) + end_time = t2, volume_number = get_vol_num(m1.group("num"))) else: return ParseResults("inc", start_time = t1, end_time = t2, manifest = 1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/src/globals.py new/duplicity-0.4.12/src/globals.py --- old/duplicity-0.4.10/src/globals.py 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/src/globals.py 2008-07-22 17:20:04.000000000 +0200 @@ -21,7 +21,7 @@ import socket, sys # The current version of duplicity -version = "0.4.10" +version = "0.4.12" # The name of the current host, or None if it cannot be set hostname = socket.getfqdn() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/duplicity-0.4.10/src/urlparse_2_5.py new/duplicity-0.4.12/src/urlparse_2_5.py --- old/duplicity-0.4.10/src/urlparse_2_5.py 2008-03-26 22:51:36.000000000 +0100 +++ new/duplicity-0.4.12/src/urlparse_2_5.py 2008-07-22 17:20:04.000000000 +0200 @@ -40,6 +40,15 @@ global _parse_cache _parse_cache = {} +import string +def _rsplit(str, delim, numsplit): + parts = string.split(str, delim) + if len(parts) <= numsplit + 1: + return parts + else: + left = string.join(parts[0:-numsplit], delim) + right = string.join(parts[len(parts)-numsplit:], delim) + return [left, right] class BaseResult(tuple): """Base class for the parsed result objects. @@ -55,66 +64,66 @@ # Attributes that access the basic components of the URL: - @property - def scheme(self): + def get_scheme(self): return self[0] + scheme = property(get_scheme) - @property - def netloc(self): + def get_netloc(self): return self[1] + netloc = property(get_netloc) - @property - def path(self): + def get_path(self): return self[2] + path = property(get_path) - @property - def query(self): + def get_query(self): return self[-2] + query = property(get_query) - @property - def fragment(self): + def get_fragment(self): return self[-1] + fragment = property(get_fragment) # Additional attributes that provide access to parsed-out portions # of the netloc: - @property - def username(self): + def get_username(self): netloc = self.netloc if "@" in netloc: - userinfo = netloc.rsplit("@", 1)[0] + userinfo = _rsplit(netloc, "@", 1)[0] if ":" in userinfo: userinfo = userinfo.split(":", 1)[0] return userinfo return None + username = property(get_username) - @property - def password(self): + def get_password(self): netloc = self.netloc if "@" in netloc: - userinfo = netloc.rsplit("@", 1)[0] + userinfo = _rsplit(netloc, "@", 1)[0] if ":" in userinfo: return userinfo.split(":", 1)[1] return None + password = property(get_password) - @property - def hostname(self): + def get_hostname(self): netloc = self.netloc if "@" in netloc: - netloc = netloc.rsplit("@", 1)[1] + netloc = _rsplit(netloc, "@", 1)[1] if ":" in netloc: netloc = netloc.split(":", 1)[0] return netloc.lower() or None + hostname = property(get_hostname) - @property - def port(self): + def get_port(self): netloc = self.netloc if "@" in netloc: - netloc = netloc.rsplit("@", 1)[1] + netloc = _rsplit(netloc, "@", 1)[1] if ":" in netloc: port = netloc.split(":", 1)[1] return int(port, 10) return None + port = property(get_port) class SplitResult(BaseResult): @@ -137,9 +146,9 @@ return BaseResult.__new__( cls, (scheme, netloc, path, params, query, fragment)) - @property - def params(self): + def get_params(self): return self[3] + params = property(get_params) def geturl(self): return urlunparse(self) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cmake
by root＠Hilbert.suse.de 05 Aug '08

05 Aug '08

Hello community, here is the log from the commit of package cmake checked in at Wed Aug 6 01:42:14 CEST 2008. -------- --- cmake/cmake.changes 2008-07-31 13:31:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/cmake/cmake.changes 2008-08-03 23:47:20.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 3 23:46:24 CEST 2008 - dmueller(a)suse.de + +- update to 2.6.1: + * Fix for bug 7427, preinstall target name hard coded + +------------------------------------------------------------------- Old: ---- cmake-2.6.1-RC-15.tar.bz2 New: ---- cmake-2.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.D26696/_old 2008-08-06 01:41:56.000000000 +0200 +++ /var/tmp/diff_new_pack.D26696/_new 2008-08-06 01:41:56.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package cmake (Version 2.6.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,10 +20,10 @@ Name: cmake Version: 2.6.1 -Release: 14 +Release: 19 License: BSD 3-Clause Group: Development/Tools/Building -%define tar_version 2.6.1-RC-15 +%define tar_version %version Url: http://www.cmake.org/ Source0: %{name}-%{tar_version}.tar.bz2 Patch0: cmake-2.6.0-use_intree_xmlrpc.patch @@ -122,6 +129,9 @@ %endif %changelog +* Mon Aug 04 2008 dmueller(a)suse.de +- update to 2.6.1: + * Fix for bug 7427, preinstall target name hard coded * Wed Jul 23 2008 dmueller(a)suse.de - update to 2.6.1-RC15: * FindMPI: Use the HINTS feature of find_library to find the right ++++++ cmake-2.6.1-RC-15.tar.bz2 -> cmake-2.6.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/ChangeLog.manual new/cmake-2.6.1/ChangeLog.manual --- old/cmake-2.6.1-RC-15/ChangeLog.manual 2008-07-30 21:36:03.000000000 +0200 +++ new/cmake-2.6.1/ChangeLog.manual 2008-08-01 17:34:50.000000000 +0200 @@ -1,3 +1,10 @@ +Changes in CMake 2.6.1 RC 16 +- Fix for bug 7427, preinstall target name hard coded +- Fix issue #7088 - do not emit error messages when attempts to run + Visual Studio macros fail. You can still get the error output + as messages if you want using --debug-output from the cmake command line. +- Fix InstallRequiredSystemLibraries.cmake to work with win64 + Changes in CMake 2.6.1 RC 15 - Fix bug 7426 FindJPEG module causes error when setting JPEG_LIBRARY to blank - Fix bug 7414 PackageMaker generator crashes when given components diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/CMakeLists.txt new/cmake-2.6.1/CMakeLists.txt --- old/cmake-2.6.1-RC-15/CMakeLists.txt 2008-07-30 21:36:03.000000000 +0200 +++ new/cmake-2.6.1/CMakeLists.txt 2008-08-01 17:34:50.000000000 +0200 @@ -354,7 +354,7 @@ SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 6) SET(CMake_VERSION_PATCH 1) -SET(CMake_VERSION_RC 15) +#SET(CMake_VERSION_RC 16) # CVS versions are odd, if this is an odd minor version # then set the CMake_VERSION_DATE variable IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Modules/InstallRequiredSystemLibraries.cmake new/cmake-2.6.1/Modules/InstallRequiredSystemLibraries.cmake --- old/cmake-2.6.1-RC-15/Modules/InstallRequiredSystemLibraries.cmake 2008-07-30 21:36:04.000000000 +0200 +++ new/cmake-2.6.1/Modules/InstallRequiredSystemLibraries.cmake 2008-08-01 17:34:50.000000000 +0200 @@ -26,13 +26,20 @@ "${SYSTEMROOT}/system32/msvcr71.dll" ) ENDIF(MSVC71) + + IF(CMAKE_CL_64) + SET(CMAKE_MSVC_ARCH amd64) + ELSE(CMAKE_CL_64) + SET(CMAKE_MSVC_ARCH x86) + ENDIF(CMAKE_CL_64) + IF(MSVC80) # Find the runtime library redistribution directory. - FIND_PATH(MSVC80_REDIST_DIR NAMES x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest + FIND_PATH(MSVC80_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]/../../VC/redist" ) MARK_AS_ADVANCED(MSVC80_REDIST_DIR) - SET(MSVC80_CRT_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.CRT") + SET(MSVC80_CRT_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. @@ -45,7 +52,7 @@ IF(CMAKE_INSTALL_DEBUG_LIBRARIES) SET(MSVC80_CRT_DIR - "${MSVC80_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT") + "${MSVC80_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugCRT") SET(__install__libs ${__install__libs} "${MSVC80_CRT_DIR}/Microsoft.VC80.DebugCRT.manifest" "${MSVC80_CRT_DIR}/msvcm80d.dll" @@ -57,13 +64,13 @@ ENDIF(MSVC80) IF(MSVC90) # Find the runtime library redistribution directory. - FIND_PATH(MSVC90_REDIST_DIR NAMES x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest + FIND_PATH(MSVC90_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]/../../VC/redist" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0;InstallDir]/../../VC/redist" ) MARK_AS_ADVANCED(MSVC90_REDIST_DIR) - SET(MSVC90_CRT_DIR "${MSVC90_REDIST_DIR}/x86/Microsoft.VC90.CRT") + SET(MSVC90_CRT_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. @@ -75,7 +82,7 @@ ) IF(CMAKE_INSTALL_DEBUG_LIBRARIES) SET(MSVC90_CRT_DIR - "${MSVC90_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC90.DebugCRT") + "${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugCRT") SET(__install__libs ${__install__libs} "${MSVC90_CRT_DIR}/Microsoft.VC90.DebugCRT.manifest" "${MSVC90_CRT_DIR}/msvcm90d.dll" @@ -98,7 +105,7 @@ IF(MSVC80) IF(CMAKE_INSTALL_DEBUG_LIBRARIES) SET(MSVC80_MFC_DIR - "${MSVC80_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC80.DebugMFC") + "${MSVC80_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugMFC") SET(__install__libs ${__install__libs} "${MSVC80_MFC_DIR}/Microsoft.VC80.DebugMFC.manifest" "${MSVC80_MFC_DIR}/mfc80d.dll" @@ -108,7 +115,7 @@ ) ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES) - SET(MSVC80_MFC_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.MFC") + SET(MSVC80_MFC_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFC") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. SET(__install__libs ${__install__libs} @@ -119,7 +126,7 @@ "${MSVC80_MFC_DIR}/mfcm80u.dll" ) # include the language dll's for vs8 as well as the actuall dll's - SET(MSVC80_MFCLOC_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.MFCLOC") + SET(MSVC80_MFCLOC_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFCLOC") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. SET(__install__libs ${__install__libs} @@ -138,7 +145,7 @@ IF(MSVC90) IF(CMAKE_INSTALL_DEBUG_LIBRARIES) SET(MSVC90_MFC_DIR - "${MSVC90_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC90.DebugMFC") + "${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugMFC") SET(__install__libs ${__install__libs} "${MSVC90_MFC_DIR}/Microsoft.VC90.DebugMFC.manifest" "${MSVC90_MFC_DIR}/mfc90d.dll" @@ -148,7 +155,7 @@ ) ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES) - SET(MSVC90_MFC_DIR "${MSVC90_REDIST_DIR}/x86/Microsoft.VC90.MFC") + SET(MSVC90_MFC_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFC") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. SET(__install__libs ${__install__libs} @@ -159,7 +166,7 @@ "${MSVC90_MFC_DIR}/mfcm90u.dll" ) # include the language dll's for vs9 as well as the actuall dll's - SET(MSVC90_MFCLOC_DIR "${MSVC90_REDIST_DIR}/x86/Microsoft.VC90.MFCLOC") + SET(MSVC90_MFCLOC_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFCLOC") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. SET(__install__libs ${__install__libs} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmake.cxx new/cmake-2.6.1/Source/cmake.cxx --- old/cmake-2.6.1-RC-15/Source/cmake.cxx 2008-07-30 21:36:05.000000000 +0200 +++ new/cmake-2.6.1/Source/cmake.cxx 2008-08-01 17:34:51.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmake.cxx,v $ Language: C++ - Date: $Date: 2008-07-13 21:55:24 $ - Version: $Revision: 1.375.2.9 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.375.2.10 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -1422,7 +1422,8 @@ } } - return cmCallVisualStudioMacro::CallMacro(args[2], args[3], macroArgs); + return cmCallVisualStudioMacro::CallMacro(args[2], args[3], + macroArgs, true); } #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmCallVisualStudioMacro.cxx new/cmake-2.6.1/Source/cmCallVisualStudioMacro.cxx --- old/cmake-2.6.1-RC-15/Source/cmCallVisualStudioMacro.cxx 2008-07-30 21:36:05.000000000 +0200 +++ new/cmake-2.6.1/Source/cmCallVisualStudioMacro.cxx 2008-08-01 17:34:51.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmCallVisualStudioMacro.cxx,v $ Language: C++ - Date: $Date: 2008-02-15 16:49:58 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.3.2.1 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -24,6 +24,11 @@ #endif +// Just for this file: +// +static bool LogErrorsAsMessages; + + #if defined(HAVE_COMDEF_H) @@ -31,17 +36,20 @@ //---------------------------------------------------------------------------- -///! Use ReportHRESULT to make a cmSystemTools::Error after calling +///! Use ReportHRESULT to make a cmSystemTools::Message after calling ///! a COM method that may have failed. #define ReportHRESULT(hr, context) \ if (FAILED(hr)) \ { \ - std::ostringstream oss; \ - oss.flags(std::ios::hex); \ - oss << context << " failed HRESULT, hr = 0x" << hr << std::endl; \ - oss.flags(std::ios::dec); \ - oss << __FILE__ << "(" << __LINE__ << ")"; \ - cmSystemTools::Error(oss.str().c_str()); \ + if (LogErrorsAsMessages) \ + { \ + std::ostringstream oss; \ + oss.flags(std::ios::hex); \ + oss << context << " failed HRESULT, hr = 0x" << hr << std::endl; \ + oss.flags(std::ios::dec); \ + oss << __FILE__ << "(" << __LINE__ << ")"; \ + cmSystemTools::Message(oss.str().c_str()); \ + } \ } @@ -404,6 +412,8 @@ { int count = 0; + LogErrorsAsMessages = false; + #if defined(HAVE_COMDEF_H) HRESULT hr = CoInitialize(0); ReportHRESULT(hr, "CoInitialize"); @@ -438,10 +448,13 @@ int cmCallVisualStudioMacro::CallMacro( const std::string& slnFile, const std::string& macro, - const std::string& args) + const std::string& args, + const bool logErrorsAsMessages) { int err = 1; // no comdef.h + LogErrorsAsMessages = logErrorsAsMessages; + #if defined(HAVE_COMDEF_H) err = 2; // error initializing @@ -489,16 +502,19 @@ (void)slnFile; (void)macro; (void)args; - cmSystemTools::Error("cmCallVisualStudioMacro::CallMacro is not " - "supported on this platform"); + if (LogErrorsAsMessages) + { + cmSystemTools::Message("cmCallVisualStudioMacro::CallMacro is not " + "supported on this platform"); + } #endif - if (err) + if (err && LogErrorsAsMessages) { std::ostringstream oss; oss << "cmCallVisualStudioMacro::CallMacro failed, err = " << err; - cmSystemTools::Error(oss.str().c_str()); + cmSystemTools::Message(oss.str().c_str()); } - return err; + return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmCallVisualStudioMacro.h new/cmake-2.6.1/Source/cmCallVisualStudioMacro.h --- old/cmake-2.6.1-RC-15/Source/cmCallVisualStudioMacro.h 2008-07-30 21:36:05.000000000 +0200 +++ new/cmake-2.6.1/Source/cmCallVisualStudioMacro.h 2008-08-01 17:34:51.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmCallVisualStudioMacro.h,v $ Language: C++ - Date: $Date: 2007-11-16 12:01:58 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.1.2.1 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -33,7 +33,8 @@ ///! macro in each Visual Studio instance. static int CallMacro(const std::string& slnFile, const std::string& macro, - const std::string& args); + const std::string& args, + const bool logErrorsAsMessages); ///! Count the number of running instances of Visual Studio with the ///! given solution file open. Pass "ALL" for slnFile to count all diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmGlobalGenerator.cxx new/cmake-2.6.1/Source/cmGlobalGenerator.cxx --- old/cmake-2.6.1-RC-15/Source/cmGlobalGenerator.cxx 2008-07-30 21:36:05.000000000 +0200 +++ new/cmake-2.6.1/Source/cmGlobalGenerator.cxx 2008-08-01 17:34:52.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmGlobalGenerator.cxx,v $ Language: C++ - Date: $Date: 2008-07-17 14:14:25 $ - Version: $Revision: 1.227.2.5 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.227.2.6 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -1565,7 +1565,7 @@ cpackCommandLines.push_back(singleLine); if ( this->GetPreinstallTargetName() ) { - depends.push_back("preinstall"); + depends.push_back(this->GetPreinstallTargetName()); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmGlobalVisualStudioGenerator.cxx new/cmake-2.6.1/Source/cmGlobalVisualStudioGenerator.cxx --- old/cmake-2.6.1-RC-15/Source/cmGlobalVisualStudioGenerator.cxx 2008-07-30 21:36:06.000000000 +0200 +++ new/cmake-2.6.1/Source/cmGlobalVisualStudioGenerator.cxx 2008-08-01 17:34:52.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmGlobalVisualStudioGenerator.cxx,v $ Language: C++ - Date: $Date: 2008-05-01 16:35:39 $ - Version: $Revision: 1.11.2.1 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.11.2.2 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -178,14 +178,16 @@ projects += ";"; projects += *it; } - cmCallVisualStudioMacro::CallMacro - (topLevelSlnName, CMAKE_VSMACROS_RELOAD_MACRONAME, projects); + cmCallVisualStudioMacro::CallMacro(topLevelSlnName, + CMAKE_VSMACROS_RELOAD_MACRONAME, projects, + this->GetCMakeInstance()->GetDebugOutput()); } } else if(m == MacroStop) { cmCallVisualStudioMacro::CallMacro(topLevelSlnName, - CMAKE_VSMACROS_STOP_MACRONAME, ""); + CMAKE_VSMACROS_STOP_MACRONAME, "", + this->GetCMakeInstance()->GetDebugOutput()); } } } Files old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/BundleIcon.icns and new/cmake-2.6.1/Tests/BundleGeneratorTest/BundleIcon.icns differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/CMakeLists.txt new/cmake-2.6.1/Tests/BundleGeneratorTest/CMakeLists.txt --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/CMakeLists.txt 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,24 @@ +PROJECT(BundleGeneratorTest) + +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +# Build a shared library and install it in lib/ +ADD_LIBRARY(Library SHARED Library.cxx) +INSTALL(TARGETS Library DESTINATION lib) + +# Build an executable and install it in bin/ +ADD_EXECUTABLE(Executable Executable.cxx) +TARGET_LINK_LIBRARIES(Executable Library) +INSTALL(TARGETS Executable DESTINATION bin) + +# Use the bundle-generator for packaging ... +SET(CPACK_GENERATOR "Bundle") +SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/BundleIcon.icns") +SET(CPACK_BUNDLE_NAME "BundleGeneratorTest") +SET(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist") +SET(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/StartupCommand") +SET(CPACK_PACKAGE_DESCRIPTION "Project for testing OSX bundle generation") +SET(CPACK_PACKAGE_NAME "BundleGeneratorTest") +SET(CPACK_PACKAGE_VERSION "0.1") +INCLUDE(CPack) + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Executable.cxx new/cmake-2.6.1/Tests/BundleGeneratorTest/Executable.cxx --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Executable.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/Executable.cxx 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,8 @@ +extern void print_message(const char* const Message); + +int main(int argc, char* argv[]) +{ + print_message("Howdy, World!\n"); + return 0; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Info.plist new/cmake-2.6.1/Tests/BundleGeneratorTest/Info.plist --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Info.plist 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/Info.plist 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>CFBundleExecutable</key> + <string>BundleGeneratorTest</string> + <key>CFBundleIconFile</key> + <string>BundleGeneratorTest.icns</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + </dict> +</plist> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Library.cxx new/cmake-2.6.1/Tests/BundleGeneratorTest/Library.cxx --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Library.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/Library.cxx 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,7 @@ +#include <iostream> + +void print_message(const char* const Message) +{ + std::cout << Message; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/StartupCommand new/cmake-2.6.1/Tests/BundleGeneratorTest/StartupCommand --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/StartupCommand 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/StartupCommand 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,12 @@ +#!/bin/sh + +BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/.*//'`" +RESOURCES="$BUNDLE/Contents/Resources" + +echo "BUNDLE: $BUNDLE" +echo "RESOURCES: $RESOURCES" + +export DYLD_LIBRARY_PATH=$RESOURCES/lib + +exec "$RESOURCES/bin/Executable" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/CMakeLists.txt new/cmake-2.6.1/Tests/CMakeLists.txt --- old/cmake-2.6.1-RC-15/Tests/CMakeLists.txt 2008-07-30 21:36:08.000000000 +0200 +++ new/cmake-2.6.1/Tests/CMakeLists.txt 2008-08-01 17:34:55.000000000 +0200 @@ -705,6 +705,20 @@ ADD_TEST_MACRO(ObjC++ ObjC++) ENDIF (APPLE AND CMAKE_COMPILER_IS_GNUCXX) + IF(APPLE AND CTEST_TEST_CPACK) + ADD_TEST(BundleGeneratorTest ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/BundleGeneratorTest" + "${CMake_BINARY_DIR}/Tests/BundleGeneratorTest" + --build-two-config + --build-generator ${CMAKE_TEST_GENERATOR} + --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} + --build-project BundleGeneratorTest + --build-target package + --build-options "-DCMAKE_INSTALL_PREFIX:PATH=${CMake_BINARY_DIR}/Tests/BundleGeneratorTest/InstallDirectory" + ) + ENDIF(APPLE AND CTEST_TEST_CPACK) + IF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS) CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest/test.cmake.in" "${CMake_BINARY_DIR}/Tests/CTestTest/test.cmake" @ONLY ESCAPE_QUOTES) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ConsoleKit
by root＠Hilbert.suse.de 05 Aug '08

05 Aug '08

Hello community, here is the log from the commit of package ConsoleKit checked in at Wed Aug 6 01:42:07 CEST 2008. -------- --- ConsoleKit/ConsoleKit.changes 2008-05-13 12:49:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/ConsoleKit/ConsoleKit.changes 2008-07-21 10:45:17.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 18 10:09:18 CEST 2008 - hmacht(a)suse.de + +- build with PolicyKit support (bnc#399476) +- update ConsoleKit-libexecdir.patch + +------------------------------------------------------------------- ConsoleKit-doc.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ConsoleKit-doc.spec ++++++ --- /var/tmp/diff_new_pack.L26183/_old 2008-08-06 01:41:48.000000000 +0200 +++ /var/tmp/diff_new_pack.L26183/_new 2008-08-06 01:41:48.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package ConsoleKit-doc (Version 0.2.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,14 +25,14 @@ # ConsoleKit.spec and then run pre-checkin.sh which will create # ConsoleKit-doc.spec based upon ConsoleKit.spec. Url: http://consolekit.freedesktop.org -BuildRequires: dbus-1-glib-devel gcc pam-devel pkgconfig xorg-x11-libX11-devel zlib-devel +BuildRequires: PolicyKit-devel dbus-1-glib-devel gcc pam-devel pkgconfig xorg-x11-libX11-devel zlib-devel %if %build_doc BuildRequires: gtk2-devel xmlto Provides: ConsoleKit:/usr/share/doc/packages/ConsoleKit/spec/ConcoleKit.html %endif Summary: System daemon for tracking users, sessions and seats Version: 0.2.10 -Release: 12 +Release: 37 License: GPL v2 or later Group: System/Daemons AutoReqProv: on @@ -180,6 +187,8 @@ %_mandir/man8/pam_ck_connector.8.gz /%_lib/security %_localstatedir/run/ConsoleKit +%dir %{_datadir}/PolicyKit/policy +%{_datadir}/PolicyKit/policy/ConsoleKit.policy %files -n ConsoleKit-devel %defattr(-,root,root) @@ -195,6 +204,9 @@ %endif %changelog +* Fri Jul 18 2008 hmacht(a)suse.de +- build with PolicyKit support (bnc#399476) +- update ConsoleKit-libexecdir.patch * Tue May 13 2008 hmacht(a)suse.de - also change libdir to prefix/lib in ck-session.c (bnc#386369) * Fri Apr 18 2008 hmacht(a)suse.de ++++++ ConsoleKit.spec ++++++ --- /var/tmp/diff_new_pack.L26183/_old 2008-08-06 01:41:48.000000000 +0200 +++ /var/tmp/diff_new_pack.L26183/_new 2008-08-06 01:41:48.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package ConsoleKit (Version 0.2.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,14 +25,14 @@ # ConsoleKit.spec and then run pre-checkin.sh which will create # ConsoleKit-doc.spec based upon ConsoleKit.spec. Url: http://consolekit.freedesktop.org -BuildRequires: dbus-1-glib-devel gcc pam-devel pkgconfig xorg-x11-libX11-devel zlib-devel +BuildRequires: PolicyKit-devel dbus-1-glib-devel gcc pam-devel pkgconfig xorg-x11-libX11-devel zlib-devel %if %build_doc BuildRequires: gtk2-devel xmlto Provides: ConsoleKit:/usr/share/doc/packages/ConsoleKit/spec/ConcoleKit.html %endif Summary: System daemon for tracking users, sessions and seats Version: 0.2.10 -Release: 9 +Release: 28 License: GPL v2 or later Group: System/Daemons AutoReqProv: on @@ -180,6 +187,8 @@ %_mandir/man8/pam_ck_connector.8.gz /%_lib/security %_localstatedir/run/ConsoleKit +%dir %{_datadir}/PolicyKit/policy +%{_datadir}/PolicyKit/policy/ConsoleKit.policy %files -n ConsoleKit-devel %defattr(-,root,root) @@ -195,6 +204,9 @@ %endif %changelog +* Fri Jul 18 2008 hmacht(a)suse.de +- build with PolicyKit support (bnc#399476) +- update ConsoleKit-libexecdir.patch * Tue May 13 2008 hmacht(a)suse.de - also change libdir to prefix/lib in ck-session.c (bnc#386369) * Fri Apr 18 2008 hmacht(a)suse.de ++++++ ConsoleKit-libexecdir.patch ++++++ --- /var/tmp/diff_new_pack.L26183/_old 2008-08-06 01:41:48.000000000 +0200 +++ /var/tmp/diff_new_pack.L26183/_new 2008-08-06 01:41:48.000000000 +0200 @@ -1,3 +1,23 @@ +--- src/ck-manager.c ++++ src/ck-manager.c +@@ -1357,7 +1357,7 @@ + log_system_restart_event (manager); + + error = NULL; +- res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-restart", ++ res = g_spawn_command_line_async (PREFIX "/lib/ConsoleKit/scripts/ck-system-restart", + &error); + if (! res) { + GError *new_error; +@@ -1415,7 +1415,7 @@ + log_system_stop_event (manager); + + error = NULL; +- res = g_spawn_command_line_async (LIBDIR "/ConsoleKit/scripts/ck-system-stop", ++ res = g_spawn_command_line_async ( PREFIX "/lib/ConsoleKit/scripts/ck-system-stop", + &error); + if (! res) { + GError *new_error; --- src/ck-session.c +++ src/ck-session.c @@ -1242,7 +1242,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 audit
by root＠Hilbert.suse.de 05 Aug '08

05 Aug '08

Hello community, here is the log from the commit of package audit checked in at Wed Aug 6 01:40:59 CEST 2008. -------- --- audit/audit.changes 2008-06-25 01:53:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/audit/audit.changes 2008-08-05 03:14:01.308937000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 5 03:13:56 CEST 2008 - tonyj(a)suse.de + +- Remove audit rules on audit stop (bnc#409093) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audit-secondary.spec ++++++ --- /var/tmp/diff_new_pack.t20537/_old 2008-08-06 01:40:26.000000000 +0200 +++ /var/tmp/diff_new_pack.t20537/_new 2008-08-06 01:40:26.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package audit-secondary (Version 1.7.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,7 +26,7 @@ License: GPL v2 or later Group: System/Monitoring Version: 1.7.4 -Release: 2 +Release: 3 Url: http://people.redhat.com/sgrubb/audit/ Source0: audit-%{version}.tar.bz2 Patch0: audit-no_sca.patch ++++++ audit.spec ++++++ --- /var/tmp/diff_new_pack.t20537/_old 2008-08-06 01:40:26.000000000 +0200 +++ /var/tmp/diff_new_pack.t20537/_new 2008-08-06 01:40:26.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package audit (Version 1.7.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,7 +22,7 @@ BuildRequires: gcc-c++ Summary: User Space Tools for 2.6 Kernel Auditing Version: 1.7.4 -Release: 9 +Release: 13 License: GPL v2 or later Group: System/Monitoring Url: http://people.redhat.com/sgrubb/audit/ @@ -202,6 +209,8 @@ %attr(755,root,root) /usr/bin/ausyscall %changelog +* Tue Aug 05 2008 tonyj(a)suse.de +- Remove audit rules on audit stop (bnc#409093) * Wed Jun 25 2008 tonyj(a)suse.de - Update from 1.7.2 to 1.7.4 - Redhat changelog for 1.7.3 - 1.7.4 follows: ++++++ auditd.init ++++++ --- audit/auditd.init 2007-10-30 22:09:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/audit/auditd.init 2008-08-05 01:38:56.195715000 +0200 @@ -117,8 +117,14 @@ killproc -TERM $AUDITD_BIN - # Remember status and be verbose + # Remember status and be verbose. Failure of following auditctl -D + # shouldn't impact status rc_status -v + + # Remove watches so shutdown works cleanly + if test "`echo $AUDITD_CLEAN_STOP | tr 'NO' 'no'`" != "no" ; then + /sbin/auditctl -D >/dev/null + fi ;; try-restart|condrestart) ## Do a restart only if the service was active before. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base
by root＠Hilbert.suse.de 05 Aug '08

05 Aug '08

Hello community, here is the log from the commit of package aaa_base checked in at Wed Aug 6 01:40:46 CEST 2008. -------- --- aaa_base/aaa_base.changes 2008-08-04 12:18:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2008-08-05 14:07:21.261625000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 5 14:04:33 CEST 2008 - werner(a)suse.de + +- Start blogd after /dev/pts is mounted (bnc#410301) and related + changes for better mainframe support in boot, rc, and halt. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.k18791/_old 2008-08-06 01:40:24.000000000 +0200 +++ /var/tmp/diff_new_pack.k18791/_new 2008-08-06 01:40:24.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package aaa_base (Version 11.0.42) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -21,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.0.42 -Release: 20 +Release: 23 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -143,6 +150,9 @@ %defattr(-,root,root) %changelog +* Tue Aug 05 2008 werner(a)suse.de +- Start blogd after /dev/pts is mounted (bnc#410301) and related + changes for better mainframe support in boot, rc, and halt. * Mon Aug 04 2008 ro(a)suse.de - added sourcing of command_not_found handlers to bash.bashrc (bnc#412558) ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot new/aaa_base/etc/init.d/boot --- old/aaa_base/etc/init.d/boot 2008-07-18 16:56:50.000000000 +0200 +++ new/aaa_base/etc/init.d/boot 2008-08-05 14:00:35.000000000 +0200 @@ -50,6 +50,8 @@ # if test -x /sbin/isserial && /sbin/isserial ; then test "$TERM" = "linux" -o -z "$TERM" && TERM=vt102 +elif test "${REDIRECT%[0-9]}" = "/dev/ttyS" ; then + test "$TERM" = "linux" -o -z "$TERM" && TERM=vt102 fi # @@ -63,22 +65,6 @@ stty -nl -ixon ignbrk -brkint fi -# -# Start blogd, requires /proc and /dev/pts. -# Export the real device in variable REDIRECT. -# -if test -z "$REDIRECT" ; then - if (echo -n > /dev/tty) 2>/dev/null ; then - REDIRECT=/dev/tty - else - REDIRECT=/dev/console - fi -else - if test -x /sbin/blogd ; then - /sbin/blogd $REDIRECT - fi -fi - echo -n "System Boot Control: " echo "Running $0" @@ -154,6 +140,22 @@ export DO_CONFIRM # +# Start blogd, requires /proc and /dev/pts. +# Export the real device in variable REDIRECT. +# +if test -z "$REDIRECT" ; then + if (echo -n > /dev/tty) 2>/dev/null ; then + REDIRECT=/dev/tty + else + REDIRECT=/dev/console + fi +else + if test -x /sbin/blogd ; then + /sbin/blogd $REDIRECT + fi +fi + +# # Common used variables # bootrc=/etc/init.d/boot.d diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.localfs new/aaa_base/etc/init.d/boot.localfs --- old/aaa_base/etc/init.d/boot.localfs 2008-07-22 11:49:26.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.localfs 2008-08-05 13:42:14.000000000 +0200 @@ -196,7 +196,6 @@ # clean up # rm -f /etc/nologin /nologin /fastboot /forcefsck /success - rc_status -v -r # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot.rootfsck new/aaa_base/etc/init.d/boot.rootfsck --- old/aaa_base/etc/init.d/boot.rootfsck 2008-04-07 11:12:49.000000000 +0200 +++ new/aaa_base/etc/init.d/boot.rootfsck 2008-08-05 13:42:45.000000000 +0200 @@ -152,6 +152,7 @@ fi # start with a clean mtab and enter root fs entry rm -f /etc/mtab* + > /etc/mtab mount -f / ;; stop) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/halt new/aaa_base/etc/init.d/halt --- old/aaa_base/etc/init.d/halt 2008-08-01 14:03:26.000000000 +0200 +++ new/aaa_base/etc/init.d/halt 2008-08-05 13:54:20.000000000 +0200 @@ -110,10 +110,14 @@ # give processes in front a chance to quit hupon="" -for tty in tty1 tty2 tty3 tty4 tty5 tty6; do +for tty in ${REDIRECT##*/} tty1 tty2 tty3 tty4 tty5 tty6 ttyS0 ttyS1; do test -w /dev/$tty || continue test -c /dev/$tty || continue - > /dev/$tty > /dev/null 2>&1 || continue + # redirect shell errors to /dev/null + exec 3>&2 2>/dev/null + > /dev/$tty || continue + # get shell errors back + exec 2>&3- hupon="${hupon:+$hupon }/dev/$tty" done test -z "$hupon" || fuser -sk -HUP $hupon diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/rc new/aaa_base/etc/init.d/rc --- old/aaa_base/etc/init.d/rc 2008-07-18 16:56:57.000000000 +0200 +++ new/aaa_base/etc/init.d/rc 2008-08-05 13:59:58.000000000 +0200 @@ -136,6 +136,8 @@ # if test -x /sbin/isserial && /sbin/isserial ; then test "$TERM" = "linux" -o -z "$TERM" && TERM=vt102 +elif test "${REDIRECT%[0-9]}" = "/dev/ttyS" ; then + test "$TERM" = "linux" -o -z "$TERM" && TERM=vt102 else # VGA if test "$RUNLEVEL" = "0" -o "$RUNLEVEL" = "6" ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-bootloader
by root＠Hilbert.suse.de 04 Aug '08

04 Aug '08

Hello community, here is the log from the commit of package yast2-bootloader checked in at Mon Aug 4 14:22:17 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-07-23 15:26:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-08-04 14:04:20.000000000 +0200 @@ -1,0 +2,26 @@ +Mon Aug 4 13:29:01 CEST 2008 - juhliarik(a)suse.cz + +- added support for reducing devices from device.map to 8 devices + (fate #303548) +- 2.17.8 + +------------------------------------------------------------------- +Thu Jul 31 10:27:42 CEST 2008 - juhliarik(a)suse.cz + +- added support for remaping windows chainloader boot section + (fate #301994) +- 2.17.7 + +------------------------------------------------------------------- +Tue Jul 29 18:18:38 CEST 2008 - juhliarik(a)suse.cz + +- update solution for saving kernel args to + /etc/sysconfig/bootloader (fate #302245) +- 2.17.6 + +------------------------------------------------------------------ +Sun Jul 27 17:52:58 CEST 2008 - juhliarik(a)suse.cz + +- added powersaved=off to boot section for failsave (bnc #153345) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.17.5.tar.bz2 New: ---- yast2-bootloader-2.17.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.r27983/_old 2008-08-04 14:21:55.000000000 +0200 +++ /var/tmp/diff_new_pack.r27983/_new 2008-08-04 14:21:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.17.5) +# spec file for package yast2-bootloader (Version 2.17.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-bootloader -Version: 2.17.5 +Version: 2.17.8 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.17.5.tar.bz2 +Source0: yast2-bootloader-2.17.8.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -54,7 +54,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.17.5 +%setup -n yast2-bootloader-2.17.8 %build %{prefix}/bin/y2tool y2autoconf @@ -99,6 +99,20 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Mon Aug 04 2008 juhliarik(a)suse.cz +- added support for reducing devices from device.map to 8 devices + (fate #303548) +- 2.17.8 +* Thu Jul 31 2008 juhliarik(a)suse.cz +- added support for remaping windows chainloader boot section + (fate #301994) +- 2.17.7 +* Tue Jul 29 2008 juhliarik(a)suse.cz +- update solution for saving kernel args to + /etc/sysconfig/bootloader (fate #302245) +- 2.17.6 +* Sun Jul 27 2008 juhliarik(a)suse.cz +- added powersaved=off to boot section for failsave (bnc #153345) * Wed Jul 23 2008 juhliarik(a)suse.cz - added support for persistent device names (fate #302219) - 2.17.5 ++++++ yast2-bootloader-2.17.5.tar.bz2 -> yast2-bootloader-2.17.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/clients/bootloader_proposal.ycp new/yast2-bootloader-2.17.8/src/clients/bootloader_proposal.ycp --- old/yast2-bootloader-2.17.5/src/clients/bootloader_proposal.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/clients/bootloader_proposal.ycp 2008-08-01 17:20:31.000000000 +0200 @@ -1,7 +1,7 @@ /** * Module: bootloader_proposal.ycp * - * $Id: bootloader_proposal.ycp 46947 2008-04-22 11:09:42Z juhliarik $ + * $Id: bootloader_proposal.ycp 49588 2008-08-01 15:20:30Z juhliarik $ * * Author: Klaus Kaempf <kkaempf(a)suse.de> * @@ -89,6 +89,8 @@ // into our configuration BootGRUB::merge_level = `main; Bootloader::Propose (); + + BootGRUB::merge_level = `none; } else @@ -100,6 +102,26 @@ ret = $[ "raw_proposal" : Bootloader::Summary ()]; + + if (Bootloader::getLoaderType () == "grub") + { + import "BootGRUB"; + if (BootGRUB::CheckDeviceMap()) + { + ret = (map<string,any>) union (ret, + $[ + "warning_level" : `blocker, + "warning" : + ret["warning"]:"" + + _("Configure a valid boot loader location before continuing. +The device map includes more than 8 devices and the boot device is out of range. +The range is the first 8 devices by BIOS."), + ] + ); + return ret; + } + } + //F#300779 - Install diskless client (NFS-root) //kokso: bootloader will not be installed diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/clients/inst_bootloader.ycp new/yast2-bootloader-2.17.8/src/clients/inst_bootloader.ycp --- old/yast2-bootloader-2.17.5/src/clients/inst_bootloader.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/clients/inst_bootloader.ycp 2008-07-30 14:00:40.000000000 +0200 @@ -52,76 +52,8 @@ }); } -string lt = Bootloader::getLoaderType (); - -y2milestone ("Saving /etc/sysconfig/bootloader for %1", lt); - -// save some sysconfig variables -// register new agent pointing into the mounted filesystem -WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig"); -WFM::Write(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); -string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; -SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini( - `SysConfigFile(target_sysconfig_path))); - -if (Mode::installation()) - SCR::Write (.target.sysconfig.bootloader.LOADER_TYPE, lt); - -// get the default and failsafe append + vga parameters; if section with -// appropriate original name not found, just use any Linux section -// doing so during update may be questionable, however, the variables need to -// be initialized in any case -string default_vga = ""; -string default_append = ""; -boolean default_set = false; -string failsafe_vga = ""; -string failsafe_append = ""; -boolean failsafe_set = false; -string xen_vga = ""; -string xen_append = ""; -boolean xen_set = false; -foreach (map<string,any>s, BootCommon::sections, { - if (s["original_name"]:"" == "linux") - { - default_set = true; - default_vga = s["vgamode"]:""; - default_append = s["append"]:""; - } - if (s["original_name"]:"" == "xen") - { - xen_set = true; - xen_vga = s["vgamode"]:""; - xen_append = s["append"]:""; - } - else if (s["original_name"]:"" == "failsafe") - { - failsafe_set = true; - failsafe_vga = s["vgamode"]:""; - failsafe_append = s["append"]:""; - } - if (s["type"]:"" == "image" && ! default_set) - { - default_vga = s["vgamode"]:""; - default_append = s["append"]:""; - } - if (s["type"]:"" == "image" && ! failsafe_set) - { - failsafe_vga = s["vgamode"]:""; - failsafe_append = s["append"]:""; - } -}); -if (! xen_set) -{ - xen_append = default_append; - xen_vga = default_vga; -} -SCR::Write (.target.sysconfig.bootloader.DEFAULT_APPEND, default_append); -SCR::Write (.target.sysconfig.bootloader.DEFAULT_VGA, default_vga); -SCR::Write (.target.sysconfig.bootloader.FAILSAFE_APPEND, failsafe_append); -SCR::Write (.target.sysconfig.bootloader.FAILSAFE_VGA, failsafe_vga); -SCR::Write (.target.sysconfig.bootloader.XEN_APPEND, xen_append); -SCR::Write (.target.sysconfig.bootloader.XEN_VGA, xen_vga); -SCR::Write (.target.sysconfig.bootloader, nil); +// FATE #302245 save kernel args etc to /etc/sysconfig/bootloader +BootCommon::WriteToSysconf(true); y2milestone ("finish inst_bootloader"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/grub/misc.ycp new/yast2-bootloader-2.17.8/src/grub/misc.ycp --- old/yast2-bootloader-2.17.5/src/grub/misc.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/grub/misc.ycp 2008-08-04 13:34:56.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 48549 2008-06-26 14:50:07Z juhliarik $ + * $Id: misc.ycp 49630 2008-08-04 11:34:56Z juhliarik $ * */ @@ -23,6 +23,7 @@ import "Mode"; import "BootCommon"; import "PackageSystem"; + import "Map"; // -------------------------------------------------------------- @@ -1038,8 +1039,195 @@ string ret = devpth[0]:"" + devpth[1]:""; return ret; } + + +/** FATE #301994 - Correct device mapping in case windows is installed on the second HD + * Check if chainloader section with windows is on the first disk + * + * @param map<string,any> section from BootCommon::sections + * @return boolean true if it is necessary remap section + */ +define boolean isWidnowsOnBootDisk(map<string,any> section) +{ + // check if it is windows chainloader + if ((search(tolower(section["name"]:""), "windows") != nil) + || (search(tolower(section["original_name"]:""), "windows") != nil)) + { + map p_dev = Storage::GetDiskPartition (section["chainloader"]:""); + + string disk_dev = p_dev["disk"]:""; + if (disk_dev == "") + { + y2error("trying find disk for windows chainloader failed"); + return false; + } + // find grub id in device map for chainloader device + string grub_id = BootCommon::device_mapping[disk_dev]:""; + y2milestone("Disk from windows chainloader: %1 grub id from device map: %2", disk_dev, grub_id); + + // check if disk is the first in order... + if (grub_id != "hd0") + return true; + + } + return false; } +/** FATE #301994 - Correct device mapping in case windows is installed on the second HD + * Remap and make active windows chainloader section + * if it is not on the boot (the first) disk + * @param list of sections + * @return list of sections + */ + +define list<map<string,any> > checkWindowsSection(list<map<string,any> > sections) +{ + + // list of idexes from sections where is chainloader + // and where is necessary add remapping and makeactive + list < integer > list_index =[]; + // counter + integer index = -1; + // check all sections... + foreach(map<string,any> section, sections, + { + index = index +1; + if (haskey(section, "chainloader")) + { + y2debug("chainloader section: %1", section); + // add only indexes for update + if (isWidnowsOnBootDisk(section)) + list_index = add(list_index, index); + }; + }); + + if (size(list_index) > 0) + { + foreach (integer idx, list_index, + { + sections[idx, "remap"] = "true"; + sections[idx, "makeactive"] = "true"; + y2milestone("Added remap and makeactive for section: %1", sections[idx]:$[]); + }); + } + + y2debug("Checking sections for windows chainloader: %1", sections); + return sections; +} + + +/** + * FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * The function reduces records (devices) in device.map + * Grub doesn't support more than 8 devices in device.map + * @return boolean true if device map was reduced + */ +global boolean ReduceDeviceMapTo8() +{ + boolean result = false; + + if (size(BootCommon::device_mapping)>8) + { + result = true; + list <string> bios_order = (list <string> ) Map::Values(BootCommon::device_mapping); + //delete all grub devices with order more than 9 + bios_order = filter(string key, bios_order, {return (size(key) < 4);}); + bios_order = lsort(bios_order); + y2debug("ordered values (grub devices): %1", bios_order); + map<string,string> inverse_device_map = $[]; + map<string,string> new_device_map = $[]; + y2milestone("Device map before reducing: %1", BootCommon::device_mapping); + foreach(string key, string value, BootCommon::device_mapping, + { + inverse_device_map[value]=key; + }); + + y2debug("inverse_device_map: %1", inverse_device_map); + integer index = 0; + + foreach(string key, bios_order, + { + string device_name = inverse_device_map[key]:""; + + if (index < 8) + { + y2debug("adding device: %1 with key: %2 and index is: %3", device_name, key, index); + new_device_map[device_name]=key; + index = index + 1; + } else { + break; + } + }); + BootCommon::device_mapping = new_device_map; + y2milestone("Device map after reducing: %1", BootCommon::device_mapping); + } else { + y2milestone("Device map includes less than 9 devices. It is not reduced. device_map: %1", BootCommon::device_mapping); + } + return result; +} + + +/** + * FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * The function check if boot device is in device.map + * Grub doesn't support more than 8 devices in device.map + * @param string boot device + * @param string boot device with name by mountby + * @return boolean true if there is missing boot device + */ +define boolean checkBootDeviceInDeviceMap(string boot_dev, string boot_dev_mountby) +{ + boolean result = false; + + if (size(BootCommon::device_mapping)>8) + { + result = false; + list <string> bios_order = (list <string> ) Map::Values(BootCommon::device_mapping); + //delete all grub devices with order more than 9 + bios_order = filter(string key, bios_order, {return (size(key) < 4);}); + bios_order = lsort(bios_order); + y2debug("ordered values (grub devices): %1", bios_order); + map<string,string> inverse_device_map = $[]; + foreach(string key, string value, BootCommon::device_mapping, + { + inverse_device_map[value]=key; + }); + + y2debug("inverse_device_map: %1", inverse_device_map); + integer index = 0; + boolean boot_device_added = false; + foreach(string key, bios_order, + { + string device_name = inverse_device_map[key]:""; + + if (index < 8) + { + if ((device_name == boot_dev) || (device_name == boot_dev_mountby)) + boot_device_added = true; + index = index + 1; + } else { + if (boot_device_added) + { + y2milestone("Device map includes boot disk"); + break; + } else { + y2error("Device map doesn't include boot disk"); + result = true; + break; + } + } + }); + } else { + y2milestone("Device map includes less than 9 devices."); + } + return result; +} + + + + +} //last "}" + /* * Local variables: * mode: ycp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/modules/BootArch.ycp new/yast2-bootloader-2.17.8/src/modules/BootArch.ycp --- old/yast2-bootloader-2.17.5/src/modules/BootArch.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/modules/BootArch.ycp 2008-07-28 13:10:35.000000000 +0200 @@ -14,7 +14,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootArch.ycp 43858 2008-01-24 07:53:31Z juhliarik $ + * $Id: BootArch.ycp 49438 2008-07-27 15:54:51Z juhliarik $ * */ @@ -108,15 +108,15 @@ string ret = ""; if (Arch::i386 ()) { - ret = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off"; + ret = "showopts ide=nodma apm=off acpi=off noresume nosmp noapic maxcpus=0 edd=off powersaved=off"; } else if (Arch::x86_64 ()) { - ret = "showopts ide=nodma apm=off acpi=off noresume edd=off"; + ret = "showopts ide=nodma apm=off acpi=off noresume edd=off powersaved=off"; } else if (Arch::ia64 ()) { - ret = "ide=nodma nohalt noresume"; + ret = "ide=nodma nohalt noresume powersaved=off"; } else if (Arch::s390 ()) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/modules/BootCommon.ycp new/yast2-bootloader-2.17.8/src/modules/BootCommon.ycp --- old/yast2-bootloader-2.17.5/src/modules/BootCommon.ycp 2008-07-23 15:16:35.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/modules/BootCommon.ycp 2008-08-01 17:20:31.000000000 +0200 @@ -15,7 +15,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootCommon.ycp 49341 2008-07-23 12:16:35Z juhliarik $ + * $Id: BootCommon.ycp 49588 2008-08-01 15:20:30Z juhliarik $ * */ @@ -184,6 +184,14 @@ */ global boolean activate = false; + +/** FATE #303548 - Grub: limit device.map to devices detected by BIOS + * Ask user if he wants to edit again bootloader settings + * It is used if device.map is limited and "boot" disk is out of range + * The range is the first 8 devices + */ +global boolean ask_user = false; + /** * Replace MBR with generic code after bootloader installation? */ @@ -828,6 +836,10 @@ { ret = ret && CommitSettings (); } + + // write settings to /etc/sysconfig/bootloader + WriteToSysconf(false); + return ret; } /** @@ -886,6 +898,7 @@ // summary text result = add (result, _("Do not install boot loader; just create configuration files")); + return result; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/modules/BootGRUB.ycp new/yast2-bootloader-2.17.8/src/modules/BootGRUB.ycp --- old/yast2-bootloader-2.17.5/src/modules/BootGRUB.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/modules/BootGRUB.ycp 2008-08-04 13:34:56.000000000 +0200 @@ -15,7 +15,7 @@ * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootGRUB.ycp 45640 2008-03-20 11:53:38Z jsrain $ + * $Id: BootGRUB.ycp 49630 2008-08-04 11:34:56Z juhliarik $ * */ @@ -386,130 +386,7 @@ SCR::Execute (.target.bash, sformat ("/bin/rmdir %1", tmpdir)); } -// FIXME: remove old code: this used to parse menu.lst and device.map files -// from other linux partitions for "initial" (~ default, see -// MarkInitialSection() in perl-Bootloader) sections, and adds them to the -// current menu.lst, if none of the referenced root partition and the other -// linux partition was `destroyed (= "new, deleted or formatted"). -/* - BootCommon::InitializeLibrary (true, "grub"); - foreach (map o, other_l, { - string dev = o["device"]:""; - if (dev != "" && 0 == SCR::Execute (.target.bash, - sformat ("/bin/mount %1 %2", dev, tmpdir)) - ) - { - y2milestone ("Mounted %1", dev); - list<string> filenames = []; - foreach (string fn, [ -// not needed since there is a symlink in /boot directory -// named boot pointing to the /boot directory -// this caused bug #23346 - the file was found twice -// tmpdir + "grub/menu.lst", - tmpdir + "boot/grub/menu.lst" - ], { - if (-1 != (integer)SCR::Read (.target.size, fn)) - filenames = add (filenames, fn); - }); - y2milestone ("Found files %1", filenames); - integer count = 0; - foreach (string f, filenames, { - y2debug ("Checking file %1", f); - string fc = (string)SCR::Read (.target.string, f); - string dm = (string)SCR::Read (.target.string, - regexpsub (f, "(.*)menu.lst$", - "\\1device.map")); - y2debug ("Device map file name: %1", - regexpsub (f, "(.*)menu.lst$", - "\\1device.map")); - y2debug ("Device map contents: %1", dm); - -// here the old code tries to parse and import sections from the grub config file from an "other" linux partition - map<string,string> files = $[ - "/boot/grub/menu.lst" : fc, - ]; - if (dm == nil) - return; - - files["/boot/grub/device.map"] = dm; - BootCommon::InitializeLibrary (false, "grub"); - BootCommon::SetFilesContents (files); - list<map<string,string> > sects - = BootCommon::GetSections (); - y2debug ("Found sections %1", sects); - - // merge only "default" == "initial" entries, not all entries - if (merge_level == `main) - { - sects = filter (map<string,string> s, sects, { - return s["initial"]:nil != nil; - }); - } - - // now add the sections to our configuration, if they qualify - count = count + size (sects); - foreach (map<string,any> s, sects, ``{ - s = (map<string,any>)union (s, $[ - "__changed" : false, - "__auto" : true, - "__converted" : true, - ]); - // no need to translate here... - s["name"] = sformat ("%1 (%2)", - s["name"]:"", dev); - s["original_name"] = s["name"]:""; - - // this is a heuristic: if the mounted partition or the - // root partition referenced in the section is "new, - // deleted or formatted", then do not add/import the - // section - list<string> devs = [dev]; - string _d = s["root"]:""; - if (_d != nil && _d != "") - devs = add (devs, _d); - devs = (list<string>)filter (string d, devs, - ``(d != "" - && d != nil - && d != "/dev/null" && d != "false")); - devs = toset (devs); - devs = maplist (string d, devs, { - return BootCommon::UpdateDevice (d); - }); - boolean _add = true; - foreach (string _d, devs, { - if (contains (destroyed_partitions, _d)) - _add = false; - }); - - // FIXME: create a new config file section instead of - // using <s> which only shares the name/original_name - // This makes it possible to support cascaded boot - // environments in a supportable way ! - if (_add) - { - // FIXME: fallback to vmlinux and initrd symlink if - // present in the chroot environment of the other - // Linux System ... #224481 - - s["__devs"] = devs; - out = add (out, s); - } - }); - }); - // if any sections from this device were added, it was a - // genuine linux partition: ignore it when going through the - // list of "other", non-linux partitions in the next loop below - if (count > 0) - others_ignore = add (others_ignore, dev); - - SCR::Execute (.target.bash, sformat ( - "/bin/umount %1", dev)); - } - }); - SCR::Execute (.target.bash, sformat ("/bin/rmdir %1", tmpdir)); - } -*/ // Go through a list of "bootable" (aa55) primary partitions that may be // "foreign", check that it is not one of our current boot partitions and @@ -636,96 +513,6 @@ BootCommon::ProposeDeviceMap (); } - // FIXME: This code can probably be removed. perl-Bootloader sets boot_* - // flags in the globals map. That is all the UI and the proposal code deal - // with. The decision to install the bootloader stage 1 on multiple devices - // (for softraid, dmraid etc.) can be based on the information in the - // boot_{root,boot,mbr} flags and the disk, partitioning and md information - // alone. Thus, perl-Bootloader is able to do this. -/* - list<string> loader_devices = splitstring ( - BootCommon::globals["stage1_dev"]:"", - ","); - - if (size (loader_devices) > 1) { - // check if members of a MD are present - map<string,map> tm = Storage::GetTargetMap (); - list<string> md = maplist (map m, tm["/dev/md", "partitions"]:[], { - return m["device"]:""; - }); - if (Mode::test ()) - md = ["/dev/md0"]; - boolean md_found = false; - // try collapse all MD disks - foreach (string md_disk, md, { - list<string> md_members = sort (maplist ( - string s, - integer id, - BootCommon::Md2Partitions (md_disk), - { - return s; - })); - if (Mode::test ()) - md_members = ["/dev/hda1", "/dev/hdb1"]; - - boolean reduce = true; - foreach (string member, md_members, { - if (! contains (loader_devices, member)) - reduce = false; - }); - if (reduce) { - loader_devices = filter (string d, loader_devices, { - return ! contains (md_members, d); - }); - loader_devices = add (loader_devices, md_disk); - } - }); - // check MBRs of all disks holding /boot partition - map<string,integer> boot_md - = BootCommon::Md2Partitions ( - BootCommon::BootPartitionDevice); - if (Mode::test ()) - boot_md = $["/dev/hda1" : 128, "/dev/hdb1" : 129]; - list<string> md_disks = maplist (string d, integer b, boot_md, - { - map p_dev = Storage::GetDiskPartition (d); - return p_dev["disk"]:""; - }); - boolean reduce = true; - foreach (string d, md_disks, { - if (! contains (loader_devices, d)) - reduce = false; - }); - if (reduce) - { - loader_devices = filter (string d, loader_devices, { - return ! contains (md_disks, d); - }); - loader_devices = add (loader_devices, "mbr_md"); - } - if (contains (loader_devices, BootCommon::BootPartitionDevice)) - { - loader_devices = filter (string d, loader_devices, { - return d != BootCommon::BootPartitionDevice; - }); - backup_to_bootsector = true; - if (size (loader_devices) > 0) - { - loader_devices = sort (loader_devices); - BootCommon::loader_device = loader_devices[0]:""; - } - else - { - BootCommon::loader_device = BootCommon::BootPartitionDevice; - } - } - } - else if (size (loader_devices) == 1) - { - BootCommon::loader_device = loader_devices[0]:""; - } -*/ - importMetaData(); return ret; @@ -835,61 +622,20 @@ * @param flush boolean true to flush settings to the disk * @return boolean true if success */ -global boolean Save (boolean clean, boolean init, boolean flush) { - // update list of devices -// list<string> loader_devices = [BootCommon::loader_device]; -// if (backup_to_bootsector && contains (BootCommon::getPartitionList(`boot), -// BootCommon::BootPartitionDevice)) -// { -// if (loader_devices[0]:"" != nil && loader_devices[0]:"" != "/dev/null" -// && loader_devices[0]:"" != "") -// { -// loader_devices[1] = BootCommon::BootPartitionDevice; -// } -// else -// { -// loader_devices = [ BootCommon::BootPartitionDevice ]; -// } -// } - - // get the list of device names to install the boot loader stage 1 into: - // - for non-md devices, use just the device name - // - for installation to md arrays: get the list of device names from - // name of md array, either - // - just the container-partitions (according to yast2-storage) or - // ("/dev/md0" -> ["/dev/hda1", ...]) - // - the (cut off) name of the corresponding disk devices - // ("/dev/md0" -> ["/dev/hda1", ...] -> ["/dev/hda", ...]) -// list<list<string> > dev_lists = maplist (string d, loader_devices, { -// if (substring (d, 0, 7) == "/dev/md") -// { -// map<string,integer> md = BootCommon::Md2Partitions (d); -// if (Mode::test ()) -// md = $["/dev/hda1" : 128, "/dev/hdb1" : 129]; -// return maplist (string d, integer b, md, { -// return d; -// }); -// } -// if (d == "mbr_md") -// { -// map<string,integer> md = BootCommon::Md2Partitions -// (BootCommon::BootPartitionDevice); -// if (Mode::test ()) -// md = $["/dev/hda1" : 128, "/dev/hdb1" : 129]; -// return maplist (string d, integer b, md, { -// // get disk device name for this partition or disk device name -// map p_dev = Storage::GetDiskPartition (d); -// return p_dev["disk"]:""; -// }); -// } -// return [d]; -// }); -// loader_devices = flatten (dev_lists); -// BootCommon::globals["stage1_dev"] = mergestring (loader_devices, ","); +global boolean Save (boolean clean, boolean init, boolean flush) +{ + // check if windows is on second disk and add remap if it is necessary + // FATE #301994: Correct device mapping in case windows is installed on the second HD + BootCommon::sections = checkWindowsSection(BootCommon::sections); + + // reduce device map to 8 devices + // FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + ReduceDeviceMapTo8(); // now really save the settings boolean ret = BootCommon::Save (clean, init, flush); importMetaData(); + return ret; } @@ -1103,6 +849,19 @@ ]; } + +global boolean CheckDeviceMap() +{ + // FATE #303548 - Grub: limit device.map to devices detected by BIOS + boolean ret = false; + string boot_disk = BootCommon::getBootDisk(); + if (boot_disk != "") + ret = checkBootDeviceInDeviceMap(boot_disk, BootCommon::DevToLabelUdevID(boot_disk)); + + return ret; + +} + } // EOF /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/modules/Bootloader.ycp new/yast2-bootloader-2.17.8/src/modules/Bootloader.ycp --- old/yast2-bootloader-2.17.5/src/modules/Bootloader.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/modules/Bootloader.ycp 2008-08-01 17:20:31.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: Bootloader.ycp 48350 2008-06-17 11:14:02Z juhliarik $ + * $Id: Bootloader.ycp 49588 2008-08-01 15:20:30Z juhliarik $ * */ @@ -560,6 +560,7 @@ y2milestone ("Reinitialize bootloader library before saving: %1", reinit); ret = blSave (true, reinit, true) && ret; + if (! ret) y2error ("Error before configuration files saving finished"); @@ -684,7 +685,7 @@ dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); else dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if (dev["disk"]:"" == "/dev/nfs") + if (dev["disk"]:"" == "/dev/nfs") { y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); return ret; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/routines/lilolike.ycp new/yast2-bootloader-2.17.8/src/routines/lilolike.ycp --- old/yast2-bootloader-2.17.5/src/routines/lilolike.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/routines/lilolike.ycp 2008-08-01 17:20:31.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: lilolike.ycp 48552 2008-06-26 15:23:51Z juhliarik $ + * $Id: lilolike.ycp 49588 2008-08-01 15:20:30Z juhliarik $ * */ { @@ -24,6 +24,7 @@ import "Storage"; import "StorageDevices"; import "BootArch"; +import "Map"; global string DiskOrderSummary (); global list<string> DisksOrder (); @@ -1402,8 +1403,12 @@ { integer index = tointeger (bios_id) - tointeger ("0x80"); string grub_dev = sformat ("hd%1", index); - device_mapping[target_dev] = grub_dev; - ids[index] = true; + // FATE #303548 - doesn't add disk with same bios_id with different name (multipath machine) + if (! ids[index]:false) + { + device_mapping[target_dev] = grub_dev; + ids[index] = true; + } } }); // and guess other devices diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/routines/misc.ycp new/yast2-bootloader-2.17.8/src/routines/misc.ycp --- old/yast2-bootloader-2.17.5/src/routines/misc.ycp 2008-07-23 15:16:35.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/routines/misc.ycp 2008-08-01 17:20:31.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 49341 2008-07-23 12:16:35Z juhliarik $ + * $Id: misc.ycp 49588 2008-08-01 15:20:30Z juhliarik $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -35,6 +35,7 @@ import "Misc"; import "ProductFeatures"; import "Directory"; + import "Installation"; // bootloader attributes handling functions @@ -1576,8 +1577,162 @@ return true; } } +/** + * Function return boot disk device with udev id name + * @return string name of boot disk like udev id + */ +define string BootDeviceToUdevID() +{ + string device = ""; + if ((BootPartitionDevice != "") || (BootPartitionDevice != nil)) + device = BootPartitionDevice; + + if (device == "") + device = RootPartitionDevice; + + if (device == "") + return device; + + y2milestone("Boot device is: %1", device); + map p_dev = Storage::GetDiskPartition (device); + + string boot_disk = p_dev["disk"]:""; + + device = DevToLabelUdevID(boot_disk); + y2milestone("Boot disk is %1 and his udev id is: %2", boot_disk, device); + return device; +} + + +/** FATE #302245 save kernel args etc to /etc/sysconfig/bootloader + * Function write/update info in /etc/sysconfig/bootloader + * @param booloean true if it called from inst_bootloader.ycp + */ + +global define void WriteToSysconf(boolean inst_bootloader) +{ + + string lt = BootCommon::getLoaderType (false); + y2milestone ("Saving /etc/sysconfig/bootloader for %1", lt); + string default_boot_section_name = BootCommon::globals["default"]:""; + + // get the default and failsafe append + vga parameters; if section with + // appropriate original name not found, just use any Linux section + // doing so during update may be questionable, however, the variables need to + // be initialized in any case + string default_vga = ""; + string default_append = ""; + boolean default_set = false; + string failsafe_vga = ""; + string failsafe_append = ""; + boolean failsafe_set = false; + string xen_vga = ""; + string xen_append = ""; + string xen_kernel_append = ""; + boolean xen_set = false; + + foreach (map<string,any>s, BootCommon::sections, + { + if ((search(s["original_name"]:"","linux") != nil) && + (s["name"]:"" == default_boot_section_name)) + { + default_set = true; + default_vga = s["vgamode"]:""; + default_append = s["append"]:""; + } + if (search(s["original_name"]:"","xen") != nil) + { + xen_set = true; + xen_vga = s["vgamode"]:""; + xen_append = s["xen_append"]:""; + xen_kernel_append = s["append"]:""; + } + else if (search(s["original_name"]:"","failsafe") != nil) + { + failsafe_set = true; + failsafe_vga = s["vgamode"]:""; + failsafe_append = s["append"]:""; + } + if (s["type"]:"" == "image" && ! default_set) + { + default_vga = s["vgamode"]:""; + default_append = s["append"]:""; + } + if (s["type"]:"" == "image" && ! failsafe_set) + { + failsafe_vga = s["vgamode"]:""; + failsafe_append = s["append"]:""; + } + }); + if (! xen_set) + { + xen_kernel_append = default_append; + xen_append = ""; + xen_vga = default_vga; + } + + // save some sysconfig variables + // register new agent pointing into the mounted filesystem + path sys_agent = .sysconfig.bootloader; + + if (inst_bootloader) + { + WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig"); + WFM::Write(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); + string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; + SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini( + `SysConfigFile(target_sysconfig_path))); + + sys_agent = add(.target, sys_agent); + + } + + SCR::Write (add(sys_agent,.DEFAULT_NAME), default_boot_section_name); + SCR::Write (add(sys_agent,.DEFAULT_APPEND), default_append); + SCR::Write (add(sys_agent,.DEFAULT_VGA), default_vga); + SCR::Write (add(sys_agent,.FAILSAFE_APPEND), failsafe_append); + SCR::Write (add(sys_agent,.FAILSAFE_VGA), failsafe_vga); + SCR::Write (add(sys_agent,.XEN_KERNEL_APPEND), xen_kernel_append); + SCR::Write (add(sys_agent,.XEN_APPEND), xen_append); + SCR::Write (add(sys_agent,.XEN_VGA), xen_vga); + SCR::Write (sys_agent, nil); + + +} + +/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * Function select boot device - disk + * + * @return string name of boot device - disk + */ +global string getBootDisk() +{ + string boot_device = ""; + if (BootCommon::BootPartitionDevice != "") + boot_device = BootCommon::BootPartitionDevice; + else if (BootCommon::RootPartitionDevice != "") + boot_device = BootCommon::RootPartitionDevice; + + if (boot_device == "") + { + y2milestone("BootPartitionDevice and RootPartitionDevice are empty"); + return boot_device; + } + map p_dev = Storage::GetDiskPartition (boot_device); + + string boot_disk_device = p_dev["disk"]:""; + + if ((boot_disk_device != "") && (boot_disk_device != nil)) + { + y2milestone("Boot device - disk: %1", boot_disk_device); + return boot_disk_device; + } + + y2milestone("Finding boot disk failed!"); + return ""; +} } //end of include diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/src/routines/popups.ycp new/yast2-bootloader-2.17.8/src/routines/popups.ycp --- old/yast2-bootloader-2.17.5/src/routines/popups.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.8/src/routines/popups.ycp 2008-08-01 17:20:31.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: popups.ycp 41373 2007-10-11 12:55:01Z odabrunz $ + * $Id: popups.ycp 49588 2008-08-01 15:20:30Z juhliarik $ * */ @@ -257,6 +257,7 @@ ")); } + /** * Display popup */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.5/VERSION new/yast2-bootloader-2.17.8/VERSION --- old/yast2-bootloader-2.17.5/VERSION 2008-07-23 15:18:52.000000000 +0200 +++ new/yast2-bootloader-2.17.8/VERSION 2008-08-04 13:31:24.000000000 +0200 @@ -1 +1 @@ -2.17.5 +2.17.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-update
by root＠Hilbert.suse.de 04 Aug '08

04 Aug '08

Hello community, here is the log from the commit of package yast2-update checked in at Mon Aug 4 14:17:44 CEST 2008. -------- --- yast2-update/yast2-update.changes 2008-07-30 07:24:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2008-08-04 13:19:36.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 4 13:18:47 CEST 2008 - locilka(a)suse.cz + +- Initializing target as soon as possible (updating running system) + (bnc #394662). +- 2.17.1 + +------------------------------------------------------------------- Old: ---- yast2-update-2.17.0.tar.bz2 New: ---- yast2-update-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.G17923/_old 2008-08-04 14:17:39.000000000 +0200 +++ /var/tmp/diff_new_pack.G17923/_new 2008-08-04 14:17:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.17.0) +# spec file for package yast2-update (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-update -Version: 2.17.0 -Release: 5 +Version: 2.17.1 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.17.0.tar.bz2 +Source0: yast2-update-2.17.1.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-storage yast2-testsuite # Wizard::OpenOKDialog @@ -73,7 +73,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.17.0 +%setup -n yast2-update-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -120,8 +120,11 @@ /usr/share/YaST2/control/update.xml /usr/share/YaST2/clients/update.ycp /usr/share/YaST2/clients/run_update.ycp - %changelog +* Mon Aug 04 2008 locilka(a)suse.cz +- Initializing target as soon as possible (updating running system) + (bnc #394662). +- 2.17.1 * Wed Jul 30 2008 coolo(a)suse.de - fix file list of package * Thu Jul 24 2008 locilka(a)suse.cz ++++++ yast2-update-2.17.0.tar.bz2 -> yast2-update-2.17.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.0/configure.in new/yast2-update-2.17.1/configure.in --- old/yast2-update-2.17.0/configure.in 2008-07-30 07:24:39.000000000 +0200 +++ new/yast2-update-2.17.1/configure.in 2008-07-24 12:56:50.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-update dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-update, 2.17.0, http://bugs.opensuse.org/, yast2-update) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.0/kernel-update-tool.pot new/yast2-update-2.17.1/kernel-update-tool.pot --- old/yast2-update-2.17.0/kernel-update-tool.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.17.1/kernel-update-tool.pot 2008-04-29 13:09:07.000000000 +0200 @@ -0,0 +1,33 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-04-29 13:09+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/clients/kernel-update.ycp:189 +msgid "Warning" +msgstr "" + +#: src/clients/kernel-update.ycp:190 +msgid "Abort the kernel upgrade?" +msgstr "" + +#: src/clients/kernel-update.ycp:247 +msgid "Alternate Download Location" +msgstr "" + +#: src/clients/kernel-update.ycp:510 +msgid "Kernel Update Status Log" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.0/src/clients/run_update.ycp new/yast2-update-2.17.1/src/clients/run_update.ycp --- old/yast2-update-2.17.0/src/clients/run_update.ycp 2008-05-06 18:49:50.000000000 +0200 +++ new/yast2-update-2.17.1/src/clients/run_update.ycp 2008-08-04 13:17:15.000000000 +0200 @@ -18,6 +18,7 @@ import "ProductControl"; import "Wizard"; import "Update"; + import "Installation"; // check whether having the packager for ourselves if (! PackageLock::Check ()) @@ -41,6 +42,10 @@ list<map> stage_mode = [$["stage": "normal", "mode": Mode::mode() ]]; ProductControl::AddWizardSteps(stage_mode); + // bnc #394662 + // initialize target ASAP + Pkg::TargetInit (Installation::destdir, true); + symbol ret = ProductControl::Run(); Wizard::CloseDialog (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.0/update.pot new/yast2-update-2.17.1/update.pot --- old/yast2-update-2.17.0/update.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.17.1/update.pot 2008-04-29 13:09:07.000000000 +0200 @@ -0,0 +1,715 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2008-04-29 13:09+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Proposal for backup during update +#: src/clients/backup_proposal.ycp:46 +msgid "Create Backup of Modified Files" +msgstr "" + +#. Proposal for backup during update +#: src/clients/backup_proposal.ycp:51 +msgid "Create Backup of /etc/sysconfig Directory" +msgstr "" + +#. Proposal for backup during update +#: src/clients/backup_proposal.ycp:56 +msgid "Do Not Create Backups" +msgstr "" + +#. Proposal for backup during update +#: src/clients/backup_proposal.ycp:61 +msgid "Remove Backups from Previous Updates" +msgstr "" + +#. this is a heading +#: src/clients/backup_proposal.ycp:92 +msgid "Backup" +msgstr "" + +#. this is a menu entry +#: src/clients/backup_proposal.ycp:94 +msgid "&Backup" +msgstr "" + +#. error popup, user did not enter a valid directory specification +#: src/clients/inst_backup.ycp:40 +msgid "Invalid backup path." +msgstr "" + +#. there is not enough space for the backup during update +#. inform the user about this (MB==megabytes) +#: src/clients/inst_backup.ycp:80 +#, ycp-format +msgid "Minimum disk space of %1 MB required." +msgstr "" + +#. screen title for software selection +#: src/clients/inst_backup.ycp:92 +msgid "Backup System Before Update" +msgstr "" + +#. checkbox label if user wants to backup modified files +#: src/clients/inst_backup.ycp:102 +msgid "Create &Backup of Modified Files" +msgstr "" + +#. checkbox label if user wants to backup /etc/sysconfig +#: src/clients/inst_backup.ycp:105 +msgid "Create a &Complete Backup of /etc/sysconfig" +msgstr "" + +#. checkbox label if user wants remove old backup stuff +#: src/clients/inst_backup.ycp:109 +msgid "Remove &Old Backups from the Backup Directory" +msgstr "" + +#. help text for backup dialog during update 1/7 +#: src/clients/inst_backup.ycp:114 +msgid "" +"To avoid any loss of information during update,\n" +"it is possible to create a backup prior to updating.\n" +msgstr "" + +#. help text for backup dialog during update 2/7 +#: src/clients/inst_backup.ycp:119 +msgid "" +"Warning: This will not be a complete\n" +"backup. Only modified files will be saved.\n" +msgstr "" + +#. help text for backup dialog during update 3/7 +#: src/clients/inst_backup.ycp:124 +msgid "Select the desired options.\n" +msgstr "" + +#. help text for backup dialog during update 4/7 +#: src/clients/inst_backup.ycp:128 +msgid "" +"Create a Backup of Modified Files:\n" +"Stores those modified files that are replaced during update.\n" +msgstr "" + +#. help text for backup dialog during update 5/7 +#: src/clients/inst_backup.ycp:133 +msgid "" +"Create a Complete Backup of\n" +"/etc/sysconfig: This covers all configuration files that are part of the\n" +"sysconfig mechanism, even those that are not replaced.\n" +msgstr "" + +#. help text for backup dialog during update 6/7 +#: src/clients/inst_backup.ycp:139 +msgid "" +"Remove Old Backups from the Backup\n" +"Directory: If your current system already is the result of an earlier\n" +"update, there may be old configuration file backups. Select this option to\n" +"remove them.\n" +msgstr "" + +#. help text for backup dialog during update 7/7 +#: src/clients/inst_backup.ycp:146 +#, ycp-format +msgid "All backups are placed in %1." +msgstr "" + +#. screen title for update options +#. this is a heading +#: src/clients/inst_update.ycp:26 src/clients/update_proposal.ycp:609 +msgid "Update Options" +msgstr "" + +#: src/clients/inst_update.ycp:38 +msgid "Select Patterns" +msgstr "" + +#. Display warning message +#: src/clients/inst_update.ycp:65 +msgid "" +"You have already chosen software from \"Detailed selection\".\n" +"You will lose that selection if you change the basic selection." +msgstr "" + +#. Build and show dialog +#. Table item (unknown system [neither openSUSE 11.1 nor SLES 14 nor ...]) +#. Table item (unknown architecture) +#. Table item (unknown file system) +#. label - name of sustem to update +#. label for an unknown installed system +#: src/clients/inst_update.ycp:72 src/clients/inst_update.ycp:73 +#: src/include/rootpart.ycp:67 src/include/rootpart.ycp:73 +#: src/include/rootpart.ycp:90 src/modules/RootPart.ycp:123 +#: src/modules/RootPart.ycp:1428 +msgid "Unknown" +msgstr "" + +#. label showing to which version we are updating +#. TRANSLATORS: proposal summary item, %1 is a product name +#: src/clients/inst_update.ycp:78 src/clients/update_proposal.ycp:521 +#, ycp-format +msgid "Update to %1" +msgstr "" + +#. label showing from which version to which version we are updating +#: src/clients/inst_update.ycp:81 +#, ycp-format +msgid "Update from %1 to %2" +msgstr "" + +#. frame title for update selection +#: src/clients/inst_update.ycp:89 +msgid "Update Mode" +msgstr "" + +#. radio button label for update including new packages +#: src/clients/inst_update.ycp:96 +msgid "" +"&Update with Installation of New Software and Features\n" +"Based on the Selection:\n" +msgstr "" + +#. radio button label for update of already installed packages only +#: src/clients/inst_update.ycp:107 +msgid "Only U&pdate Installed Packages" +msgstr "" + +#. check box label +#. translator: add a & shortcut +#: src/clients/inst_update.ycp:117 +msgid "&Delete Unmaintained Packages" +msgstr "" + +#. help text for dialog "update options" 1/4 +#: src/clients/inst_update.ycp:125 +msgid "" +"The update option differs between two modes. In\n" +"either case, it is recommended to make a backup of your personal data.\n" +msgstr "" + +#. help text for dialog "update options" 2/4, %1 is a product name +#: src/clients/inst_update.ycp:130 +#, ycp-format +msgid "" +"With New Software: This default setting\n" +"updates the existing software and installs all new features and benefits of\n" +"the new <tt>%1</tt> version. The selection is based on the former predefined\n" +"software selection.\n" +msgstr "" + +#. help text for dialog "update options" 3/4 +#: src/clients/inst_update.ycp:137 +msgid "" +"Only Installed Packages: This selection\n" +"only updates the packages already installed on your system. Note:\n" +"New software in the predefined software selection, such as new YaST modules, is\n" +"not available after the update. You might miss advertised features.\n" +msgstr "" + +#. help text for dialog "update options" 4/4 +#: src/clients/inst_update.ycp:144 +msgid "" +"After the update, some software might not\n" +"function anymore. Activate Delete Unmaintained Packages to delete those\n" +"packages during the update.\n" +msgstr "" + +#. yes/no question +#: src/clients/inst_update.ycp:225 +msgid "" +"Do you really want\n" +"to reset your detailed selection?" +msgstr "" + +#. proposal for packages during update, %1 is count of packages +#: src/clients/packages_proposal.ycp:69 +#, ycp-format +msgid "Packages to Update: %1" +msgstr "" + +#. proposal for packages during update, %1 is count of packages +#: src/clients/packages_proposal.ycp:72 +#, ycp-format +msgid "New Packages to Install: %1" +msgstr "" + +#. proposal for packages during update, %1 is count of packages +#: src/clients/packages_proposal.ycp:75 +#, ycp-format +msgid "Packages to Remove: %1" +msgstr "" + +#. part of summary, %1 is size of packages (in MB or GB) +#: src/clients/packages_proposal.ycp:78 +#, ycp-format +msgid "Total Size of Packages to Update: %1" +msgstr "" + +#. warning text +#: src/clients/packages_proposal.ycp:86 +msgid "Cannot solve all conflicts. Manual intervention is required." +msgstr "" + +#. this is a heading +#: src/clients/packages_proposal.ycp:133 +msgid "Packages" +msgstr "" + +#. this is a menu entry +#: src/clients/packages_proposal.ycp:135 +msgid "&Packages" +msgstr "" + +#. Proposal for system to update +#: src/clients/rootpart_proposal.ycp:51 +msgid "No root partition found" +msgstr "" + +#. Proposal for system to update +#: src/clients/rootpart_proposal.ycp:86 +#, ycp-format +msgid "%1 on root partition %2" +msgstr "" + +#. inform user in the proposal about the failed mount +#. error report +#: src/clients/rootpart_proposal.ycp:95 src/include/rootpart.ycp:323 +msgid "Failed to mount target system" +msgstr "" + +#. this is a heading +#: src/clients/rootpart_proposal.ycp:139 +msgid "Selected for Update" +msgstr "" + +#. this is a menu entry +#: src/clients/rootpart_proposal.ycp:141 +msgid "&Selected for Update" +msgstr "" + +#: src/clients/run_update.ycp:36 +msgid "&Update" +msgstr "" + +#. TRANSLATORS: error message - the module does not provide command line interface +#: src/clients/update.ycp:25 +msgid "There is no user interface available for this module." +msgstr "" + +#. part of error popup message +#. error message in proposal +#: src/clients/update_proposal.ycp:113 src/clients/update_proposal.ycp:429 +msgid "Cannot read the current RPM Database." +msgstr "" + +#. part of error popup message, %1 stands for newline-separated list of files +#: src/clients/update_proposal.ycp:115 +#, ycp-format +msgid "None of these files exist:%1" +msgstr "" + +#. continue-cancel popup +#: src/clients/update_proposal.ycp:351 +msgid "" +"The installed product is not compatible with the product\n" +"on the installation media. If you try to update using the\n" +"current installation media, the system may not start or\n" +"some applications may not run properly." +msgstr "" + +#. error message in proposal +#: src/clients/update_proposal.ycp:444 +msgid "The installed product is not compatible with the product on the installation media." +msgstr "" + +#. Can't find any software data, probably a installation media error +#. error message +#: src/clients/update_proposal.ycp:455 +msgid "Cannot read package data from installation media. Media error?" +msgstr "" + +#. TRANSLATORS: unknown product (label) +#. TRANSLATORS: unknown product name +#: src/clients/update_proposal.ycp:461 src/clients/update_proposal.ycp:469 +#: src/clients/update_proposal.ycp:498 src/clients/update_proposal.ycp:500 +msgid "Unknown product" +msgstr "" + +#. TRANSLATORS: proposal error, %1 is the version of installed system +#. %2 is the version being installed +#: src/clients/update_proposal.ycp:481 +#, ycp-format +msgid "" +"Updating system to another version (%1 -> %2) is not supported on the running system. \n" +"Please, boot from the installation media and use a normal upgrade\n" +"or disable software repositories of products with different versions." +msgstr "" + +#. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names +#: src/clients/update_proposal.ycp:496 +#, ycp-format +msgid "Warning: Updating from '%1' to '%2', products do not exactly match." +msgstr "" + +#. Proposal for removing packages which are not maintained any more +#: src/clients/update_proposal.ycp:527 +msgid "Delete unmaintained packages" +msgstr "" + +#. Proposal for backup during update +#: src/clients/update_proposal.ycp:532 +msgid "Only update installed packages" +msgstr "" + +#. proposal string +#: src/clients/update_proposal.ycp:540 +msgid "Update based on patterns" +msgstr "" + +#. Proposal for selection during update, %1 stands for selection name +#: src/clients/update_proposal.ycp:556 +#, ycp-format +msgid "Update based on selection \"%1\"" +msgstr "" + +#. TRANSLATORS: proposal dialog help +#: src/clients/update_proposal.ycp:565 +msgid "" +"<big>Update Options</big>\n" +"Here you can choose how your system is going to be updated.\n" +"Choose whether only installed packages should be updated or also new ones should be installed\n" +"(the default selection), and whether unmaintained packages should be deleted." +msgstr "" + +#. this is a menu entry +#: src/clients/update_proposal.ycp:611 +msgid "&Update Options" +msgstr "" + +#: src/config/update.glade:15 src/config/update.glade:38 +msgid "Update Settings" +msgstr "" + +#: src/config/update.glade:30 +msgid "Update" +msgstr "" + +#: src/config/update.glade:44 src/config/update.glade:48 +msgid "Perform Update" +msgstr "" + +#: src/config/update.glade:59 +msgid "Clean Up" +msgstr "" + +#: src/config/update.glade:63 +msgid "Update System Configuration" +msgstr "" + +#: src/config/update.glade:71 +msgid "Update Configuration" +msgstr "" + +#. Table item (unknown system) +#: src/include/rootpart.ycp:60 +msgid "Unknown Linux" +msgstr "" + +#. Table item (unknown system) +#: src/include/rootpart.ycp:63 +msgid "Unknown or Non-Linux" +msgstr "" + +#: src/include/rootpart.ycp:83 +#, ycp-format +msgid "%1 (%2)" +msgstr "" + +#. label for selection of root partition (for boot) +#: src/include/rootpart.ycp:138 +msgid "Partition or System to Boot:" +msgstr "" + +#. help text for root partition dialog (for boot) +#: src/include/rootpart.ycp:141 +msgid "" +"\n" +"Select the partition or system to boot.\n" +"\n" +msgstr "" + +#. label for selection of root partition (for update) +#: src/include/rootpart.ycp:149 +msgid "Partition or System to Update:" +msgstr "" + +#. help text for root partition dialog (for update) +#: src/include/rootpart.ycp:152 +msgid "" +"\n" +"Select the partition or system to update.\n" +"\n" +msgstr "" + +#. headline for dialog "Select for update" +#: src/include/rootpart.ycp:160 +msgid "Select for Update" +msgstr "" + +#. help text for root partition dialog (general part) +#: src/include/rootpart.ycp:165 +msgid "" +"\n" +"Show All Partitions expands the list to a\n" +"general overview of your system's partitions.\n" +"\n" +msgstr "" + +#. table header +#: src/include/rootpart.ycp:182 +msgid "System" +msgstr "" + +#. table header item +#: src/include/rootpart.ycp:184 +msgid "Partition" +msgstr "" + +#. table header item +#: src/include/rootpart.ycp:186 +msgid "Architecture" +msgstr "" + +#. table header item +#: src/include/rootpart.ycp:188 +msgid "File System" +msgstr "" + +#. table header item +#: src/include/rootpart.ycp:190 +msgid "Label" +msgstr "" + +#. check box +#: src/include/rootpart.ycp:197 +msgid "&Show All Partitions" +msgstr "" + +#. pushbutton to (rightaway) boot the system selected above +#: src/include/rootpart.ycp:222 +msgid "&Boot" +msgstr "" + +#. continue-cancel popup +#: src/include/rootpart.ycp:297 +msgid "" +"No installed system that can be upgraded with this product was found\n" +"on the selected partition." +msgstr "" + +#. continue-cancel popup +#: src/include/rootpart.ycp:304 +msgid "" +"The architecture of the system installed in the selected partition\n" +"is different than the one of this product." +msgstr "" + +#. * +#. * Link to SDB article concerning renaming of devices. +#. +#: src/modules/RootPart.ycp:94 +#, ycp-format +msgid "" +"See the SDB article at %1 for details\n" +"about how to solve this problem." +msgstr "" + +#. label - name of sustem to update +#: src/modules/RootPart.ycp:114 +msgid "Unknown Linux System" +msgstr "" + +#. label - name of sustem to update +#: src/modules/RootPart.ycp:119 +msgid "Non-Linux System" +msgstr "" + +#. error report, %1 is device (eg. /dev/hda1) +#: src/modules/RootPart.ycp:206 +#, ycp-format +msgid "" +"Cannot unmount partition %1.\n" +"\n" +"It is currently in use. If the partition stays mounted,\n" +"the data may be lost. Unmount the partition manually\n" +"or restart your computer.\n" +msgstr "" + +#. label, %1 is partition +#: src/modules/RootPart.ycp:271 +#, ycp-format +msgid "Checking partition %1" +msgstr "" + +#: src/modules/RootPart.ycp:311 +msgid "Show &Details" +msgstr "" + +#: src/modules/RootPart.ycp:398 +#, ycp-format +msgid "Checking file system on %1..." +msgstr "" + +#. popup headline +#: src/modules/RootPart.ycp:422 +msgid "File System Check Failed" +msgstr "" + +#. popup question (continue/cancel dialog) +#. %1 is a device name such as /dev/hda5 +#: src/modules/RootPart.ycp:426 +#, ycp-format +msgid "" +"The file system check of device %1 has failed.\n" +"\n" +"Would you like to continue in the mounting the device?" +msgstr "" + +#. button +#: src/modules/RootPart.ycp:432 +msgid "&Skip Mounting" +msgstr "" + +#. yes-no popup +#: src/modules/RootPart.ycp:835 +msgid "Incorrect password. Try again?" +msgstr "" + +#. TRANSLATORS: a popup headline +#: src/modules/RootPart.ycp:922 +msgid "Warning" +msgstr "" + +#: src/modules/RootPart.ycp:927 +#, ycp-format +msgid "" +"Your /boot partition is too small (%1 MB).\n" +"We recommend a size not less than %2 MB. It might happen, that the\n" +"new Kernel does not fit, so it would be safer to either enlarge that partition\n" +"or not to use the /boot partition at all.\n" +"\n" +"Would you like to continue updating the current system?" +msgstr "" + +#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command +#: src/modules/RootPart.ycp:999 +#, ycp-format +msgid "" +"The partition %1 could not be mounted.\n" +"\n" +"%2\n" +"\n" +"If you are sure that the partition is not necessary for the\n" +"update (it is not any system partition), click Continue.\n" +"To check or fix the mount options, click Specify Mount Options.\n" +"To abort update, click Cancel." +msgstr "" + +#. push button +#: src/modules/RootPart.ycp:1013 +msgid "&Specify Mount Options" +msgstr "" + +#. popup heading +#: src/modules/RootPart.ycp:1032 +msgid "Mount Options" +msgstr "" + +#. text entry label +#: src/modules/RootPart.ycp:1035 +msgid "&Mount Point" +msgstr "" + +#. tex entry label +#: src/modules/RootPart.ycp:1038 +msgid "&Device" +msgstr "" + +#. text entry label +#: src/modules/RootPart.ycp:1041 +msgid "" +"&File System\n" +"(empty for autodetection)" +msgstr "" + +#. error message +#: src/modules/RootPart.ycp:1119 +#, ycp-format +msgid "The /var partition %1 could not be mounted.\n" +msgstr "" + +#. error message +#: src/modules/RootPart.ycp:1170 +msgid "Unable to mount /var partition with this disk configuration.\n" +msgstr "" + +#. popup message, %1 will be replace with the name of the logfile +#: src/modules/RootPart.ycp:1195 +#, ycp-format +msgid "" +"Partitions could not be mounted.\n" +"\n" +"Check the log file %1." +msgstr "" + +#. error message +#: src/modules/RootPart.ycp:1225 +msgid "No fstab found." +msgstr "" + +#. message part 1 +#: src/modules/RootPart.ycp:1245 +msgid "The root partition in /etc/fstab has an invalid root device.\n" +msgstr "" + +#. message part 2 +#: src/modules/RootPart.ycp:1247 +#, ycp-format +msgid "It is currently mounted as %1 but listed as %2.\n" +msgstr "" + +#. intermediate popup while mounting partitions +#: src/modules/RootPart.ycp:1539 +msgid "Mounting partitions. One moment please..." +msgstr "" + +#: src/modules/RootPart.ycp:1553 +msgid "xxx" +msgstr "" + +#: src/modules/RootPart.ycp:1554 +msgid "Evaluating root partition. One moment please..." +msgstr "" + +#. TRANSLATORS: "Update to: $product_name" +#: src/modules/Update.ycp:277 +msgid "Unknown Product" +msgstr "" + +#. TRANSLATORS: check-box, it might happen that we need to downgrade some packages during update +#: src/modules/Update.ycp:687 +msgid "Allow Package Downgrade" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.0/VERSION new/yast2-update-2.17.1/VERSION --- old/yast2-update-2.17.0/VERSION 2008-07-24 11:54:27.000000000 +0200 +++ new/yast2-update-2.17.1/VERSION 2008-08-04 13:20:33.000000000 +0200 @@ -1 +1 @@ -2.17.0 +2.17.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 yast2-network
by root＠Hilbert.suse.de 04 Aug '08

04 Aug '08

Hello community, here is the log from the commit of package yast2-network checked in at Mon Aug 4 14:17:30 CEST 2008. -------- --- yast2-network/yast2-network.changes 2008-07-28 11:07:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-08-04 13:26:18.864625000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 4 13:22:38 CEST 2008 - mzugec(a)suse.cz + +- improved Lan::Packages() function +- added STARTMODE=onboot for tun/tap devices (FaTE#302184) +- 2.17.14 + +------------------------------------------------------------------- Old: ---- yast2-network-2.17.13.tar.bz2 New: ---- yast2-network-2.17.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.w16198/_old 2008-08-04 14:16:17.000000000 +0200 +++ /var/tmp/diff_new_pack.w16198/_new 2008-08-04 14:16:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.17.13) +# spec file for package yast2-network (Version 2.17.14) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-network -Version: 2.17.13 +Version: 2.17.14 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.17.13.tar.bz2 +Source0: yast2-network-2.17.14.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -71,7 +71,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.17.13 +%setup -n yast2-network-2.17.14 %build %{prefix}/bin/y2tool y2autoconf @@ -135,6 +135,10 @@ %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Mon Aug 04 2008 mzugec(a)suse.cz +- improved Lan::Packages() function +- added STARTMODE=onboot for tun/tap devices (FaTE#302184) +- 2.17.14 * Mon Jul 28 2008 mzugec(a)suse.cz - use all devices for InternetTest, not only eth (bnc#400632) - 2.17.13 ++++++ yast2-network-2.17.13.tar.bz2 -> yast2-network-2.17.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.13/configure new/yast2-network-2.17.14/configure --- old/yast2-network-2.17.13/configure 2008-07-28 10:51:17.000000000 +0200 +++ new/yast2-network-2.17.14/configure 2008-08-04 13:21:38.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-network 2.17.12. +# Generated by GNU Autoconf 2.61 for yast2-network 2.17.13. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.17.12' -PACKAGE_STRING='yast2-network 2.17.12' +PACKAGE_VERSION='2.17.13' +PACKAGE_STRING='yast2-network 2.17.13' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-network 2.17.12 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.17.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.17.12:";; + short | recursive ) echo "Configuration of yast2-network 2.17.13:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.17.12 +yast2-network configure 2.17.13 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-network $as_me 2.17.12, which was +It was created by yast2-network $as_me 2.17.13, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.17.12' + VERSION='2.17.13' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.12" +VERSION="2.17.13" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-network $as_me 2.17.12, which was +This file was extended by yast2-network $as_me 2.17.13, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.17.12 +yast2-network config.status 2.17.13 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.13/configure.in new/yast2-network-2.17.14/configure.in --- old/yast2-network-2.17.13/configure.in 2008-07-28 10:51:12.000000000 +0200 +++ new/yast2-network-2.17.14/configure.in 2008-08-04 13:21:32.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.17.12, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.17.13, http://bugs.opensuse.org/, yast2-network) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.12" +VERSION="2.17.13" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.13/src/lan/address.ycp new/yast2-network-2.17.14/src/lan/address.ycp --- old/yast2-network-2.17.13/src/lan/address.ycp 2008-07-25 16:20:15.000000000 +0200 +++ new/yast2-network-2.17.14/src/lan/address.ycp 2008-08-04 13:24:52.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: address.ycp 49420 2008-07-25 14:20:14Z mzugec $ + * $Id: address.ycp 49627 2008-08-04 11:24:52Z mzugec $ */ { @@ -732,6 +732,7 @@ { settings = $[ "BOOTPROTO": "static", + "STARTMODE": "onboot", "TUNNEL" : LanItems::type, "TUNNEL_SET_PERSISTENT" : LanItems::tunnel_set_persistent ? "yes" : "no", "TUNNEL_SET_OWNER" : LanItems::tunnel_set_owner, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.13/src/modules/LanItems.ycp new/yast2-network-2.17.14/src/modules/LanItems.ycp --- old/yast2-network-2.17.13/src/modules/LanItems.ycp 2008-07-25 16:06:48.000000000 +0200 +++ new/yast2-network-2.17.14/src/modules/LanItems.ycp 2008-08-04 12:06:18.000000000 +0200 @@ -1203,6 +1203,7 @@ if (contains(["tun", "tap"], type)){ newdev=$[ "BOOTPROTO" : "static", + "STARTMODE" : "onboot", "TUNNEL" : type, "TUNNEL_SET_PERSISTENT" : tunnel_set_persistent ? "yes" : "no", "TUNNEL_SET_OWNER" : tunnel_set_owner, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.13/src/modules/Lan.ycp new/yast2-network-2.17.14/src/modules/Lan.ycp --- old/yast2-network-2.17.13/src/modules/Lan.ycp 2008-07-22 12:56:18.000000000 +0200 +++ new/yast2-network-2.17.14/src/modules/Lan.ycp 2008-08-04 13:24:52.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 49315 2008-07-22 10:47:00Z mzugec $ + * $Id: Lan.ycp 49627 2008-08-04 11:24:52Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -1123,29 +1123,42 @@ if (!PackageSystem::Installed("smpppd")) pkgs = add (pkgs, "smpppd"); } */ - if (NetworkInterfaces::Locate ("STARTMODE", "ifplugd") != []) - { - if (!PackageSystem::Installed("ifplugd")) pkgs = add (pkgs, "ifplugd"); - } - // #suse49880 - if (NetworkInterfaces::List ("wlan") != []) - { - if (!PackageSystem::Installed("wireless-tools")) pkgs = add (pkgs, "wireless-tools"); - } - if (NetworkInterfaces::List ("vlan") != []) - { - if (!PackageSystem::Installed("vlan")) pkgs = add (pkgs, "vlan"); - } - if (NetworkInterfaces::List ("br") != []) - { - if (!PackageSystem::Installed("bridge-utils")) pkgs = add (pkgs, "bridge-utils"); - } - // #47809 - if (NetworkInterfaces::Locate ("WIRELESS_AUTH_MODE", "psk") != [] || - NetworkInterfaces::Locate ("WIRELESS_AUTH_MODE", "eap") != []) - { - if (!PackageSystem::Installed("wpa_supplicant")) pkgs = add (pkgs, "wpa_supplicant"); - } + map<string, any> required = $[ + "types":$[ + "wlan" : "wireless-tools", + "vlan" : "vlan", + "br" : "bridge-utils", + "tun" : "tunctl", + "tap" : "tunctl" + ], + "options":$[ + "STARTMODE":$[ + "ifplugd" : "ifplugd" + ], + "WIRELESS_AUTH_MODE":$[ + "psk" : "wpa_supplicant", + "eap" : "wpa_supplicant" + ] + ] + ]; + + foreach(string type, (list<string>)Map::Keys(required["types"]:$[]), { + string package=required["types", type]:""; + if (size( NetworkInterfaces::List(type) ) > 0) + y2milestone("Network interface type %1 requires package %2", type, package); + if (!PackageSystem::Installed( package )) pkgs = add (pkgs, package); + }); + + + foreach(string type, (list<string>)Map::Keys(required["options"]:$[]), { + foreach(string option, (list<string>)Map::Keys(required["options", type]:$[]), { + string package=required["options", type, option]:""; + if (NetworkInterfaces::Locate (type, option) != []) + y2milestone("Network interface with options %1, %2 requires package %3", type, option, package); + if (!PackageSystem::Installed(package)) pkgs = add (pkgs, package); + }); + }); + if (NetworkService::IsManaged ()) { if (!PackageSystem::Installed("NetworkManager")) pkgs = add (pkgs, "NetworkManager"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.13/VERSION new/yast2-network-2.17.14/VERSION --- old/yast2-network-2.17.13/VERSION 2008-07-28 10:52:48.000000000 +0200 +++ new/yast2-network-2.17.14/VERSION 2008-08-04 13:22:34.000000000 +0200 @@ -1 +1 @@ -2.17.13 +2.17.14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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