March 2006 - openSUSE Commits - openSUSE Mailing Lists

commit autoyast2
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package autoyast2 checked in at Wed Mar 29 21:11:54 CEST 2006. -------- --- autoyast2/autoyast2.changes 2006-03-29 16:55:35.000000000 +0200 +++ autoyast2/autoyast2.changes 2006-03-29 20:07:23.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 19:27:40 CEST 2006 - jsrain(a)suse.de + +- fixed add-on products installation integration (#161792) +- 2.13.37 + +------------------------------------------------------------------- Old: ---- autoyast2-2.13.36.tar.bz2 New: ---- autoyast2-2.13.37.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.CfO8cD/_old 2006-03-29 21:11:28.000000000 +0200 +++ /var/tmp/diff_new_pack.CfO8cD/_new 2006-03-29 21:11:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.13.36) +# spec file for package autoyast2 (Version 2.13.37) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: autoyast2 URL: http://www.suse.com/ -Version: 2.13.36 +Version: 2.13.37 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.13.36.tar.bz2 +Source0: autoyast2-2.13.37.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update Requires: yast2-core yast2-xml libxslt @@ -48,7 +48,7 @@ Anas Nashif <nashif(a)suse.de> %package installation -Version: 2.13.36 +Version: 2.13.37 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -68,7 +68,7 @@ Anas Nashif <nashif(a)suse.de> %package utils -Version: 2.13.36 +Version: 2.13.37 Release: 1 Summary: YaST2 - Auto Installation Utilities Group: System/YaST @@ -81,7 +81,7 @@ %prep -%setup -n autoyast2-2.13.36 +%setup -n autoyast2-2.13.37 %build %{prefix}/bin/y2tool y2autoconf @@ -228,6 +228,9 @@ /usr/bin/create_update_source.sh %changelog -n autoyast2 +* Wed Mar 29 2006 - jsrain(a)suse.de +- fixed add-on products installation integration (#161792) +- 2.13.37 * Wed Mar 29 2006 - ug(a)suse.de - set SoftLock to avoid the installation of recommended patterns (#159466) ++++++ autoyast2-2.13.36.tar.bz2 -> autoyast2-2.13.37.tar.bz2 ++++++ ++++ 2503 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/Makefile.am new/autoyast2-2.13.37/Makefile.am --- old/autoyast2-2.13.36/Makefile.am 2006-03-29 16:51:16.000000000 +0200 +++ new/autoyast2-2.13.37/Makefile.am 2006-03-29 20:06:51.000000000 +0200 @@ -6,7 +6,8 @@ # (Edit ./SUBDIRS instead) # -PREFIX = /usr +#where devtools are +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -30,6 +31,10 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) AUTOMAKE_OPTIONS = foreign dist-bzip2 +# where devtools instal m4 snippets +# argh, executed literally +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ @@ -57,12 +62,8 @@ # info '(automake)Conditionals' if CREATE_PKGCONFIG -# pkg-config -# if a package does not have its own pc, copy the generic one -$(RPMNAME).pc.in: $(DEVTOOLS_DIR)/admin/generic.pc.in - test -f $@ || cp -p $< $@ # create the file here instead of by configure -# because the prerequisite is made here +# because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' $(RPMNAME).pc: $(RPMNAME).pc.in @@ -153,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -198,6 +199,9 @@ false; \ fi +check-textdomain: + $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/Makefile.am.common new/autoyast2-2.13.37/Makefile.am.common --- old/autoyast2-2.13.36/Makefile.am.common 2006-03-29 16:51:16.000000000 +0200 +++ new/autoyast2-2.13.37/Makefile.am.common 2006-03-29 20:06:51.000000000 +0200 @@ -9,7 +9,7 @@ # suffix mapping: info '(make)Static Usage' # apply only to our modules, not external ones ${ybcfiles}: %.ybc: %.ycp $(ycpchook) - Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) $(bindir)/ycpc -c -M. -I. -q $(YCPCFLAGS) $< + Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $< # files to clean CLEANFILES = ${ybcfiles} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/VERSION new/autoyast2-2.13.37/VERSION --- old/autoyast2-2.13.36/VERSION 2006-03-29 16:50:43.000000000 +0200 +++ new/autoyast2-2.13.37/VERSION 2006-03-29 20:06:03.000000000 +0200 @@ -1 +1 @@ -2.13.36 +2.13.37 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/configure.in new/autoyast2-2.13.37/configure.in --- old/autoyast2-2.13.36/configure.in 2006-03-29 16:51:16.000000000 +0200 +++ new/autoyast2-2.13.37/configure.in 2006-03-29 20:06:51.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.13.36, http://www.suse.de/feedback, autoyast2) +AC_INIT(autoyast2, 2.13.37, http://www.suse.de/feedback, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.36" +VERSION="2.13.37" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" @@ -114,8 +114,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -devtools_ybindir=`pkg-config --variable=ybindir yast2-devtools` -devtools_yast2dir=`pkg-config --variable=yast2dir yast2-devtools` +devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` +devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` dnl producing pkg-config for others? AM_CONDITIONAL(CREATE_PKGCONFIG, test "x${CREATE_PKGCONFIG}" != x) @@ -142,6 +142,10 @@ if test "$YCPMAKEDEP" = "false"; then AC_MSG_ERROR([ycpmakedep is not installed]) fi +AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) +if test "$YCPC" = "false"; then + AC_MSG_ERROR([ycpc is not installed]) +fi AX_CHECK_DOCBOOK diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/autoyast2-2.13.36/src/clients/inst_autosetup.ycp new/autoyast2-2.13.37/src/clients/inst_autosetup.ycp --- old/autoyast2-2.13.36/src/clients/inst_autosetup.ycp 2006-03-28 11:30:38.000000000 +0200 +++ new/autoyast2-2.13.37/src/clients/inst_autosetup.ycp 2006-03-29 20:05:58.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Anas Nashif <nashif(a)suse.de> * Uwe Gansert <ug(a)suse.de> * - * $Id: inst_autosetup.ycp 29454 2006-03-28 09:30:36Z ug $ + * $Id: inst_autosetup.ycp 29544 2006-03-29 18:05:28Z jsrain $ */ { @@ -114,10 +114,6 @@ askDialog(); Call::Function("add-on_auto", ["Import", Profile::current["add-on"]:$[]] ); Call::Function("add-on_auto", ["Write"]); - /* FIXME: this breaks autoinstallation but is needed for addon support. - if( ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true) == `next ) - return `finish; - */ // // Set Mouse and other workflow variables @@ -224,5 +220,8 @@ AutoInstall::TurnOff(); Progress::Finish(); - return `next; + symbol ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true); + if (ret == `next) + return `finish; + return ret; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2 checked in at Wed Mar 29 20:58:40 CEST 2006. -------- --- yast2/yast2.changes 2006-03-22 13:01:56.000000000 +0100 +++ yast2/yast2.changes 2006-03-29 17:04:40.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Mar 29 17:04:09 CEST 2006 - mvidner(a)suse.cz + +- Added PackageLock, a module to handle the big Zypp lock (#160319). +- 2.13.41 + +------------------------------------------------------------------- +Mon Mar 27 10:24:51 CEST 2006 - locilka(a)suse.cz + +- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut() + +------------------------------------------------------------------- Old: ---- yast2-2.13.40.tar.bz2 New: ---- yast2-2.13.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.vUqjTB/_old 2006-03-29 20:57:47.000000000 +0200 +++ /var/tmp/diff_new_pack.vUqjTB/_new 2006-03-29 20:57:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.13.40) +# spec file for package yast2 (Version 2.13.41) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,22 +11,24 @@ # norootforbuild Name: yast2 -Version: 2.13.40 +Version: 2.13.41 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.13.40.tar.bz2 +Source0: yast2-2.13.41.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # Need the new file popups Requires: yast2-core >= 2.7.1 +# Pkg::Connect +Requires: yast2-pkg-bindings >= 2.13.43 Requires: yast2_ui yast2_theme # For Cron Agent, Module Requires: perl-Config-Crontab # for ag_tty (/bin/stty) Requires: coreutils -Requires: yast2-pkg-bindings, yast2-xml, yast2-hardware-detection +Requires: yast2-xml, yast2-hardware-detection Requires: SuSEfirewall2 Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer @@ -91,7 +93,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.13.40 +%setup -n yast2-2.13.41 %build %{prefix}/bin/y2tool y2autoconf @@ -190,6 +192,11 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 +* Wed Mar 29 2006 - mvidner(a)suse.cz +- Added PackageLock, a module to handle the big Zypp lock (#160319). +- 2.13.41 +* Mon Mar 27 2006 - locilka(a)suse.cz +- TERM=raw -> TERM=dumb in Service::RunInitScriptWithTimeOut() * Wed Mar 22 2006 - locilka(a)suse.cz - better testing of UTF-8 support using the testutf8 binary (#158001) ++++++ yast2-2.13.40.tar.bz2 -> yast2-2.13.41.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/Makefile.am new/yast2-2.13.41/Makefile.am --- old/yast2-2.13.40/Makefile.am 2006-03-22 13:03:49.000000000 +0100 +++ new/yast2-2.13.41/Makefile.am 2006-03-29 17:06:25.000000000 +0200 @@ -154,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,6 +199,9 @@ false; \ fi +check-textdomain: + $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/Makefile.in new/yast2-2.13.41/Makefile.in --- old/yast2-2.13.40/Makefile.in 2006-03-22 13:04:04.000000000 +0100 +++ new/yast2-2.13.41/Makefile.in 2006-03-29 17:07:07.000000000 +0200 @@ -789,7 +789,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -832,6 +832,9 @@ false; \ fi +check-textdomain: + $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/VERSION new/yast2-2.13.41/VERSION --- old/yast2-2.13.40/VERSION 2006-03-22 13:01:38.000000000 +0100 +++ new/yast2-2.13.41/VERSION 2006-03-29 17:03:01.000000000 +0200 @@ -1 +1 @@ -2.13.40 +2.13.41 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/base.pot new/yast2-2.13.41/base.pot --- old/yast2-2.13.40/base.pot 2006-02-07 16:03:17.000000000 +0100 +++ new/yast2-2.13.41/base.pot 2005-12-14 16:33:36.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-02-07 16:03+0100\n" +"POT-Creation-Date: 2005-12-14 16:33+0100\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" @@ -258,53 +258,53 @@ msgstr "" #. translators: progress message - command line interface ready -#: library/commandline/src/CommandLine.ycp:1258 +#: library/commandline/src/CommandLine.ycp:1263 msgid "Ready" msgstr "" #. non-GUI handling -#: library/commandline/src/CommandLine.ycp:1282 +#: library/commandline/src/CommandLine.ycp:1287 msgid "Initializing" msgstr "" #. translators: Progress message - the command line interface is about to finish -#: library/commandline/src/CommandLine.ycp:1321 +#: library/commandline/src/CommandLine.ycp:1326 msgid "Finishing" msgstr "" #. translators: The command line interface is finished -#: library/commandline/src/CommandLine.ycp:1328 +#: library/commandline/src/CommandLine.ycp:1333 msgid "Done" msgstr "" #. translators: The command line interface is finished without writing the changes -#: library/commandline/src/CommandLine.ycp:1331 +#: library/commandline/src/CommandLine.ycp:1336 msgid "Quitting (without changes)" msgstr "" #. prompt message displayed in the commandline mode #. when user is asked to replay "yes" or "no" (localized) -#: library/commandline/src/CommandLine.ycp:1346 -msgid "yes or no?" +#: library/commandline/src/CommandLine.ycp:1351 +msgid "yes/no?: " msgstr "" #. yes - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/CommandLine.ycp:1351 +#: library/commandline/src/CommandLine.ycp:1356 msgid "yes" msgstr "" #. no - used in the command line mode as input text for yes/no confirmation -#: library/commandline/src/CommandLine.ycp:1354 +#: library/commandline/src/CommandLine.ycp:1359 msgid "no" msgstr "" #. error report -#: library/control/src/ProductControl.ycp:813 +#: library/control/src/ProductControl.ycp:811 msgid "No workflow defined for this installation mode." msgstr "" #. message popup, %1 is a label of some widget -#: library/cwm/src/CWM.ycp:626 +#: library/cwm/src/CWM.ycp:630 #, ycp-format msgid "The value of %1 is invalid." msgstr "" @@ -598,37 +598,37 @@ msgstr "" #. combobox header -#: library/cwm/src/TablePopup.ycp:417 +#: library/cwm/src/TablePopup.ycp:413 msgid "&Selected Option" msgstr "" #. heading / label -#: library/cwm/src/TablePopup.ycp:463 +#: library/cwm/src/TablePopup.ycp:459 msgid "Current Option: " msgstr "" #. error report -#: library/cwm/src/TablePopup.ycp:663 +#: library/cwm/src/TablePopup.ycp:652 msgid "The selected option is already present." msgstr "" #. table header, shortcut for changed, keep very short -#: library/cwm/src/TablePopup.ycp:835 +#: library/cwm/src/TablePopup.ycp:823 msgid "Ch." msgstr "" #. table header -#: library/cwm/src/TablePopup.ycp:837 library/cwm/src/TablePopup.ycp:842 +#: library/cwm/src/TablePopup.ycp:825 library/cwm/src/TablePopup.ycp:830 msgid "Option" msgstr "" #. table header -#: library/cwm/src/TablePopup.ycp:839 library/cwm/src/TablePopup.ycp:844 +#: library/cwm/src/TablePopup.ycp:827 library/cwm/src/TablePopup.ycp:832 msgid "Value" msgstr "" #. help 1/4 -#: library/cwm/src/TablePopup.ycp:848 +#: library/cwm/src/TablePopup.ycp:836 msgid "" "<p><b><big>Editing the Settings</big></b><br>\n" "To edit the settings, choose the appropriate\n" @@ -636,21 +636,21 @@ msgstr "" #. help 2/4, optional -#: library/cwm/src/TablePopup.ycp:853 +#: library/cwm/src/TablePopup.ycp:841 msgid "" "<p>To add a new option, click <b>Add</b>. To remove\n" "an option, select it and click <b>Delete</b>.</p>" msgstr "" #. help 3/4, optional -#: library/cwm/src/TablePopup.ycp:858 +#: library/cwm/src/TablePopup.ycp:846 msgid "" "<P>The <B>Ch.</B> column of the table shows \n" "whether the option was changed.</P>" msgstr "" #. help 4/4, optional -#: library/cwm/src/TablePopup.ycp:863 +#: library/cwm/src/TablePopup.ycp:851 msgid "" "<p>To reorder the options, select an option\n" "and use <b>Up</b> and <b>Down</b> to move it up or down\n" @@ -659,12 +659,12 @@ #. push button #. Button label -#: library/cwm/src/TablePopup.ycp:871 library/modules/Label.ycp:184 +#: library/cwm/src/TablePopup.ycp:859 library/modules/Label.ycp:184 msgid "&Up" msgstr "" #. push button -#: library/cwm/src/TablePopup.ycp:873 +#: library/cwm/src/TablePopup.ycp:861 msgid "&Down" msgstr "" @@ -1277,176 +1277,43 @@ msgid "All changes will be lost!" msgstr "" -#. translators: summary header for messages generated through autoinstallation -#: library/modules/Report.ycp:81 -msgid "Messages" -msgstr "" - -#. Report configuration - will be normal messages displayed? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/modules/Report.ycp:86 -#, ycp-format -msgid "Display Messages: %1" -msgstr "" - -#. translators: summary if the messages should be displayed -#. translators: summary if the messages should be written to log file -#. translators: summary if the warnings should be displayed -#. translators: summary if the warnings should be written to log file -#. translators: summary if the errors should be displayed -#. translators: summary if the errors should be written to log file -#: library/modules/Report.ycp:88 library/modules/Report.ycp:96 -#: library/modules/Report.ycp:105 library/modules/Report.ycp:113 -#: library/modules/Report.ycp:122 library/modules/Report.ycp:130 -msgid "Yes" -msgstr "" - -#. translators: summary if the errors should be written to log file -#: library/modules/Report.ycp:88 library/modules/Report.ycp:96 -#: library/modules/Report.ycp:105 library/modules/Report.ycp:113 -#: library/modules/Report.ycp:122 library/modules/Report.ycp:132 -msgid "No" -msgstr "" - -#. Report configuration - will have normal messages timeout? -#. '%1' will be replaced by number of seconds -#: library/modules/Report.ycp:91 -#, ycp-format -msgid "Time-out Messages: %1" -msgstr "" - -#. Report configuration - will be normal messages logged to file? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/modules/Report.ycp:94 -#, ycp-format -msgid "Log Messages: %1" -msgstr "" - -#. translators: summary header for warnings generated through autoinstallation -#: library/modules/Report.ycp:99 -msgid "Warnings" -msgstr "" - -#. Report configuration - will be warning messages displayed? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/modules/Report.ycp:103 -#, ycp-format -msgid "Display Warnings: %1" -msgstr "" - -#. Report configuration - will have warning messages timeout? -#. '%1' will be replaced by number of seconds -#: library/modules/Report.ycp:108 -#, ycp-format -msgid "Time-out Warnings: %1" -msgstr "" - -#. Report configuration - will be warning messages logged to file? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/modules/Report.ycp:111 -#, ycp-format -msgid "Log Warnings: %1" -msgstr "" - -#. translators: summary header for errors generated through autoinstallation -#: library/modules/Report.ycp:116 -msgid "Errors" -msgstr "" - -#. Report configuration - will be error messages displayed? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/modules/Report.ycp:120 -#, ycp-format -msgid "Display Errors: %1" -msgstr "" - -#. Report configuration - will have error messages timeout? -#. '%1' will be replaced by number of seconds -#: library/modules/Report.ycp:125 -#, ycp-format -msgid "Time-out Errors: %1" -msgstr "" - -#. Report configuration - will be error messages logged to file? -#. '%1' will be replaced by translated string "Yes" or "No" -#: library/modules/Report.ycp:128 -#, ycp-format -msgid "Log Errors: %1" -msgstr "" - -#. translators: warnings summary header -#: library/modules/Report.ycp:635 -msgid "Warning:" -msgid_plural "Warnings:" -msgstr[0] "" -msgstr[1] "" - -#. translators: errors summary header -#: library/modules/Report.ycp:649 -msgid "Error:" -msgid_plural "Errors:" -msgstr[0] "" -msgstr[1] "" - -#. translators: message summary header -#: library/modules/Report.ycp:663 library/modules/Report.ycp:677 -msgid "Message:" -msgid_plural "Messages:" -msgstr[0] "" -msgstr[1] "" - -#. translators: summary if the module has not been used yet in AutoYaST profile -#: library/modules/Summary.ycp:49 -msgid "Not configured yet." -msgstr "" - -#. translators: summary if no hardware was detected -#: library/modules/Summary.ycp:65 -msgid "Not detected." -msgstr "" - #. translators: Tree header #: library/modules/ValueBrowser.ycp:141 msgid "&Variable" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:104 +#: library/network/src/CWMFirewallInterfaces.ycp:77 msgid "Firewall is disabled" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:109 +#: library/network/src/CWMFirewallInterfaces.ycp:82 msgid "Firewall port is closed" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:114 +#: library/network/src/CWMFirewallInterfaces.ycp:87 msgid "Firewall port is open on all interfaces" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:119 +#: library/network/src/CWMFirewallInterfaces.ycp:92 msgid "Firewall port is open on selected interfaces" msgstr "" #. label -#: library/network/src/CWMFirewallInterfaces.ycp:124 +#: library/network/src/CWMFirewallInterfaces.ycp:97 msgid "No network interfaces are configured" msgstr "" -#. multi selection box item -#: library/network/src/CWMFirewallInterfaces.ycp:186 -msgid "All NetworkManager Interfaces" -msgstr "" - #. transaltors: selection box title -#: library/network/src/CWMFirewallInterfaces.ycp:365 +#: library/network/src/CWMFirewallInterfaces.ycp:278 msgid "&Network Interfaces with Open Port in Firewall" msgstr "" #. question popup -#: library/network/src/CWMFirewallInterfaces.ycp:431 +#: library/network/src/CWMFirewallInterfaces.ycp:338 msgid "" "No interface is selected. Service will not\n" "be available for other computers.\n" @@ -1455,7 +1322,7 @@ msgstr "" #. yes-no popup -#: library/network/src/CWMFirewallInterfaces.ycp:475 +#: library/network/src/CWMFirewallInterfaces.ycp:358 #, ycp-format msgid "" "Because of SuSE Firewall settings, the port\n" @@ -1466,7 +1333,7 @@ msgstr "" #. yes-no popup -#: library/network/src/CWMFirewallInterfaces.ycp:492 +#: library/network/src/CWMFirewallInterfaces.ycp:373 #, ycp-format msgid "" "Because of SuSE Firewall settings, the port\n" @@ -1477,23 +1344,23 @@ msgstr "" #. translators: selection box title -#: library/network/src/CWMFirewallInterfaces.ycp:569 +#: library/network/src/CWMFirewallInterfaces.ycp:450 msgid "Network &Interfaces with Open Port in Firewall" msgstr "" #. push button to select all network intefaces for firewall -#: library/network/src/CWMFirewallInterfaces.ycp:578 +#: library/network/src/CWMFirewallInterfaces.ycp:459 msgid "Select &All" msgstr "" #. push button to deselect all network intefaces for firewall -#: library/network/src/CWMFirewallInterfaces.ycp:581 +#: library/network/src/CWMFirewallInterfaces.ycp:462 msgid "Select &None" msgstr "" #. help text for firewall settings widget 1/3, #. %1 is check box label, eg. "Open Port in Firewall" (without quotes) -#: library/network/src/CWMFirewallInterfaces.ycp:799 +#: library/network/src/CWMFirewallInterfaces.ycp:680 #, ycp-format msgid "" "<p><b><big>Firewall Settings</big></b><br>\n" @@ -1504,7 +1371,7 @@ #. help text for firewall port openning widget 2/3, optional #. %1 is push button label, eg. "Firewall &Details" (without quotes) #. note: %2 is correct, do not replace with %1!!! -#: library/network/src/CWMFirewallInterfaces.ycp:807 +#: library/network/src/CWMFirewallInterfaces.ycp:688 #, ycp-format msgid "" "To select interfaces on which to open the port,\n" @@ -1512,46 +1379,37 @@ msgstr "" #. help text for firewall settings widget 3/3, -#: library/network/src/CWMFirewallInterfaces.ycp:811 +#: library/network/src/CWMFirewallInterfaces.ycp:692 msgid "" "This option is available only if the firewall\n" "is enabled.</p>" msgstr "" #. part of help text - check box label, NO SHORTCUT!!! -#: library/network/src/CWMFirewallInterfaces.ycp:824 +#: library/network/src/CWMFirewallInterfaces.ycp:705 msgid "Open Port in Firewall" msgstr "" #. part of help text - push button label, NO SHORTCUT!!! -#: library/network/src/CWMFirewallInterfaces.ycp:826 +#: library/network/src/CWMFirewallInterfaces.ycp:707 msgid "Firewall Details" msgstr "" #. check box -#: library/network/src/CWMFirewallInterfaces.ycp:855 +#: library/network/src/CWMFirewallInterfaces.ycp:736 msgid "Open Port in &Firewall" msgstr "" #. push button -#: library/network/src/CWMFirewallInterfaces.ycp:858 +#: library/network/src/CWMFirewallInterfaces.ycp:739 msgid "Firewall &Details" msgstr "" #. label text -#: library/network/src/CWMFirewallInterfaces.ycp:887 +#: library/network/src/CWMFirewallInterfaces.ycp:768 msgid "Firewall is open" msgstr "" -#. TRANSLATORS: pop-up question when reading the service configuration -#: library/network/src/NetworkService.ycp:108 -msgid "" -"Your network interfaces are currently controlled by NetworkManager\n" -"but the service to configure might not work well with it.\n" -"\n" -"Really continue?" -msgstr "" - #. TRANSLATORS: popup informing message, allowed characters for port-names #: library/network/src/PortAliases.ycp:112 msgid "" @@ -1561,39 +1419,39 @@ msgstr "" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/SuSEFirewall.ycp:79 +#: library/network/src/SuSEFirewall.ycp:72 msgid "External Zone" msgstr "" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/SuSEFirewall.ycp:81 +#: library/network/src/SuSEFirewall.ycp:74 msgid "Internal Zone" msgstr "" #. TRANSLATORS: Firewall zone name - used in combo box or dialog title -#: library/network/src/SuSEFirewall.ycp:83 +#: library/network/src/SuSEFirewall.ycp:76 msgid "Demilitarized Zone" msgstr "" #. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title -#: library/network/src/SuSEFirewall.ycp:1140 +#: library/network/src/SuSEFirewall.ycp:1103 msgid "Unknown Zone" msgstr "" #. TRANSLATORS: a popup error message -#: library/network/src/SuSEFirewall.ycp:1360 +#: library/network/src/SuSEFirewall.ycp:1323 #, ycp-format msgid "Cannot enable service '%1'." msgstr "" #. TRANSLATORS: a popup error message -#: library/network/src/SuSEFirewall.ycp:1382 +#: library/network/src/SuSEFirewall.ycp:1345 #, ycp-format msgid "Cannot disable service '%1'." msgstr "" #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/SuSEFirewall.ycp:1497 +#: library/network/src/SuSEFirewall.ycp:1458 #, ycp-format msgid "" "Interface '%1' is included in multiple firewall zones.\n" @@ -1604,8 +1462,8 @@ msgstr "" #. TRANSLATORS: Error message, %1 = interface name (like eth0) -#: library/network/src/SuSEFirewall.ycp:1782 -#: library/network/src/SuSEFirewall.ycp:1843 +#: library/network/src/SuSEFirewall.ycp:1730 +#: library/network/src/SuSEFirewall.ycp:1787 #, ycp-format msgid "" "Interface '%1' is not assigned to any firewall zone.\n" @@ -1613,78 +1471,78 @@ msgstr "" #. TRANSLATORS: Dialog caption -#: library/network/src/SuSEFirewall.ycp:2175 +#: library/network/src/SuSEFirewall.ycp:2111 msgid "Initializing Firewall Configuration" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2180 +#: library/network/src/SuSEFirewall.ycp:2116 msgid "Check for network devices" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2182 +#: library/network/src/SuSEFirewall.ycp:2118 msgid "Read current configuration" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2184 +#: library/network/src/SuSEFirewall.ycp:2120 msgid "Check possibly conflicting services" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2188 +#: library/network/src/SuSEFirewall.ycp:2124 msgid "Checking for network devices..." msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2190 +#: library/network/src/SuSEFirewall.ycp:2126 msgid "Reading current configuration..." msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2192 +#: library/network/src/SuSEFirewall.ycp:2128 msgid "Checking possibly conflicting services..." msgstr "" #. TRANSLATORS: Dialog caption -#: library/network/src/SuSEFirewall.ycp:2291 +#: library/network/src/SuSEFirewall.ycp:2227 msgid "Writing Firewall Configuration" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2296 +#: library/network/src/SuSEFirewall.ycp:2232 msgid "Write firewall settings" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2298 +#: library/network/src/SuSEFirewall.ycp:2234 msgid "Adjust firewall service" msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2302 +#: library/network/src/SuSEFirewall.ycp:2238 msgid "Writing firewall settings..." msgstr "" #. TRANSLATORS: Progress step -#: library/network/src/SuSEFirewall.ycp:2304 +#: library/network/src/SuSEFirewall.ycp:2240 msgid "Adjusting firewall service..." msgstr "" #. TRANSLATORS: a popup error message -#: library/network/src/SuSEFirewall.ycp:2320 +#: library/network/src/SuSEFirewall.ycp:2256 msgid "Writing settings failed" msgstr "" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/SuSEFirewallProposal.ycp:137 +#: library/network/src/SuSEFirewallProposal.ycp:136 #, ycp-format msgid "New network device '%1' found; added as an internal firewall interface" msgstr "" #. TRANSLATORS: Warning in installation proposal, %1 is a device name (eth0, sl0, ...) -#: library/network/src/SuSEFirewallProposal.ycp:144 +#: library/network/src/SuSEFirewallProposal.ycp:143 #, ycp-format msgid "New network device '%1' found; added as an external firewall interface" msgstr "" @@ -1692,7 +1550,7 @@ #. TRANSLATORS: Proposal informative text "Firewall is enabled" with link around #. "enabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:349 +#: library/network/src/SuSEFirewallProposal.ycp:330 #, ycp-format msgid "Firewall is %1enabled%2" msgstr "" @@ -1700,7 +1558,7 @@ #. TRANSLATORS: Proposal informative text "Firewall is disabled" with link around #. "disabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:354 +#: library/network/src/SuSEFirewallProposal.ycp:335 #, ycp-format msgid "Firewall is %1disabled%2" msgstr "" @@ -1708,7 +1566,7 @@ #. TRANSLATORS: Network proposal informative text "SSH is enabled" with link around #. "enabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:384 +#: library/network/src/SuSEFirewallProposal.ycp:353 #, ycp-format msgid "SSH port is %1open%2" msgstr "" @@ -1716,20 +1574,20 @@ #. TRANSLATORS: Network proposal informative text "SSH is disabled" with link around #. "disabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:389 +#: library/network/src/SuSEFirewallProposal.ycp:358 #, ycp-format msgid "SSH port is %1blocked%2" msgstr "" #. TRANSLATORS: This is a warning message. Installation over SSH without SSH allowed on firewall -#: library/network/src/SuSEFirewallProposal.ycp:395 -msgid "You are installing a system over SSH, but you have not opened the SSH port on the firewall." +#: library/network/src/SuSEFirewallProposal.ycp:364 +msgid "You are installing system over the SSH but you have not opened the SSH port on the firewall." msgstr "" #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around #. "enabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:414 +#: library/network/src/SuSEFirewallProposal.ycp:383 #, ycp-format msgid "Remote Administration (VNC) ports are %1open%2" msgstr "" @@ -1737,14 +1595,14 @@ #. TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around #. "disabled" must be surrounded with the "%1" and "%2" strings #. %1 is the start and %2 is the end of the HTML link "<a href...>" and "</a>" -#: library/network/src/SuSEFirewallProposal.ycp:419 +#: library/network/src/SuSEFirewallProposal.ycp:388 #, ycp-format msgid "Remote Administration (VNC) ports are %1blocked%2" msgstr "" #. TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall -#: library/network/src/SuSEFirewallProposal.ycp:424 -msgid "You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall." +#: library/network/src/SuSEFirewallProposal.ycp:393 +msgid "You are installing system over the Remote Administration (VNC) but you have not opened the VNC ports on the firewall." msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... @@ -1878,43 +1736,49 @@ msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:185 +#: library/network/src/SuSEFirewallServices.ycp:183 msgid "Remote Access to Display Manager" msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:193 +#: library/network/src/SuSEFirewallServices.ycp:191 msgid "Remote File Alteration Monitor" msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:199 +#: library/network/src/SuSEFirewallServices.ycp:197 msgid "Portable Batch System (PBS)" msgstr "" #. TRANSLATORS: Name of Service, can be used as check box, item in multiple selection box... -#: library/network/src/SuSEFirewallServices.ycp:206 +#: library/network/src/SuSEFirewallServices.ycp:204 msgid "MySQL Remote Access" msgstr "" #. TRANSLATORS: Name of unknown service. This should never happen, just for cases..., %1 is a requested service id like nis-server -#: library/network/src/SuSEFirewallServices.ycp:236 +#: library/network/src/SuSEFirewallServices.ycp:234 #, ycp-format msgid "Unknown service '%1'" msgstr "" #. Popup when initializing the package manager +#. popup when initializing the package manager #: library/packages/src/PackageSystem.ycp:77 +#: library/packages/src/Require.ycp:75 msgid "Reading package information..." msgstr "" #. Error message, no packages sources found +#. error popup, no packages sources +#. FIXME: translation #: library/packages/src/PackageSystem.ycp:99 +#: library/packages/src/Require.ycp:87 msgid "No package source defined." msgstr "" #. popup heading, with rich text widget and Yes/No buttons #: library/packages/src/PackageSystem.ycp:128 +#: library/packages/src/Require.ycp:343 msgid "Do you accept this license agreement?" msgid_plural "Do you accept these license agreements?" msgstr[0] "" @@ -1945,14 +1809,19 @@ "packages, YaST may not work properly.\n" msgstr "" +#. this is a separator used at merging package list items +#: library/packages/src/common.ycp:83 +msgid ", " +msgstr "" + #. the message is followed by list of required packages #. Popup Text -#: library/packages/src/common.ycp:84 library/packages/src/common.ycp:108 +#: library/packages/src/common.ycp:85 library/packages/src/common.ycp:109 msgid "These packages need to be installed:" msgstr "" #. Popup Text -#: library/packages/src/common.ycp:110 +#: library/packages/src/common.ycp:111 msgid "These packages need to be removed:" msgstr "" @@ -2064,22 +1933,22 @@ msgstr "" #. KiloByte abbreviated -#: library/types/src/String.ycp:96 +#: library/types/src/String.ycp:80 msgid "KB" msgstr "" #. MegaByte abbreviated -#: library/types/src/String.ycp:98 +#: library/types/src/String.ycp:82 msgid "MB" msgstr "" #. GigaByte abbreviated -#: library/types/src/String.ycp:100 +#: library/types/src/String.ycp:84 msgid "GB" msgstr "" #. TeraByte abbreviated -#: library/types/src/String.ycp:102 +#: library/types/src/String.ycp:86 msgid "TB" msgstr "" @@ -2155,6 +2024,134 @@ msgid "&Exported Directories" msgstr "" +#. translators: summary header for messages generated through autoinstallation +#: library/wizard/src/Report.ycp:81 +msgid "Messages" +msgstr "" + +#. Report configuration - will be normal messages displayed? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/wizard/src/Report.ycp:86 +#, ycp-format +msgid "Display Messages: %1" +msgstr "" + +#. translators: summary if the messages should be displayed +#. translators: summary if the messages should be written to log file +#. translators: summary if the warnings should be displayed +#. translators: summary if the warnings should be written to log file +#. translators: summary if the errors should be displayed +#. translators: summary if the errors should be written to log file +#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96 +#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113 +#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:130 +msgid "Yes" +msgstr "" + +#. translators: summary if the errors should be written to log file +#: library/wizard/src/Report.ycp:88 library/wizard/src/Report.ycp:96 +#: library/wizard/src/Report.ycp:105 library/wizard/src/Report.ycp:113 +#: library/wizard/src/Report.ycp:122 library/wizard/src/Report.ycp:132 +msgid "No" +msgstr "" + +#. Report configuration - will have normal messages timeout? +#. '%1' will be replaced by number of seconds +#: library/wizard/src/Report.ycp:91 +#, ycp-format +msgid "Time-out Messages: %1" +msgstr "" + +#. Report configuration - will be normal messages logged to file? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/wizard/src/Report.ycp:94 +#, ycp-format +msgid "Log Messages: %1" +msgstr "" + +#. translators: summary header for warnings generated through autoinstallation +#: library/wizard/src/Report.ycp:99 +msgid "Warnings" +msgstr "" + +#. Report configuration - will be warning messages displayed? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/wizard/src/Report.ycp:103 +#, ycp-format +msgid "Display Warnings: %1" +msgstr "" + +#. Report configuration - will have warning messages timeout? +#. '%1' will be replaced by number of seconds +#: library/wizard/src/Report.ycp:108 +#, ycp-format +msgid "Time-out Warnings: %1" +msgstr "" + +#. Report configuration - will be warning messages logged to file? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/wizard/src/Report.ycp:111 +#, ycp-format +msgid "Log Warnings: %1" +msgstr "" + +#. translators: summary header for errors generated through autoinstallation +#: library/wizard/src/Report.ycp:116 +msgid "Errors" +msgstr "" + +#. Report configuration - will be error messages displayed? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/wizard/src/Report.ycp:120 +#, ycp-format +msgid "Display Errors: %1" +msgstr "" + +#. Report configuration - will have error messages timeout? +#. '%1' will be replaced by number of seconds +#: library/wizard/src/Report.ycp:125 +#, ycp-format +msgid "Time-out Errors: %1" +msgstr "" + +#. Report configuration - will be error messages logged to file? +#. '%1' will be replaced by translated string "Yes" or "No" +#: library/wizard/src/Report.ycp:128 +#, ycp-format +msgid "Log Errors: %1" +msgstr "" + +#. translators: warnings summary header +#: library/wizard/src/Report.ycp:635 +msgid "Warning:" +msgid_plural "Warnings:" +msgstr[0] "" +msgstr[1] "" + +#. translators: errors summary header +#: library/wizard/src/Report.ycp:649 +msgid "Error:" +msgid_plural "Errors:" +msgstr[0] "" +msgstr[1] "" + +#. translators: message summary header +#: library/wizard/src/Report.ycp:663 library/wizard/src/Report.ycp:677 +msgid "Message:" +msgid_plural "Messages:" +msgstr[0] "" +msgstr[1] "" + +#. translators: summary if the module has not been used yet in AutoYaST profile +#: library/wizard/src/Summary.ycp:49 +msgid "Not configured yet." +msgstr "" + +#. translators: summary if no hardware was detected +#: library/wizard/src/Summary.ycp:65 +msgid "Not detected." +msgstr "" + #. button text #: library/wizard/src/Wizard.ycp:153 library/wizard/src/Wizard.ycp:306 msgid "&Apply" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/configure new/yast2-2.13.41/configure --- old/yast2-2.13.40/configure 2006-03-22 13:03:53.000000000 +0100 +++ new/yast2-2.13.41/configure 2006-03-29 17:06:37.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2 2.13.40. +# Generated by GNU Autoconf 2.59 for yast2 2.13.41. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.13.40' -PACKAGE_STRING='yast2 2.13.40' +PACKAGE_VERSION='2.13.41' +PACKAGE_STRING='yast2 2.13.41' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,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 2.13.40 to adapt to many kinds of systems. +\`configure' configures yast2 2.13.41 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.13.40:";; + short | recursive ) echo "Configuration of yast2 2.13.41:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.13.40 +yast2 configure 2.13.41 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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 $as_me 2.13.40, which was +It was created by yast2 $as_me 2.13.41, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.13.40' + VERSION='2.13.41' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.40" +VERSION="2.13.41" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>" @@ -2797,7 +2797,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2 $as_me 2.13.40, which was +This file was extended by yast2 $as_me 2.13.41, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2852,7 +2852,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.13.40 +yast2 config.status 2.13.41 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/configure.in new/yast2-2.13.41/configure.in --- old/yast2-2.13.40/configure.in 2006-03-22 13:03:49.000000000 +0100 +++ new/yast2-2.13.41/configure.in 2006-03-29 17:06:24.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.13.40, http://www.suse.de/feedback, yast2) +AC_INIT(yast2, 2.13.41, http://www.suse.de/feedback, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.40" +VERSION="2.13.41" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/modules/Version.ycp new/yast2-2.13.41/library/modules/Version.ycp --- old/yast2-2.13.40/library/modules/Version.ycp 2006-03-22 13:04:05.000000000 +0100 +++ new/yast2-2.13.41/library/modules/Version.ycp 2006-03-29 17:07:15.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.13.40"; +global string yast2 = "2.13.41"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/Makefile.am new/yast2-2.13.41/library/packages/src/Makefile.am --- old/yast2-2.13.40/library/packages/src/Makefile.am 2006-02-03 08:47:25.000000000 +0100 +++ new/yast2-2.13.41/library/packages/src/Makefile.am 2006-03-28 18:46:35.000000000 +0200 @@ -5,6 +5,7 @@ YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src module_DATA = \ + PackageLock.ycp \ Package.ycp \ PackageAI.ycp \ PackageSystem.ycp \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/Makefile.in new/yast2-2.13.41/library/packages/src/Makefile.in --- old/yast2-2.13.40/library/packages/src/Makefile.in 2006-03-22 13:03:59.000000000 +0100 +++ new/yast2-2.13.41/library/packages/src/Makefile.in 2006-03-29 17:06:54.000000000 +0200 @@ -174,6 +174,7 @@ ystartupdir = @ystartupdir@ YCPCFLAGS = -M ../../modules/ -M ../../wizard/src -M ../../system/src/ -M ../../types/src -M ../../commandline/src -M ../../xml/src module_DATA = \ + PackageLock.ycp \ Package.ycp \ PackageAI.ycp \ PackageSystem.ycp \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/PackageLock.ycp new/yast2-2.13.41/library/packages/src/PackageLock.ycp --- old/yast2-2.13.40/library/packages/src/PackageLock.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.13.41/library/packages/src/PackageLock.ycp 2006-03-29 15:32:27.000000000 +0200 @@ -0,0 +1,42 @@ +/** + * File: modules/PackageLock.ycp + * Package: yast2 + * Summary: Packages manipulation (system) + * Authors: Martin Vidner <mvidner(a)suse.cz> + * + * $Id: PackageLock.ycp 29512 2006-03-29 13:32:23Z mvidner $ + * + * This should be used everywhere before Pkg is first used. #160319 + */ + +{ + +module "PackageLock"; +textdomain "base"; + +import "Report"; + +boolean have_lock = nil; +/** + * Tries to acquire the packager (zypp) lock. + * Reports an error if another process has the lock already. + * Will only report once even if called multiple times. + * @return true if we can continue + */ +global boolean Check () { + if (have_lock == nil) + { + // Invoke a cheap call that accesses the zypp lock + have_lock = Pkg::Connect () == true; // nil guard + if (!have_lock) + { + Report::Error (_("Another process is accessing the package database. +Package management will not work!")); + // ContinueCancel? What about CLI? + } + } + return have_lock; +} + + +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/packages/src/PackageSystem.ycp new/yast2-2.13.41/library/packages/src/PackageSystem.ycp --- old/yast2-2.13.40/library/packages/src/PackageSystem.ycp 2006-02-20 12:08:10.000000000 +0100 +++ new/yast2-2.13.41/library/packages/src/PackageSystem.ycp 2006-03-29 17:04:49.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Martin Vidner <mvidner(a)suse.cz> * Michal Svec <msvec(a)suse.cz> * - * $Id: PackageSystem.ycp 27893 2006-02-13 12:08:32Z lslezak $ + * $Id: PackageSystem.ycp 29534 2006-03-29 15:04:45Z mvidner $ * * The documentation is maintained at * <a href="../index.html">.../docs/index.html</a>. @@ -18,6 +18,7 @@ import "Mode"; import "PackageCallbacksInit"; +import "PackageLock"; import "Report"; import "Stage"; import "CommandLine"; @@ -52,6 +53,7 @@ * This may become superfluous. */ global void EnsureTargetInit() { + PackageLock::Check (); PackageCallbacksInit::InitPackageCallbacks (); // target_initialized = target_initialized || Pkg::TargetInit ("/", false); // always initizalize target, it should be cheap according to #45356 @@ -62,6 +64,7 @@ * Ensure that Pkg:: calls working with the installation sources work */ global void EnsureSourceInit() { + PackageLock::Check (); if(source_initialized) { // this way, if somebody closed the cache outside of Package @@ -110,6 +113,11 @@ global boolean DoInstallAndRemove(list<string> toinstall, list<string> toremove) { y2debug ("toinstall: %1, toremove: %2", toinstall, toremove); + if (!PackageLock::Check ()) + { + return false; + } + EnsureSourceInit (); EnsureTargetInit (); boolean ok = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.40/library/runlevel/src/Service.ycp new/yast2-2.13.41/library/runlevel/src/Service.ycp --- old/yast2-2.13.40/library/runlevel/src/Service.ycp 2006-02-13 12:22:17.000000000 +0100 +++ new/yast2-2.13.41/library/runlevel/src/Service.ycp 2006-03-28 13:46:13.000000000 +0200 @@ -6,7 +6,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Michal Svec <msvec(a)suse.cz> * - * $Id: Service.ycp 27885 2006-02-13 11:22:17Z locilka $ + * $Id: Service.ycp 29400 2006-03-27 08:26:00Z locilka $ * * Functions for service (init script) handling used by other modules. */ @@ -293,7 +293,7 @@ */ global define integer RunInitScriptWithTimeOut (string name, string param) { y2milestone("Running service initscript %1 %2", name, param); - string command = sformat ("TERM=raw %2/%1 %3", name, init_d, param); + string command = sformat ("TERM=dumb %2/%1 %3", name, init_d, param); // default return code integer return_code = nil; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-bootloader
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2-bootloader checked in at Wed Mar 29 19:46:27 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-03-26 06:16:40.000000000 +0200 +++ yast2-bootloader/yast2-bootloader.changes 2006-03-29 18:54:46.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Mar 29 18:52:24 CEST 2006 - od(a)suse.de + +- using parted for activation of boot partition now (instead of + /sbin/activate from the lilo package) (#161316) +- fixed a typo +- fixed some whitespace +- added update-alternatives to BuildRequires +- 2.13.34 + +------------------------------------------------------------------- +Mon Mar 27 15:36:27 CEST 2006 - uli(a)suse.de + +- changed s390* reboot message (bug #160045) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.33.tar.bz2 New: ---- yast2-bootloader-2.13.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.NI0ZLd/_old 2006-03-29 19:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.NI0ZLd/_new 2006-03-29 19:45:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.33) +# spec file for package yast2-bootloader (Version 2.13.34) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,14 +11,14 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.33 +Version: 2.13.34 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.33.tar.bz2 +Source0: yast2-bootloader-2.13.34.tar.bz2 prefix: /usr -BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite +BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq Requires: yast2 yast2-core yast2-storage perl-Bootloader limal-bootloader %ifarch %ix86 x86_64 @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.33 +%setup -n yast2-bootloader-2.13.34 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,15 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Wed Mar 29 2006 - od(a)suse.de +- using parted for activation of boot partition now (instead of + /sbin/activate from the lilo package) (#161316) +- fixed a typo +- fixed some whitespace +- added update-alternatives to BuildRequires +- 2.13.34 +* Mon Mar 27 2006 - uli(a)suse.de +- changed s390* reboot message (bug #160045) * Sun Mar 26 2006 - od(a)suse.de - removed yast2-devel-packages from BuildRequires - add replacements for yast2-devel-packages to BuildRequires ++++++ yast2-bootloader-2.13.33.tar.bz2 -> yast2-bootloader-2.13.34.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.33/VERSION new/yast2-bootloader-2.13.34/VERSION --- old/yast2-bootloader-2.13.33/VERSION 2006-03-26 06:13:54.000000000 +0200 +++ new/yast2-bootloader-2.13.34/VERSION 2006-03-29 18:52:03.000000000 +0200 @@ -1 +1 @@ -2.13.33 +2.13.34 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.33/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.13.34/src/clients/bootloader_finish.ycp --- old/yast2-bootloader-2.13.33/src/clients/bootloader_finish.ycp 2006-02-23 16:11:01.000000000 +0100 +++ new/yast2-bootloader-2.13.34/src/clients/bootloader_finish.ycp 2006-03-29 18:16:14.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: bootloader_finish.ycp 28311 2006-02-22 20:10:48Z olh $ + * $Id: bootloader_finish.ycp 29419 2006-03-27 13:37:34Z uli $ * */ @@ -95,7 +95,10 @@ Misc::boot_msg = _(" Your system will now be shut down. After shutdown, reload the system -with the load address of your root DASD. +with the load address of your root DASD or +the load address of your zFCP device. +For details, read the related chapter +in the documentation. "); } else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.33/src/routines/misc.ycp new/yast2-bootloader-2.13.34/src/routines/misc.ycp --- old/yast2-bootloader-2.13.33/src/routines/misc.ycp 2006-03-07 22:16:46.000000000 +0100 +++ new/yast2-bootloader-2.13.34/src/routines/misc.ycp 2006-03-29 18:23:36.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: misc.ycp 28675 2006-03-07 21:16:39Z odabrunz $ + * $Id: misc.ycp 29538 2006-03-29 16:23:31Z odabrunz $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -223,7 +223,7 @@ * returns list of partitions. looks at '/proc/partitions' and creates list * of partition for combobox or menu * @param type symbol - * `boot - for botloader installation + * `boot - for bootloader installation * `root - for kernel root * `boot_other - for bootable partitions of other systems * `all - all partitions @@ -243,11 +243,12 @@ list<string> floppies = getFloppyDevices (); devices = filter (string k, map v, devices, - ``(v["type"]:`CT_UNKNONW!=`CT_LVM)); + ``(v["type"]:`CT_UNKNONW != `CT_LVM)); + if (type == `boot || type == `boot_other) { devices = filter (string k, map v, devices, - ``(v["type"]:`CT_UNKNONW==`CT_DISK)); + ``(v["type"]:`CT_UNKNONW == `CT_DISK)); } list<string> all_disks = (list<string>) maplist (string k, map v, devices, ``(k)); @@ -1094,7 +1095,7 @@ // FIXME: this is the most rotten code since molded sliced bread // move to bootloader/Core/GRUB.pm or similar string command = sformat - ("/sbin/activate %2 %1", num, mbr_dev); + ("/usr/sbin/parted -s %1 set %2 boot on", mbr_dev, num); y2milestone ("Running command %1", command); map out = (map)SCR::Execute (.target.bash_output, command); integer exit = out["exit"]:0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Wed Mar 29 18:32:52 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 15:01:29.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 18:31:33.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 18:30:40 CEST 2006 - kkaempf(a)suse.de + +- always treat zmd sources as 'remote' (#160402) +- rev 2757 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.fqQ5d8/_old 2006-03-29 18:32:07.000000000 +0200 +++ /var/tmp/diff_new_pack.fqQ5d8/_new 2006-03-29 18:32:07.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1 -Release: 21 +Release: 22 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -69,6 +69,9 @@ %changelog -n libzypp-zmd-backend * Wed Mar 29 2006 - kkaempf(a)suse.de +- always treat zmd sources as 'remote' (#160402) +- rev 2757 +* Wed Mar 29 2006 - kkaempf(a)suse.de - report proper error if .rpm file can't be found (#160402) - dont ask for media 0 - rev 2751 ++++++ zmd-backend-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/dbsource/DbAccess.cc new/zmd-backend-7.1.1/src/dbsource/DbAccess.cc --- old/zmd-backend-7.1.1/src/dbsource/DbAccess.cc 2006-03-24 18:22:35.000000000 +0100 +++ new/zmd-backend-7.1.1/src/dbsource/DbAccess.cc 2006-03-29 18:28:35.000000000 +0200 @@ -56,6 +56,8 @@ static bool source_is_local( Source_Ref source ) { + return false; + if (!source) return true; string scheme = source.url().getScheme(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-online-update
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2-online-update checked in at Wed Mar 29 18:00:07 CEST 2006. -------- --- yast2-online-update/yast2-online-update.changes 2006-03-29 17:28:01.000000000 +0200 +++ yast2-online-update/yast2-online-update.changes 2006-03-28 09:54:28.000000000 +0200 @@ -2,14 +1,0 @@ -Wed Mar 29 17:19:51 CEST 2006 - visnov(a)suse.cz - -- fix patch message callback -- call PkgEstablish and preselect patches before - starting patch selector -- 2.13.16 - -------------------------------------------------------------------- -Wed Mar 29 09:17:34 CEST 2006 - jsuchome(a)suse.cz - -- do not check user input in DoneProvide and DonePackage callbacks - (#160966) - -------------------------------------------------------------------- Old: ---- yast2-online-update-2.13.16.tar.bz2 New: ---- yast2-online-update-2.13.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.NAQMm8/_old 2006-03-29 17:59:50.000000000 +0200 +++ /var/tmp/diff_new_pack.NAQMm8/_new 2006-03-29 17:59:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.13.16) +# spec file for package yast2-online-update (Version 2.13.15) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-online-update -Version: 2.13.16 -Release: 1 +Version: 2.13.15 +Release: 2 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.13.16.tar.bz2 +Source0: yast2-online-update-2.13.15.tar.bz2 prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -45,7 +45,7 @@ gs(a)suse.de %prep -%setup -n yast2-online-update-2.13.16 +%setup -n yast2-online-update-2.13.15 %build %{prefix}/bin/y2tool y2autoconf @@ -114,14 +114,6 @@ %{prefix}/share/applications/YaST2/cd_update.desktop %changelog -n yast2-online-update -* Wed Mar 29 2006 - visnov(a)suse.cz -- fix patch message callback -- call PkgEstablish and preselect patches before - starting patch selector -- 2.13.16 -* Wed Mar 29 2006 - jsuchome(a)suse.cz -- do not check user input in DoneProvide and DonePackage callbacks - (#160966) * Tue Mar 28 2006 - locilka(a)suse.cz - Refreshing all sources (with autorefresh enabled) before the online is started (#154990). ++++++ yast2-online-update-2.13.16.tar.bz2 -> yast2-online-update-2.13.15.tar.bz2 ++++++ ++++ 11567 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/Makefile.am new/yast2-online-update-2.13.15/Makefile.am --- old/yast2-online-update-2.13.16/Makefile.am 2006-03-13 14:17:20.000000000 +0100 +++ new/yast2-online-update-2.13.15/Makefile.am 2006-03-28 10:08:15.000000000 +0200 @@ -154,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,6 +199,9 @@ false; \ fi +check-textdomain: + $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/VERSION new/yast2-online-update-2.13.15/VERSION --- old/yast2-online-update-2.13.16/VERSION 2006-03-29 17:21:25.000000000 +0200 +++ new/yast2-online-update-2.13.15/VERSION 2006-03-28 09:52:57.000000000 +0200 @@ -1 +1 @@ -2.13.16 +2.13.15 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/configure.in new/yast2-online-update-2.13.15/configure.in --- old/yast2-online-update-2.13.16/configure.in 2006-03-13 14:17:20.000000000 +0100 +++ new/yast2-online-update-2.13.15/configure.in 2006-03-28 10:08:14.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-online-update, 2.13.6, http://www.suse.de/feedback, yast2-online-update) +AC_INIT(yast2-online-update, 2.13.15, http://www.suse.de/feedback, yast2-online-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.6" +VERSION="2.13.15" RPMNAME="yast2-online-update" MAINTAINER="Michael Radziej <mir(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/src/OnlineUpdateCallbacks.ycp new/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp --- old/yast2-online-update-2.13.16/src/OnlineUpdateCallbacks.ycp 2006-03-29 17:21:01.000000000 +0200 +++ new/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp 2006-03-28 09:50:31.000000000 +0200 @@ -83,18 +83,23 @@ return ""; } - global void MessageCallback( string patchname, string patchsummary, string message ) - { - // handle all messages as post (OK only) - list<map> patches = [ - $[ - "name" : patchname, - "summary" : patchsummary, - "postinformation": message, - ] - ]; + global define string MessageCallback( string type, list<map> patches ) + ``{ +// y2internal( "MessageCallback %1", type ); + + if ( type == "preinfo" ) { + boolean install = OnlineUpdateDialogs::MessagePopup( patches, true ); + if ( install ) return ""; + else return "skip"; + } else if ( type == "postinfo" ) { + OnlineUpdateDialogs::MessagePopup( patches, false ); + return ""; + } else { + y2error( "Wrong message type: %1", type ); + return "error"; + } - OnlineUpdateDialogs::MessagePopup( patches, false ); + return ""; } global define void LogCallback( string text ) @@ -176,9 +181,8 @@ { FinishLine (); total_progress = total_progress + 1; - if ( UI::WidgetExists( `id( `progress ) ) ) { - UI::ChangeWidget( `id( `progress ), `Value, total_progress); - } + if (!ProgressCallback (total_progress)) + ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : ""; } return ret; } @@ -196,9 +200,8 @@ { FinishLine (); total_progress = total_progress + 1; - if ( UI::WidgetExists( `id( `progress ) ) ) { - UI::ChangeWidget( `id( `progress ), `Value, total_progress); - } + if (!ProgressCallback (total_progress)) + ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : ""; } return ret; } @@ -210,6 +213,10 @@ ``{ y2milestone ( "OnlineUpdateCallbacks constructor" ); + Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback"); + Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback"); + Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback"); + Pkg::CallbackStartProvide( "OnlineUpdateCallbacks::StartProvide" ); Pkg::CallbackProgressProvide( "OnlineUpdateCallbacks::PatchProgressCallback" ); Pkg::CallbackDoneProvide( "OnlineUpdateCallbacks::DoneProvide" ); @@ -218,11 +225,7 @@ Pkg::CallbackProgressPackage ("OnlineUpdateCallbacks::PatchProgressCallback"); Pkg::CallbackDonePackage( "OnlineUpdateCallbacks::DonePackage" ); - Pkg::CallbackResolvableReport ("OnlineUpdateCallbacks::MessageCallback"); - - Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback"); - Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback"); - Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback"); + Pkg::CallbackYouMessage ("OnlineUpdateCallbacks::MessageCallback"); Pkg::CallbackYouLog ("OnlineUpdateCallbacks::LogCallback"); Pkg::CallbackYouExecuteYcpScript ("OnlineUpdateCallbacks::ExecuteYcpScriptCallback"); Pkg::CallbackYouScriptProgress ("OnlineUpdateCallbacks::ScriptProgressCallback"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp --- old/yast2-online-update-2.13.16/src/OnlineUpdateDialogs.ycp 2006-03-29 09:05:04.000000000 +0200 +++ new/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp 2006-03-21 15:32:24.000000000 +0100 @@ -502,22 +502,19 @@ message = message + header; message = message + "<pre>" + info + "</pre>"; - + + details = details + header; + list<string> packages = patch[ "packages" ]:[]; - if( size( packages ) > 0 ) - { - details = details + header; + details = details + _("<b>Packages:</b>"); - details = details + _("<b>Packages:</b>"); + details = details + "<ul>"; - details = details + "<ul>"; + foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } ); - foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } ); + details = details + "</ul>"; - details = details + "</ul>"; - } - i = i + 1; } @@ -535,13 +532,13 @@ term buttons = nil; if ( pre ) { buttons = `HBox( - details == "" ? `Empty : detailsButton, + detailsButton, `PushButton( `id( `ok ), _("Install Patch") ), `PushButton( `id( `skip ), _("Skip Patch") ) ); } else { buttons = `HBox( - details == "" ? `Empty : detailsButton, + detailsButton, `PushButton( `id( `ok ), Label::OKButton() ) ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.16/src/online_update_select.ycp new/yast2-online-update-2.13.15/src/online_update_select.ycp --- old/yast2-online-update-2.13.16/src/online_update_select.ycp 2006-03-29 17:19:50.000000000 +0200 +++ new/yast2-online-update-2.13.15/src/online_update_select.ycp 2006-03-28 09:14:48.000000000 +0200 @@ -14,10 +14,6 @@ Pkg::SourceStartManager (true); Pkg::TargetInit ("/",false); - Pkg::PkgEstablish(); - - Pkg::ResolvablePreselectPatches(); - UI::OpenDialog(`opt(`defaultsize), `PackageSelector(`id(`selector), `opt(`youMode)) ); symbol ret = (symbol)UI::RunPkgSelection(`id(`selector) ); UI::CloseDialog(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-online-update
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2-online-update checked in at Wed Mar 29 17:39:13 CEST 2006. -------- --- yast2-online-update/yast2-online-update.changes 2006-03-28 09:54:28.000000000 +0200 +++ yast2-online-update/yast2-online-update.changes 2006-03-29 17:28:01.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Mar 29 17:19:51 CEST 2006 - visnov(a)suse.cz + +- fix patch message callback +- call PkgEstablish and preselect patches before + starting patch selector +- 2.13.16 + +------------------------------------------------------------------- +Wed Mar 29 09:17:34 CEST 2006 - jsuchome(a)suse.cz + +- do not check user input in DoneProvide and DonePackage callbacks + (#160966) + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.13.15.tar.bz2 New: ---- yast2-online-update-2.13.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.XzWWa6/_old 2006-03-29 17:38:54.000000000 +0200 +++ /var/tmp/diff_new_pack.XzWWa6/_new 2006-03-29 17:38:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.13.15) +# spec file for package yast2-online-update (Version 2.13.16) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-online-update -Version: 2.13.15 +Version: 2.13.16 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.13.15.tar.bz2 +Source0: yast2-online-update-2.13.16.tar.bz2 prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -45,7 +45,7 @@ gs(a)suse.de %prep -%setup -n yast2-online-update-2.13.15 +%setup -n yast2-online-update-2.13.16 %build %{prefix}/bin/y2tool y2autoconf @@ -114,6 +114,14 @@ %{prefix}/share/applications/YaST2/cd_update.desktop %changelog -n yast2-online-update +* Wed Mar 29 2006 - visnov(a)suse.cz +- fix patch message callback +- call PkgEstablish and preselect patches before + starting patch selector +- 2.13.16 +* Wed Mar 29 2006 - jsuchome(a)suse.cz +- do not check user input in DoneProvide and DonePackage callbacks + (#160966) * Tue Mar 28 2006 - locilka(a)suse.cz - Refreshing all sources (with autorefresh enabled) before the online is started (#154990). ++++++ yast2-online-update-2.13.15.tar.bz2 -> yast2-online-update-2.13.16.tar.bz2 ++++++ ++++ 17753 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/Makefile.am new/yast2-online-update-2.13.16/Makefile.am --- old/yast2-online-update-2.13.15/Makefile.am 2006-03-28 10:08:15.000000000 +0200 +++ new/yast2-online-update-2.13.16/Makefile.am 2006-03-13 14:17:20.000000000 +0100 @@ -154,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,9 +199,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/VERSION new/yast2-online-update-2.13.16/VERSION --- old/yast2-online-update-2.13.15/VERSION 2006-03-28 09:52:57.000000000 +0200 +++ new/yast2-online-update-2.13.16/VERSION 2006-03-29 17:21:25.000000000 +0200 @@ -1 +1 @@ -2.13.15 +2.13.16 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/configure.in new/yast2-online-update-2.13.16/configure.in --- old/yast2-online-update-2.13.15/configure.in 2006-03-28 10:08:14.000000000 +0200 +++ new/yast2-online-update-2.13.16/configure.in 2006-03-13 14:17:20.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-online-update, 2.13.15, http://www.suse.de/feedback, yast2-online-update) +AC_INIT(yast2-online-update, 2.13.6, http://www.suse.de/feedback, yast2-online-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.15" +VERSION="2.13.6" RPMNAME="yast2-online-update" MAINTAINER="Michael Radziej <mir(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp new/yast2-online-update-2.13.16/src/OnlineUpdateCallbacks.ycp --- old/yast2-online-update-2.13.15/src/OnlineUpdateCallbacks.ycp 2006-03-28 09:50:31.000000000 +0200 +++ new/yast2-online-update-2.13.16/src/OnlineUpdateCallbacks.ycp 2006-03-29 17:21:01.000000000 +0200 @@ -83,23 +83,18 @@ return ""; } - global define string MessageCallback( string type, list<map> patches ) - ``{ -// y2internal( "MessageCallback %1", type ); - - if ( type == "preinfo" ) { - boolean install = OnlineUpdateDialogs::MessagePopup( patches, true ); - if ( install ) return ""; - else return "skip"; - } else if ( type == "postinfo" ) { - OnlineUpdateDialogs::MessagePopup( patches, false ); - return ""; - } else { - y2error( "Wrong message type: %1", type ); - return "error"; - } + global void MessageCallback( string patchname, string patchsummary, string message ) + { + // handle all messages as post (OK only) + list<map> patches = [ + $[ + "name" : patchname, + "summary" : patchsummary, + "postinformation": message, + ] + ]; - return ""; + OnlineUpdateDialogs::MessagePopup( patches, false ); } global define void LogCallback( string text ) @@ -181,8 +176,9 @@ { FinishLine (); total_progress = total_progress + 1; - if (!ProgressCallback (total_progress)) - ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : ""; + if ( UI::WidgetExists( `id( `progress ) ) ) { + UI::ChangeWidget( `id( `progress ), `Value, total_progress); + } } return ret; } @@ -200,8 +196,9 @@ { FinishLine (); total_progress = total_progress + 1; - if (!ProgressCallback (total_progress)) - ret = (ErrorCallback ("abort", "", "") == "abort") ? "C" : ""; + if ( UI::WidgetExists( `id( `progress ) ) ) { + UI::ChangeWidget( `id( `progress ), `Value, total_progress); + } } return ret; } @@ -213,10 +210,6 @@ ``{ y2milestone ( "OnlineUpdateCallbacks constructor" ); - Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback"); - Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback"); - Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback"); - Pkg::CallbackStartProvide( "OnlineUpdateCallbacks::StartProvide" ); Pkg::CallbackProgressProvide( "OnlineUpdateCallbacks::PatchProgressCallback" ); Pkg::CallbackDoneProvide( "OnlineUpdateCallbacks::DoneProvide" ); @@ -225,7 +218,11 @@ Pkg::CallbackProgressPackage ("OnlineUpdateCallbacks::PatchProgressCallback"); Pkg::CallbackDonePackage( "OnlineUpdateCallbacks::DonePackage" ); - Pkg::CallbackYouMessage ("OnlineUpdateCallbacks::MessageCallback"); + Pkg::CallbackResolvableReport ("OnlineUpdateCallbacks::MessageCallback"); + + Pkg::CallbackYouProgress ("OnlineUpdateCallbacks::ProgressCallback"); + Pkg::CallbackYouPatchProgress ("OnlineUpdateCallbacks::PatchProgressCallback"); + Pkg::CallbackYouError ("OnlineUpdateCallbacks::ErrorCallback"); Pkg::CallbackYouLog ("OnlineUpdateCallbacks::LogCallback"); Pkg::CallbackYouExecuteYcpScript ("OnlineUpdateCallbacks::ExecuteYcpScriptCallback"); Pkg::CallbackYouScriptProgress ("OnlineUpdateCallbacks::ScriptProgressCallback"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp new/yast2-online-update-2.13.16/src/OnlineUpdateDialogs.ycp --- old/yast2-online-update-2.13.15/src/OnlineUpdateDialogs.ycp 2006-03-21 15:32:24.000000000 +0100 +++ new/yast2-online-update-2.13.16/src/OnlineUpdateDialogs.ycp 2006-03-29 09:05:04.000000000 +0200 @@ -502,19 +502,22 @@ message = message + header; message = message + "<pre>" + info + "</pre>"; - - details = details + header; - + list<string> packages = patch[ "packages" ]:[]; - details = details + _("<b>Packages:</b>"); + if( size( packages ) > 0 ) + { + details = details + header; - details = details + "<ul>"; + details = details + _("<b>Packages:</b>"); - foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } ); + details = details + "<ul>"; - details = details + "</ul>"; + foreach( string p, packages, ``{ details = details + "<li>" + p + "</li>"; } ); + details = details + "</ul>"; + } + i = i + 1; } @@ -532,13 +535,13 @@ term buttons = nil; if ( pre ) { buttons = `HBox( - detailsButton, + details == "" ? `Empty : detailsButton, `PushButton( `id( `ok ), _("Install Patch") ), `PushButton( `id( `skip ), _("Skip Patch") ) ); } else { buttons = `HBox( - detailsButton, + details == "" ? `Empty : detailsButton, `PushButton( `id( `ok ), Label::OKButton() ) ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-online-update-2.13.15/src/online_update_select.ycp new/yast2-online-update-2.13.16/src/online_update_select.ycp --- old/yast2-online-update-2.13.15/src/online_update_select.ycp 2006-03-28 09:14:48.000000000 +0200 +++ new/yast2-online-update-2.13.16/src/online_update_select.ycp 2006-03-29 17:19:50.000000000 +0200 @@ -14,6 +14,10 @@ Pkg::SourceStartManager (true); Pkg::TargetInit ("/",false); + Pkg::PkgEstablish(); + + Pkg::ResolvablePreselectPatches(); + UI::OpenDialog(`opt(`defaultsize), `PackageSelector(`id(`selector), `opt(`youMode)) ); symbol ret = (symbol)UI::RunPkgSelection(`id(`selector) ); UI::CloseDialog(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit suseRegister
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package suseRegister checked in at Wed Mar 29 17:36:43 CEST 2006. -------- --- suseRegister/suseRegister.changes 2006-03-29 15:25:41.000000000 +0200 +++ suseRegister/suseRegister.changes 2006-03-29 17:34:09.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 17:03:43 CEST 2006 - mc(a)suse.de + +- add hack to make rug products work + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.99dvEL/_old 2006-03-29 17:36:29.000000000 +0200 +++ /var/tmp/diff_new_pack.99dvEL/_new 2006-03-29 17:36:29.000000000 +0200 @@ -12,7 +12,7 @@ Name: suseRegister Version: 1.0 -Release: 34 +Release: 35 Summary: Registration tool Group: Productivity/Other License: GPL @@ -57,6 +57,8 @@ %changelog -n suseRegister * Wed Mar 29 2006 - mc(a)suse.de +- add hack to make rug products work +* Wed Mar 29 2006 - mc(a)suse.de - start zmd as soon as possible * Wed Mar 29 2006 - mc(a)suse.de - set accept=mandatory if auto-args are send back ++++++ suseRegister-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register --- old/suseRegister-1.0/suse_register 2006-03-29 16:07:11.000000000 +0200 +++ new/suseRegister-1.0/suse_register 2006-03-29 17:03:03.000000000 +0200 @@ -2067,6 +2067,17 @@ # call this as soon as possible. rugStart(); + +############################################ +### BEGIN ugly hack +############################################ + +my $msg = `$zmdInit restart 2>&1`; + +sleep 6; + +### END ugly hack + if (defined $logfile && $logfile ne "") { open($LOGDESCR, ">> $logfile") or do { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit suselinux-manual_cs
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package suselinux-manual_cs checked in at Wed Mar 29 16:59:54 CEST 2006. -------- --- suselinux-manual_cs/suselinux-manual_cs.changes 2006-03-28 14:03:04.000000000 +0200 +++ suselinux-manual_cs/suselinux-manual_cs.changes 2006-03-29 17:00:34.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 17:00:13 CEST 2006 - cihlarov(a)suse.cz + +- fixed typo + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suselinux-manual_cs.spec ++++++ --- /var/tmp/diff_new_pack.oPOWhg/_old 2006-03-29 16:59:40.000000000 +0200 +++ /var/tmp/diff_new_pack.oPOWhg/_new 2006-03-29 16:59:40.000000000 +0200 @@ -16,7 +16,7 @@ %define verbose_name SuSE-Linux-Userguide %define my_supported_archs x86_64 %ix86 ia64 Version: 10.1 -Release: 8 +Release: 9 Source0: SLPROF-html_%{my_lang}-html.tar.bz2 # Source2: %{name}-%{version}.pdf # Source3: %{name}.desktop.in @@ -186,6 +186,8 @@ %dir %{_datadir}/susehelp %changelog -n suselinux-manual_cs +* Wed Mar 29 2006 - cihlarov(a)suse.cz +- fixed typo * Tue Mar 28 2006 - cihlarov(a)suse.cz - Added chapters about reg. & add-ons; fixes * Tue Mar 14 2006 - cihlarov(a)suse.cz ++++++ SLPROF-application_cs.tar.bz2 ++++++ ++++++ SLPROF-html_cs-desktop.tar.bz2 ++++++ ++++++ SLPROF-html_cs-html.tar.bz2 ++++++ suselinux-manual_cs/SLPROF-html_cs-html.tar.bz2 suselinux-manual_cs/SLPROF-html_cs-html.tar.bz2 differ: char 9528777, line 36517 ++++++ SLPROF-online_cs.tar.bz2 ++++++ ++++++ SLPROF-print_cs.tar.bz2 ++++++ ++++++ book.slprof.appl-online_cs.pdf ++++++ (binary differes) ++++++ book.slprof.online-online_cs.pdf ++++++ (binary differes) ++++++ book.slprof.print-online_cs.pdf ++++++ (binary differes) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-installation
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2-installation checked in at Wed Mar 29 16:59:27 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-03-28 21:48:53.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2006-03-29 16:46:06.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Mar 29 16:43:02 CEST 2006 - locilka(a)suse.cz + +- Fixed adding SLP-based Add-On product (#161270) +- SLP-based Add-On product handling moved to separate function +- Add-On MediaSelect dialog creation moved to separate function +- Changed icon for License +- 2.13.52 + +------------------------------------------------------------------- +Tue Mar 29 16:06:23 CEST 2006 - jdsn(a)suse.de + +- late feature "force registration" for suse_register (aj, shorn) + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.51.tar.bz2 New: ---- yast2-installation-2.13.52.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.kceeor/_old 2006-03-29 16:58:03.000000000 +0200 +++ /var/tmp/diff_new_pack.kceeor/_new 2006-03-29 16:58:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.51) +# spec file for package yast2-installation (Version 2.13.52) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.13.51 +Version: 2.13.52 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.51.tar.bz2 +Source0: yast2-installation-2.13.52.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +48,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-installation-2.13.51 +%setup -n yast2-installation-2.13.52 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,14 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Wed Mar 29 2006 - locilka(a)suse.cz +- Fixed adding SLP-based Add-On product (#161270) +- SLP-based Add-On product handling moved to separate function +- Add-On MediaSelect dialog creation moved to separate function +- Changed icon for License +- 2.13.52 +* Wed Mar 29 2006 - jdsn(a)suse.de +- late feature "force registration" for suse_register (aj, shorn) * Tue Mar 28 2006 - jdsn(a)suse.de - added 'rm -f /var/lib/zypp/zmd_updated_the_sources' flag file to be deleted if suse_register runs during installation ++++++ yast2-installation-2.13.51.tar.bz2 -> yast2-installation-2.13.52.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/VERSION new/yast2-installation-2.13.52/VERSION --- old/yast2-installation-2.13.51/VERSION 2006-03-28 21:30:21.000000000 +0200 +++ new/yast2-installation-2.13.52/VERSION 2006-03-29 16:46:14.000000000 +0200 @@ -1 +1 @@ -2.13.51 +2.13.52 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/configure new/yast2-installation-2.13.52/configure --- old/yast2-installation-2.13.51/configure 2006-03-28 21:43:26.000000000 +0200 +++ new/yast2-installation-2.13.52/configure 2006-03-29 16:48:20.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.51. +# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.52. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-installation' PACKAGE_TARNAME='yast2-installation' -PACKAGE_VERSION='2.13.51' -PACKAGE_STRING='yast2-installation 2.13.51' +PACKAGE_VERSION='2.13.52' +PACKAGE_STRING='yast2-installation 2.13.52' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,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-installation 2.13.51 to adapt to many kinds of systems. +\`configure' configures yast2-installation 2.13.52 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-installation 2.13.51:";; + short | recursive ) echo "Configuration of yast2-installation 2.13.52:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-installation configure 2.13.51 +yast2-installation configure 2.13.52 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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-installation $as_me 2.13.51, which was +It was created by yast2-installation $as_me 2.13.52, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-installation' - VERSION='2.13.51' + VERSION='2.13.52' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.51" +VERSION="2.13.52" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2906,7 +2906,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-installation $as_me 2.13.51, which was +This file was extended by yast2-installation $as_me 2.13.52, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2961,7 +2961,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-installation config.status 2.13.51 +yast2-installation config.status 2.13.52 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/configure.in new/yast2-installation-2.13.52/configure.in --- old/yast2-installation-2.13.51/configure.in 2006-03-28 21:43:18.000000000 +0200 +++ new/yast2-installation-2.13.52/configure.in 2006-03-29 16:48:15.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.51, http://www.suse.de/feedback, yast2-installation) +AC_INIT(yast2-installation, 2.13.52, http://www.suse.de/feedback, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.51" +VERSION="2.13.52" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/control/control.xml new/yast2-installation-2.13.52/control/control.xml --- old/yast2-installation-2.13.51/control/control.xml 2006-03-27 16:40:15.000000000 +0200 +++ new/yast2-installation-2.13.52/control/control.xml 2006-03-29 16:14:50.000000000 +0200 @@ -23,6 +23,7 @@ <register> <enable_register_hwdata config:type="boolean">true</enable_register_hwdata> <enable_register_optional config:type="boolean">true</enable_register_optional> + <display_register_forcereg config:type="boolean">false</display_register_forcereg> </register> <software> <delete_old_packages config:type="boolean">true</delete_old_packages> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/control.pot new/yast2-installation-2.13.52/control.pot --- old/yast2-installation-2.13.51/control.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.13.52/control.pot 2006-03-16 11:19:51.000000000 +0100 @@ -0,0 +1,334 @@ +# 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: 2006-03-16 11:19+0100\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" + +#: control/control.PROF.glade:59 control/control.PROF.glade:115 +#: control/control.PROF.glade:404 control/control.PROF.glade:444 +#: control/control.SLD.glade:60 control/control.SLD.glade:116 +#: control/control.SLD.glade:405 control/control.SLD.glade:445 +#: control/control.SLES.glade:60 control/control.SLES.glade:103 +#: control/control.SLES.glade:157 control/control.SLES.glade:175 +#: control/control.SLES.glade:510 control/control.SLES.glade:550 +#: control/control.glade:59 control/control.glade:115 +#: control/control.glade:404 control/control.glade:444 +msgid "Installation Settings" +msgstr "" + +#: control/control.PROF.glade:77 control/control.SLD.glade:78 +#: control/control.SLES.glade:78 control/control.SLES.glade:120 +#: control/control.glade:77 +msgid "Overview" +msgstr "" + +#: control/control.PROF.glade:85 control/control.SLD.glade:86 +#: control/control.SLES.glade:86 control/control.SLES.glade:128 +#: control/control.glade:85 +msgid "Expert" +msgstr "" + +#: control/control.PROF.glade:101 control/control.SLD.glade:102 +#: control/control.SLES.glade:143 control/control.glade:101 +msgid "Update Settings" +msgstr "" + +#: control/control.PROF.glade:132 control/control.SLD.glade:133 +#: control/control.SLES.glade:190 control/control.SLES.glade:231 +#: control/control.glade:132 +msgid "Network Configuration" +msgstr "" + +#: control/control.PROF.glade:172 control/control.PROF.glade:620 +#: control/control.PROF.glade:625 control/control.PROF.glade:629 +#: control/control.SLD.glade:173 control/control.SLD.glade:621 +#: control/control.SLD.glade:626 control/control.SLD.glade:630 +#: control/control.SLES.glade:264 control/control.SLES.glade:275 +#: control/control.SLES.glade:284 control/control.SLES.glade:737 +#: control/control.SLES.glade:742 control/control.SLES.glade:746 +#: control/control.glade:172 control/control.glade:620 +#: control/control.glade:625 control/control.glade:629 +msgid "Hardware Configuration" +msgstr "" + +#: control/control.PROF.glade:191 control/control.PROF.glade:287 +#: control/control.PROF.glade:375 control/control.SLD.glade:192 +#: control/control.SLD.glade:288 control/control.SLD.glade:376 +#: control/control.SLES.glade:303 control/control.SLES.glade:393 +#: control/control.SLES.glade:481 control/control.glade:191 +#: control/control.glade:287 control/control.glade:375 +msgid "Preparation" +msgstr "" + +#: control/control.PROF.glade:197 control/control.PROF.glade:206 +#: control/control.PROF.glade:293 control/control.PROF.glade:302 +#: control/control.PROF.glade:399 control/control.PROF.glade:439 +#: control/control.SLD.glade:198 control/control.SLD.glade:207 +#: control/control.SLD.glade:294 control/control.SLD.glade:303 +#: control/control.SLD.glade:400 control/control.SLD.glade:440 +#: control/control.SLES.glade:309 control/control.SLES.glade:318 +#: control/control.SLES.glade:399 control/control.SLES.glade:408 +#: control/control.SLES.glade:505 control/control.SLES.glade:545 +#: control/control.glade:197 control/control.glade:206 +#: control/control.glade:293 control/control.glade:302 +#: control/control.glade:399 control/control.glade:439 +msgid "Language" +msgstr "" + +#: control/control.PROF.glade:212 control/control.PROF.glade:308 +#: control/control.SLD.glade:213 control/control.SLD.glade:309 +#: control/control.SLES.glade:324 control/control.SLES.glade:414 +#: control/control.glade:212 control/control.glade:308 +msgid "License Agreement" +msgstr "" + +#: control/control.PROF.glade:218 control/control.PROF.glade:314 +#: control/control.SLD.glade:219 control/control.SLD.glade:315 +#: control/control.SLES.glade:330 control/control.SLES.glade:420 +#: control/control.glade:218 control/control.glade:314 +msgid "Disk Activation" +msgstr "" + +#: control/control.PROF.glade:224 control/control.PROF.glade:320 +#: control/control.SLD.glade:225 control/control.SLD.glade:321 +#: control/control.SLES.glade:336 control/control.SLES.glade:426 +#: control/control.glade:224 control/control.glade:320 +msgid "System Analysis" +msgstr "" + +#: control/control.PROF.glade:230 control/control.PROF.glade:332 +#: control/control.SLD.glade:231 control/control.SLD.glade:333 +#: control/control.SLES.glade:342 control/control.SLES.glade:438 +#: control/control.glade:230 control/control.glade:332 +msgid "Add-On Products" +msgstr "" + +#: control/control.PROF.glade:236 control/control.SLD.glade:237 +#: control/control.SLES.glade:348 control/control.glade:236 +msgid "Time Zone" +msgstr "" + +#: control/control.PROF.glade:245 control/control.SLD.glade:246 +#: control/control.glade:245 +msgid "Desktop Selection" +msgstr "" + +#: control/control.PROF.glade:252 control/control.SLD.glade:253 +#: control/control.SLES.glade:358 control/control.glade:252 +msgid "Installation" +msgstr "" + +#: control/control.PROF.glade:255 control/control.SLD.glade:256 +#: control/control.SLES.glade:361 control/control.glade:255 +msgid "Installation Summary" +msgstr "" + +#: control/control.PROF.glade:260 control/control.PROF.glade:266 +#: control/control.PROF.glade:270 control/control.PROF.glade:274 +#: control/control.PROF.glade:278 control/control.PROF.glade:409 +#: control/control.PROF.glade:415 control/control.PROF.glade:419 +#: control/control.PROF.glade:423 control/control.PROF.glade:449 +#: control/control.PROF.glade:455 control/control.PROF.glade:459 +#: control/control.PROF.glade:463 control/control.PROF.glade:550 +#: control/control.PROF.glade:554 control/control.PROF.glade:558 +#: control/control.PROF.glade:662 control/control.PROF.glade:666 +#: control/control.PROF.glade:670 control/control.PROF.glade:674 +#: control/control.PROF.glade:678 control/control.PROF.glade:693 +#: control/control.PROF.glade:697 control/control.PROF.glade:701 +#: control/control.PROF.glade:705 control/control.SLD.glade:261 +#: control/control.SLD.glade:267 control/control.SLD.glade:271 +#: control/control.SLD.glade:275 control/control.SLD.glade:279 +#: control/control.SLD.glade:410 control/control.SLD.glade:416 +#: control/control.SLD.glade:420 control/control.SLD.glade:424 +#: control/control.SLD.glade:450 control/control.SLD.glade:456 +#: control/control.SLD.glade:460 control/control.SLD.glade:464 +#: control/control.SLD.glade:551 control/control.SLD.glade:555 +#: control/control.SLD.glade:559 control/control.SLD.glade:663 +#: control/control.SLD.glade:667 control/control.SLD.glade:671 +#: control/control.SLD.glade:675 control/control.SLD.glade:679 +#: control/control.SLD.glade:694 control/control.SLD.glade:698 +#: control/control.SLD.glade:702 control/control.SLD.glade:706 +#: control/control.SLES.glade:366 control/control.SLES.glade:372 +#: control/control.SLES.glade:376 control/control.SLES.glade:380 +#: control/control.SLES.glade:384 control/control.SLES.glade:515 +#: control/control.SLES.glade:521 control/control.SLES.glade:525 +#: control/control.SLES.glade:529 control/control.SLES.glade:555 +#: control/control.SLES.glade:561 control/control.SLES.glade:565 +#: control/control.SLES.glade:569 control/control.SLES.glade:650 +#: control/control.SLES.glade:654 control/control.SLES.glade:658 +#: control/control.SLES.glade:779 control/control.SLES.glade:783 +#: control/control.SLES.glade:787 control/control.SLES.glade:791 +#: control/control.SLES.glade:795 control/control.SLES.glade:810 +#: control/control.SLES.glade:814 control/control.SLES.glade:818 +#: control/control.SLES.glade:822 control/control.glade:260 +#: control/control.glade:266 control/control.glade:270 +#: control/control.glade:274 control/control.glade:278 +#: control/control.glade:409 control/control.glade:415 +#: control/control.glade:419 control/control.glade:423 +#: control/control.glade:449 control/control.glade:455 +#: control/control.glade:459 control/control.glade:463 +#: control/control.glade:550 control/control.glade:554 +#: control/control.glade:558 control/control.glade:662 +#: control/control.glade:666 control/control.glade:670 +#: control/control.glade:674 control/control.glade:678 +#: control/control.glade:693 control/control.glade:697 +#: control/control.glade:701 control/control.glade:705 +msgid "Perform Installation" +msgstr "" + +#: control/control.PROF.glade:326 control/control.SLD.glade:327 +#: control/control.SLES.glade:432 control/control.glade:326 +msgid "System for Update" +msgstr "" + +#: control/control.PROF.glade:339 control/control.SLD.glade:340 +#: control/control.SLES.glade:445 control/control.glade:339 +msgid "Update" +msgstr "" + +#: control/control.PROF.glade:342 control/control.SLD.glade:343 +#: control/control.SLES.glade:448 control/control.glade:342 +msgid "Update Summary" +msgstr "" + +#: control/control.PROF.glade:347 control/control.PROF.glade:353 +#: control/control.PROF.glade:357 control/control.PROF.glade:361 +#: control/control.PROF.glade:365 control/control.PROF.glade:478 +#: control/control.PROF.glade:482 control/control.SLD.glade:348 +#: control/control.SLD.glade:354 control/control.SLD.glade:358 +#: control/control.SLD.glade:362 control/control.SLD.glade:366 +#: control/control.SLD.glade:479 control/control.SLD.glade:483 +#: control/control.SLES.glade:453 control/control.SLES.glade:459 +#: control/control.SLES.glade:463 control/control.SLES.glade:467 +#: control/control.SLES.glade:471 control/control.SLES.glade:584 +#: control/control.SLES.glade:588 control/control.glade:347 +#: control/control.glade:353 control/control.glade:357 +#: control/control.glade:361 control/control.glade:365 +#: control/control.glade:478 control/control.glade:482 +msgid "Perform Update" +msgstr "" + +#: control/control.PROF.glade:379 control/control.SLD.glade:380 +#: control/control.SLES.glade:485 control/control.glade:379 +msgid "System Information" +msgstr "" + +#: control/control.PROF.glade:383 control/control.SLD.glade:384 +#: control/control.SLES.glade:489 control/control.glade:383 +msgid "Perform Repair" +msgstr "" + +#: control/control.PROF.glade:393 control/control.PROF.glade:433 +#: control/control.PROF.glade:636 control/control.SLD.glade:394 +#: control/control.SLD.glade:434 control/control.SLD.glade:637 +#: control/control.SLES.glade:499 control/control.SLES.glade:539 +#: control/control.SLES.glade:753 control/control.glade:393 +#: control/control.glade:433 control/control.glade:636 +msgid "Base Installation" +msgstr "" + +#: control/control.PROF.glade:487 control/control.PROF.glade:565 +#: control/control.PROF.glade:710 control/control.SLD.glade:488 +#: control/control.SLD.glade:566 control/control.SLD.glade:711 +#: control/control.SLES.glade:593 control/control.SLES.glade:665 +#: control/control.SLES.glade:827 control/control.glade:487 +#: control/control.glade:565 control/control.glade:710 +msgid "Configuration" +msgstr "" + +#: control/control.PROF.glade:490 control/control.PROF.glade:496 +#: control/control.PROF.glade:577 control/control.PROF.glade:582 +#: control/control.PROF.glade:586 control/control.PROF.glade:590 +#: control/control.SLD.glade:491 control/control.SLD.glade:497 +#: control/control.SLD.glade:578 control/control.SLD.glade:583 +#: control/control.SLD.glade:587 control/control.SLD.glade:591 +#: control/control.SLES.glade:596 control/control.SLES.glade:602 +#: control/control.SLES.glade:677 control/control.SLES.glade:682 +#: control/control.SLES.glade:686 control/control.SLES.glade:690 +#: control/control.glade:490 control/control.glade:496 +#: control/control.glade:577 control/control.glade:582 +#: control/control.glade:586 control/control.glade:590 +msgid "Network" +msgstr "" + +#: control/control.PROF.glade:502 control/control.SLD.glade:503 +#: control/control.SLES.glade:694 control/control.glade:502 +msgid "Update Configuration" +msgstr "" + +#: control/control.PROF.glade:508 control/control.PROF.glade:514 +#: control/control.PROF.glade:520 control/control.PROF.glade:594 +#: control/control.PROF.glade:598 control/control.SLD.glade:509 +#: control/control.SLD.glade:515 control/control.SLD.glade:521 +#: control/control.SLD.glade:595 control/control.SLD.glade:599 +#: control/control.SLES.glade:608 control/control.SLES.glade:614 +#: control/control.SLES.glade:620 control/control.SLES.glade:700 +#: control/control.SLES.glade:706 control/control.SLES.glade:710 +#: control/control.glade:508 control/control.glade:514 +#: control/control.glade:520 control/control.glade:594 +#: control/control.glade:598 +msgid "Online Update" +msgstr "" + +#: control/control.PROF.glade:524 control/control.PROF.glade:610 +#: control/control.PROF.glade:717 control/control.SLD.glade:525 +#: control/control.SLD.glade:611 control/control.SLD.glade:718 +#: control/control.SLES.glade:624 control/control.SLES.glade:727 +#: control/control.SLES.glade:834 control/control.glade:524 +#: control/control.glade:610 control/control.glade:717 +msgid "Clean Up" +msgstr "" + +#: control/control.PROF.glade:528 control/control.PROF.glade:616 +#: control/control.SLD.glade:529 control/control.SLD.glade:617 +#: control/control.SLES.glade:628 control/control.SLES.glade:733 +#: control/control.glade:528 control/control.glade:616 +msgid "Release Notes" +msgstr "" + +#: control/control.PROF.glade:568 control/control.SLD.glade:569 +#: control/control.SLES.glade:668 control/control.glade:568 +msgid "Hostname" +msgstr "" + +#: control/control.PROF.glade:573 control/control.SLD.glade:574 +#: control/control.SLES.glade:673 control/control.glade:573 +msgid "Root Password" +msgstr "" + +#: control/control.PROF.glade:602 control/control.PROF.glade:606 +#: control/control.SLD.glade:603 control/control.SLD.glade:607 +#: control/control.SLES.glade:719 control/control.SLES.glade:723 +#: control/control.glade:602 control/control.glade:606 +msgid "Users" +msgstr "" + +#: control/control.PROF.glade:645 control/control.PROF.glade:651 +#: control/control.PROF.glade:655 control/control.SLD.glade:646 +#: control/control.SLD.glade:652 control/control.SLD.glade:656 +#: control/control.SLES.glade:762 control/control.SLES.glade:768 +#: control/control.SLES.glade:772 control/control.glade:645 +#: control/control.glade:651 control/control.glade:655 +msgid "AutoYaST Settings" +msgstr "" + +#: control/control.PROF.glade:713 control/control.SLD.glade:714 +#: control/control.SLES.glade:830 control/control.glade:713 +msgid "System Configuration" +msgstr "" + +#: control/control.SLES.glade:714 +msgid "Service" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/installation.pot new/yast2-installation-2.13.52/installation.pot --- old/yast2-installation-2.13.51/installation.pot 2006-03-28 20:57:05.000000000 +0200 +++ new/yast2-installation-2.13.52/installation.pot 2006-03-27 16:14:57.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 20:57+0200\n" +"POT-Creation-Date: 2006-03-27 16:14+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" @@ -721,110 +721,103 @@ msgstr "" #. strings for main (wizard) layout -#. Transltors: This is title/brand - only translate the Configuration -#: src/clients/inst_suse_register.ycp:51 +#: src/clients/inst_suse_register.ycp:49 msgid "Novell Customer Center Configuration" msgstr "" -#: src/clients/inst_suse_register.ycp:52 +#: src/clients/inst_suse_register.ycp:50 msgid "Update Configuration" msgstr "" -#: src/clients/inst_suse_register.ycp:58 +#: src/clients/inst_suse_register.ycp:55 msgid "" "Get technical support and product updates and\n" "manage subscriptions with Novell Customer Center." msgstr "" -#: src/clients/inst_suse_register.ycp:64 +#: src/clients/inst_suse_register.ycp:61 msgid "Configure Now (Recommended)" msgstr "" -#: src/clients/inst_suse_register.ycp:65 +#: src/clients/inst_suse_register.ycp:62 msgid "Configure Later" msgstr "" -#: src/clients/inst_suse_register.ycp:67 +#: src/clients/inst_suse_register.ycp:64 msgid "Include for Convenience" msgstr "" -#. Translators: Text for UI Label - capitalized -#: src/clients/inst_suse_register.ycp:68 -#: src/clients/suse_register_auto.ycp:198 +#: src/clients/inst_suse_register.ycp:65 msgid "Hardware Profile" msgstr "" -#. Translators: Text for UI Label - capitalized -#: src/clients/inst_suse_register.ycp:69 -#: src/clients/suse_register_auto.ycp:200 +#: src/clients/inst_suse_register.ycp:66 msgid "Optional Information" msgstr "" -#: src/clients/inst_suse_register.ycp:70 -#: src/clients/inst_suse_register.ycp:151 +#: src/clients/inst_suse_register.ycp:67 +#: src/clients/inst_suse_register.ycp:145 msgid "Details..." msgstr "" #. strings for success popup -#: src/clients/inst_suse_register.ycp:74 +#: src/clients/inst_suse_register.ycp:71 msgid "Your configuration was successful." msgstr "" #. strings for manual interaction popup -#: src/clients/inst_suse_register.ycp:78 +#: src/clients/inst_suse_register.ycp:75 msgid "Manual Interaction Required" msgstr "" -#: src/clients/inst_suse_register.ycp:79 +#: src/clients/inst_suse_register.ycp:76 msgid "Needed Information" msgstr "" -#: src/clients/inst_suse_register.ycp:80 +#: src/clients/inst_suse_register.ycp:77 msgid "Continue" msgstr "" -#: src/clients/inst_suse_register.ycp:82 +#: src/clients/inst_suse_register.ycp:79 msgid "" "A Web browser will start in which to complete\n" "the configuration on the opened Web site." msgstr "" #. string for show information popup -#: src/clients/inst_suse_register.ycp:88 +#: src/clients/inst_suse_register.ycp:85 msgid "Registration and Privacy Information" msgstr "" -#: src/clients/inst_suse_register.ycp:92 +#: src/clients/inst_suse_register.ycp:89 msgid "" "The server requires additional system information. Activating \n" "submission of the hardware profile automatically." msgstr "" #. nonroot-message strings -#: src/clients/inst_suse_register.ycp:97 +#: src/clients/inst_suse_register.ycp:94 msgid "Update Source Issues" msgstr "" -#: src/clients/inst_suse_register.ycp:99 +#: src/clients/inst_suse_register.ycp:96 msgid "" "Registering as a regular user does not include the update source\n" -"in the Online Update YaST module. If you continue and later want \n" -"to update with Online Update, the source must be added manually.\n" -"Other tools, such as Software Updater in the panel, can still be \n" -"used. Alternatively, cancel then register through YaST as root \n" -"so the sources are available to all tools." +"in YaST Online Update (YOU). To include the source automatically,\n" +"register as root.\n" +"Otherwise use other update tools or add the source to YOU manually." msgstr "" #. error messages -#: src/clients/inst_suse_register.ycp:110 +#: src/clients/inst_suse_register.ycp:104 msgid "Error: Recieved data is invalid." msgstr "" -#: src/clients/inst_suse_register.ycp:111 +#: src/clients/inst_suse_register.ycp:105 msgid "Error: Could not retrieve data." msgstr "" -#: src/clients/inst_suse_register.ycp:117 +#: src/clients/inst_suse_register.ycp:111 msgid "" "<p>\n" "Configure your system to enable online updates by registering it with Novell.\n" @@ -833,7 +826,7 @@ "</p>" msgstr "" -#: src/clients/inst_suse_register.ycp:125 +#: src/clients/inst_suse_register.ycp:119 msgid "" "<p>\n" "To simplify the registration process, include information from your system\n" @@ -845,7 +838,7 @@ "</p>" msgstr "" -#: src/clients/inst_suse_register.ycp:136 +#: src/clients/inst_suse_register.ycp:130 msgid "" "<p>\n" "No information is passed to anyone outside Novell. The data is used for\n" @@ -856,23 +849,23 @@ msgstr "" #. further strings -#: src/clients/inst_suse_register.ycp:148 +#: src/clients/inst_suse_register.ycp:142 msgid "Checking..." msgstr "" -#: src/clients/inst_suse_register.ycp:149 +#: src/clients/inst_suse_register.ycp:143 msgid "Error" msgstr "" -#: src/clients/inst_suse_register.ycp:150 +#: src/clients/inst_suse_register.ycp:144 msgid "An error occurred while connecting to the server." msgstr "" -#: src/clients/inst_suse_register.ycp:152 +#: src/clients/inst_suse_register.ycp:146 msgid "Error Message" msgstr "" -#: src/clients/inst_suse_register.ycp:153 +#: src/clients/inst_suse_register.ycp:147 msgid "Starting Browser..." msgstr "" @@ -1184,106 +1177,6 @@ msgid "Copying SSH settings to installed system..." msgstr "" -#. Translators: Heading - capitalized -#: src/clients/suse_register_auto.ycp:64 -#: src/clients/suse_register_auto.ycp:176 -msgid "Product Registration" -msgstr "" - -#. Translators: Text in a sentece-like environment - normal capitalization -#: src/clients/suse_register_auto.ycp:66 -msgid "Run during autoinstallation" -msgstr "" - -#: src/clients/suse_register_auto.ycp:66 -msgid "Do not run during autoinstallation" -msgstr "" - -#. Translators: Sentence-like text for singular and plural (incl. zero) of items -#: src/clients/suse_register_auto.ycp:70 -msgid "1 item of registration data" -msgstr "" - -#: src/clients/suse_register_auto.ycp:70 -#, ycp-format -msgid "%1 items of registration data" -msgstr "" - -#: src/clients/suse_register_auto.ycp:74 -msgid "Included Information" -msgstr "" - -#. Translators: Text in a sentece-like environment - normal capitalization -#: src/clients/suse_register_auto.ycp:77 -msgid "Hardware profile" -msgstr "" - -#. Translators: Text in a sentece-like environment - normal capitalization -#: src/clients/suse_register_auto.ycp:79 -msgid "Optional information" -msgstr "" - -#. TextEntry label -#: src/clients/suse_register_auto.ycp:128 -msgid "&Key" -msgstr "" - -#. TextEntry label -#: src/clients/suse_register_auto.ycp:130 -msgid "&Value" -msgstr "" - -#: src/clients/suse_register_auto.ycp:157 -msgid "Key is invalid." -msgstr "" - -#: src/clients/suse_register_auto.ycp:179 -msgid "<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>" -msgstr "" - -#: src/clients/suse_register_auto.ycp:182 -msgid "<p>Get more information about the registration process with <tt>suse_register -h</tt>.</p>" -msgstr "" - -#: src/clients/suse_register_auto.ycp:185 -msgid "<p>Other information used for registration is shown in <b>Registration Data</b>. Add a new key and value pair by pressing <b>Add</b> then entering the appropriate values. These parameters are those that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>" -msgstr "" - -#. Translators: Text for UI Label - capitalized -#: src/clients/suse_register_auto.ycp:193 -msgid "Run Product Registration" -msgstr "" - -#. Translators: Text for UI Label - capitalized -#: src/clients/suse_register_auto.ycp:196 -msgid "Include in Registration" -msgstr "" - -#. Translators: Text for UI Label - capitalized -#: src/clients/suse_register_auto.ycp:205 -msgid "Registration Data to Use" -msgstr "" - -#: src/clients/suse_register_auto.ycp:206 -msgid "Key" -msgstr "" - -#: src/clients/suse_register_auto.ycp:206 -msgid "Value" -msgstr "" - -#: src/clients/suse_register_auto.ycp:208 -msgid "Ad&d" -msgstr "" - -#: src/clients/suse_register_auto.ycp:209 -msgid "&Edit" -msgstr "" - -#: src/clients/suse_register_auto.ycp:210 -msgid "De&lete" -msgstr "" - #. progress step title #: src/clients/switch_scr_finish.ycp:42 msgid "Moving to installed system..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.52/src/clients/inst_suse_register.ycp --- old/yast2-installation-2.13.51/src/clients/inst_suse_register.ycp 2006-03-28 20:19:33.000000000 +0200 +++ new/yast2-installation-2.13.52/src/clients/inst_suse_register.ycp 2006-03-29 16:14:50.000000000 +0200 @@ -40,6 +40,9 @@ } } + // Register::initialize() is mandatory - never remove it + Register::initialize(); + map ui = UI::GetDisplayInfo(); boolean textmode = (boolean) ui["TextMode"]:nil; @@ -67,6 +70,7 @@ string nccc_sub_comment = _("Include for Convenience"); string nccc_sub_hwinfo = _("Hardware Profile"); string nccc_sub_optional= _("Optional Information"); + string nccc_forcereg= _("Registration Code"); string nccc_sub_showbtn = _("Details..."); @@ -134,13 +138,22 @@ string help_para3 = _( "<p> +If you purchased your copy of this product, enable <b>Registration Code</b> +so you are prompted for your product code. +This registers you for the installation support included with your product. +</p>" +); + +string help_para4 = _( +"<p> No information is passed to anyone outside Novell. The data is used for statistical purposes and to enhance your convenience regarding driver support and your Web account. Find a detailed privacy policy in <b>Details</b>. View the transmitted information in the log file <tt>~/.suse_register.log</tt>. </p>" ); -string help = help_title + help_para1 + help_para2 + help_para3; + +string help = help_title + help_para1 + help_para2 + (Register::display_forcereg ? help_para3:"") + help_para4; @@ -160,11 +173,6 @@ // default is true, see statement in layout term boolean configure_status = true; - - // Register::initialize() is mandatory - never remove it - Register::initialize(); - - /* vv MAIN (WIZARD) LAYOUT vv */ term sr_layout=nil; sr_layout=`HVCenter( `VBox( @@ -180,6 +188,7 @@ `Left( `Label( nccc_sub_comment ) ), `Left( `CheckBox(`id(`hwinfo), `opt(`notify), nccc_sub_hwinfo, Register::submit_hwdata ) ), `Left( `CheckBox(`id(`optional), `opt(`notify), nccc_sub_optional, Register::submit_optional ) ), + Register::display_forcereg ? `Left( `CheckBox(`id(`forcereg), `opt(`notify), nccc_forcereg, false ) ):`Empty() , `VSpacing(0.5), `Right( `PushButton(`id(`showinfo), nccc_sub_showbtn ) ) ) ) ) , @@ -477,10 +486,11 @@ { configure_status = (boolean) UI::QueryWidget(`id(`configure), `Value); } - else if (ret == `hwinfo || ret == `optional) + else if (ret == `hwinfo || ret == `optional || ret == `forcereg) { Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`hwinfo), `Value); Register::submit_optional= (boolean) UI::QueryWidget(`id(`optional), `Value); + Register::force_registration = (boolean) UI::QueryWidget(`id(`forcereg), `Value); } else if (ret == `showinfo) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/clients/stroj-casu.ycp new/yast2-installation-2.13.52/src/clients/stroj-casu.ycp --- old/yast2-installation-2.13.51/src/clients/stroj-casu.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.13.52/src/clients/stroj-casu.ycp 2006-03-29 14:20:10.000000000 +0200 @@ -0,0 +1,57 @@ +/** + * Stroj času. + * Enable very easy bug fixes of anything, given the proper hardware + * $Id: stroj-casu.ycp 29498 2006-03-29 09:51:05Z mvidner $ + */ +{ + // text domain! + + // Achtung! Zu showcasen des N*E*U*S Features dess YCP Interpretersss, + // wir benutzen deutsche Klavier Worte. + // (J.W.G., sorry...) + + Einfuhrgenehmigung "Popup"; + Einfuhrgenehmigung "Wizard"; + Einfuhrgenehmigung "WizardHW"; + + // translations: + // not to cause unnecessary confusion now, + // the texts are marked with a dummy marker + string Tr (string s) { + Wiederkehr s; + } + + Wizard::CreateDialog (); + string caption = Tr("Time Machine Configuration"); + string help = Tr("<p>When I was younger,<br> +so much younger than today,<br>...</p>"); + Verzeichnis<string> headings = [ + Tr("Time Machine"), + Tr("Temporal Range"), // + Tr("Spatial Range"), // + Tr("Temporal Accuracy"), // + Tr("Spatial Accuracy"), // + ]; + Verzeichnis<Verzeichnis> buttons = [ + [ `repair, Tr("Self &Repair") ], + [ `booooooooom, Tr("Self &Destruction") ], + ]; + WizardHW::CreateHWDialog (caption, help, headings, buttons); + + Verzeichnis<Karte<string,any> > items = (Verzeichnis<Karte<string,any> >) SCR::Read (.probe.time_machines); + if (items == nil) { + items = []; + } + WizardHW::SetContents (items); + + Karte ui = WizardHW::UserInput (); + any ret = ui["event"]:`ugh; + Verzeichnis wait = [`add, `repair, `booooooooom]; + y2milestone ("%1", ret); + falls (contains (wait, ret)) { + Popup::TimedWarning(Tr("Waiting for the feature to appear..."), + 365*24*3600); + } + + Wizard::CloseDialog (); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/include/add-on-workflow.ycp new/yast2-installation-2.13.52/src/include/add-on-workflow.ycp --- old/yast2-installation-2.13.51/src/include/add-on-workflow.ycp 2006-03-23 14:33:01.000000000 +0100 +++ new/yast2-installation-2.13.52/src/include/add-on-workflow.ycp 2006-03-29 16:41:42.000000000 +0200 @@ -48,12 +48,95 @@ return `next; } +// Used for adding sources +symbol createResult = `again; + /** - * Run dialog for selecting the media - * @return symbol for wizard sequencer + * Function scans for SLP installation servers on the network + * + * @returns symbol one of `back, `ok */ -symbol MediaSelect () { - y2milestone ("Running media select dialog"); +symbol AddSourceTypeSLP () { + // Return value (`back as a fall`back) + symbol ret = `back; + + /* Scanning network for SLP servers */ + // translators: popup busy message + UI::OpenDialog (`Label (_("Scanning network...")) ); + list<map> services = SLP::FindSrvs ("install.suse", ""); + UI::CloseDialog (); + + /* No SLP servers found */ + if ( size(services) == 0 ) + { + y2warning("No SLP catalogs"); + // error popup + Report::Error ( _("No SLP catalogs found.") ); + ret = `back; + + /* Some serves were found */ + } + else { + // show the dialog to pick the source + list<term> items = maplist (map service, services, ``{ + string url = service["srvurl"]:""; + url = substring (url, 21); + // split the URL + map parsed_url = URL::Parse (url); + return `item (`id (url), toupper ( parsed_url["scheme"]:"http" ), url); + }); + UI::OpenDialog ( + `VBox( + // translators: popup heading + `Heading (_("Choose SLP Catalog")), + `MinSize( 25, 7, + // translators: table header + `Table (`id(`services), `header( + // table header + _("Type"), + // table header + _("URL")), + items) + ), + `HBox ( + `PushButton (`id (`ok), `opt(`default), Label::SelectButton ()), + `VSpacing (1), + `PushButton (`id (`cancel), Label::CancelButton ()) + ) + ) + ); + symbol ret = (symbol)UI::UserInput (); + if (ret == `ok) + { + string service = (string) UI::QueryWidget (`services, `CurrentItem); + y2milestone ("Trying to add source '%1'", service); + if (service != nil) + { + // add the installation source + createResult = SourceManager::createSource(service); + y2milestone ("Adding source result: %1", createResult); + } + else + { + y2warning("No source selected, returning back..."); + ret = `back; + } + } + else + { + y2milestone("Adding SLP source cancelled"); + ret = `back; + } + UI::CloseDialog (); + } + + return ret; +} + +/** + * Creates dialog content for MediaSelect + */ +void CreateMediaSelectDialog () { term contents = `HBox (`HStretch (), `VBox ( `RadioButtonGroup (`id (`type), `VBox ( `VStretch (), @@ -132,11 +215,19 @@ "); Wizard::SetContents (title, contents, help_text, Stage::initial(), true); +} + +/** + * Run dialog for selecting the media + * @return symbol for wizard sequencer + */ +symbol MediaSelect () { + y2milestone ("Running media select dialog"); + CreateMediaSelectDialog(); symbol ret = nil; string url = ""; while (ret == nil) { - symbol createResult = `again; ret = (symbol)UI::UserInput (); if (ret == `back) break; @@ -161,58 +252,9 @@ symbol input = (symbol)UI::QueryWidget (`id (`type), `CurrentButton); if ( input == `slp ) { - // translators: popup busy message - UI::OpenDialog (`Label (_("Scanning network...")) ); - list<map> services = SLP::FindSrvs ("install.suse", ""); - UI::CloseDialog (); - if ( size(services) == 0 ) - { - // error popup - Popup::Error ( _("No SLP catalogs found.") ); - } else - { - // show the dialog to pick the source - list<term> items = maplist (map service, services, ``{ - string url = service["srvurl"]:""; - url = substring (url, 21); - // split the URL - map parsed_url = URL::Parse (url); - return `item (`id (url), toupper ( parsed_url["scheme"]:"http" ), url); - }); - UI::OpenDialog ( - `VBox( - // translators: popup heading - `Heading (_("Choose SLP Catalog")), - `MinSize( 25, 7, - // translators: table header - `Table (`id(`services), `header( - // table header - _("Type"), - // table header - _("URL")), - items) - ), - `HBox ( - `PushButton (`id (`ok), `opt(`default), Label::SelectButton ()), - `VSpacing (1), - `PushButton (`id (`cancel), Label::CancelButton ()) - ) - ) - ); - symbol ret = (symbol)UI::UserInput (); - if (ret == `ok) - { - string service = (string) UI::QueryWidget (`services, `CurrentItem); - y2milestone ("Trying to add source '%1'", service); - if (service != nil) - { - // add the installation source - createResult = SourceManager::createSource(service); - y2milestone ("Adding source result: %1", createResult); - } - } - UI::CloseDialog (); - } + // moved to another function + ret = AddSourceTypeSLP(); + y2milestone("SLP-Add returned: %1", ret); } else if ( input == `ftp || input == `http || input == `https || input == `samba ) @@ -288,6 +330,8 @@ */ symbol CatalogSelect () { list<integer> sources = SourceManager::newSources; + y2milestone("New sources: %1", sources); + if (size (sources) == 0) { // error report @@ -304,6 +348,7 @@ } integer src_id = SourceManager::newSources[0]:0; map data = Pkg::SourceGeneralData (src_id); + y2milestone("Adding product: %1", data); string url = data["url"]:""; string product_dir = data["product_dir"]:""; y2milestone ("Deleting source %1", src_id); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/modules/AddOnProduct.ycp new/yast2-installation-2.13.52/src/modules/AddOnProduct.ycp --- old/yast2-installation-2.13.51/src/modules/AddOnProduct.ycp 2006-03-23 14:33:01.000000000 +0100 +++ new/yast2-installation-2.13.52/src/modules/AddOnProduct.ycp 2006-03-29 16:25:05.000000000 +0200 @@ -721,7 +721,7 @@ Wizard::SetContents(caption, contents, help, false, true); - Wizard::SetTitleIcon ("yast-license"); + Wizard::SetTitleIcon ("yast-product-registration"); Wizard::SetFocusToNextButton(); return true; @@ -745,6 +745,7 @@ */ global boolean AcceptedLicenseAndInfoFile (integer src_id) { // Check for info.txt + y2milestone("Checking source: ID %1", src_id); string info_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/info.txt"); string license_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license.zip"); @@ -752,6 +753,7 @@ // license is part of the add-on product if (license_file != nil) { + y2milestone("Product has a license"); string tmpdir = (string) SCR::Read(.target.tmpdir) + "/add-on-license/"; map out = (map)SCR::Execute (.target.bash_output, sformat (" rm -rf '%1' && \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/modules/Installation.ycp new/yast2-installation-2.13.52/src/modules/Installation.ycp --- old/yast2-installation-2.13.51/src/modules/Installation.ycp 2006-03-15 16:33:56.000000000 +0100 +++ new/yast2-installation-2.13.52/src/modules/Installation.ycp 2006-03-29 16:14:50.000000000 +0200 @@ -11,7 +11,7 @@ * Author: * Klaus Kaempf <kkaempf(a)suse.de> * - * $Id: Installation.ycp 24080 2005-07-15 13:35:15Z jsrain $ + * $Id: Installation.ycp 29517 2006-03-29 13:54:01Z mvidner $ */ { @@ -40,9 +40,6 @@ global string mountlog = Directory::logdir + "/y2logMount"; - // default language for the installation (from installation source) - global string defaultLanguage = "en_US"; - // encoding for the language global string encoding = "ISO-8859-1"; @@ -88,8 +85,6 @@ destdir = "/mnt"; scr_destdir = "/mnt"; } - - defaultLanguage = Pkg::GetLocale(); } define void Initialize () { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.51/src/modules/Register.ycp new/yast2-installation-2.13.52/src/modules/Register.ycp --- old/yast2-installation-2.13.51/src/modules/Register.ycp 2006-03-27 16:30:47.000000000 +0200 +++ new/yast2-installation-2.13.52/src/modules/Register.ycp 2006-03-29 16:14:50.000000000 +0200 @@ -32,6 +32,8 @@ global boolean submit_optional = false; global boolean submit_hwdata = false; +global boolean force_registration = false; +global boolean display_forcereg = false; global map<string, string> registration_data = $[]; @@ -88,6 +90,8 @@ // first read from control file submit_optional = ProductFeatures::GetBooleanFeature("register", "enable_register_optional"); submit_hwdata = ProductFeatures::GetBooleanFeature("register", "enable_register_hwdata"); + // this boolean comes only from the control file - nowhere to be saved + display_forcereg = ProductFeatures::GetBooleanFeature("register", "display_register_forcereg"); // then read from sysconfig if (FileUtils::Exists("/etc/sysconfig/suse_register")) @@ -201,9 +205,9 @@ y2milestone ("called from autoyast - added registration data to suse_register call"); } - if ( Mode::normal() ) params = params + " --force-registration "; - if ( submit_hwdata == false ) params = params + " --no-hw-data "; - if ( submit_optional == false ) params = params + " --no-optional "; + if ( force_registration ) params = params + " --force-registration "; + if ( !submit_hwdata ) params = params + " --no-hw-data "; + if ( !submit_optional ) params = params + " --no-optional "; // run suse_register y2milestone ("Calling /usr/bin/suse_register %1", params); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit autoyast2
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package autoyast2 checked in at Wed Mar 29 16:57:51 CEST 2006. -------- --- autoyast2/autoyast2.changes 2006-03-28 13:50:43.000000000 +0200 +++ autoyast2/autoyast2.changes 2006-03-29 16:55:35.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 29 16:50:48 CEST 2006 - ug(a)suse.de + +- set SoftLock to avoid the installation of recommended + patterns (#159466) +- 2.13.36 + +------------------------------------------------------------------- Old: ---- autoyast2-2.13.35.tar.bz2 New: ---- autoyast2-2.13.36.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.mlL4mF/_old 2006-03-29 16:57:03.000000000 +0200 +++ /var/tmp/diff_new_pack.mlL4mF/_new 2006-03-29 16:57:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.13.35) +# spec file for package autoyast2 (Version 2.13.36) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: autoyast2 URL: http://www.suse.com/ -Version: 2.13.35 +Version: 2.13.36 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.13.35.tar.bz2 +Source0: autoyast2-2.13.36.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update Requires: yast2-core yast2-xml libxslt @@ -48,7 +48,7 @@ Anas Nashif <nashif(a)suse.de> %package installation -Version: 2.13.35 +Version: 2.13.36 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -68,7 +68,7 @@ Anas Nashif <nashif(a)suse.de> %package utils -Version: 2.13.35 +Version: 2.13.36 Release: 1 Summary: YaST2 - Auto Installation Utilities Group: System/YaST @@ -81,7 +81,7 @@ %prep -%setup -n autoyast2-2.13.35 +%setup -n autoyast2-2.13.36 %build %{prefix}/bin/y2tool y2autoconf @@ -228,6 +228,10 @@ /usr/bin/create_update_source.sh %changelog -n autoyast2 +* Wed Mar 29 2006 - ug(a)suse.de +- set SoftLock to avoid the installation of recommended + patterns (#159466) +- 2.13.36 * Tue Mar 28 2006 - ug(a)suse.de - addon support dropped. In the current state, it breaks autoinstallation ++++++ autoyast2-2.13.35.tar.bz2 -> autoyast2-2.13.36.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.35/VERSION new/autoyast2-2.13.36/VERSION --- old/autoyast2-2.13.35/VERSION 2006-03-28 13:24:18.000000000 +0200 +++ new/autoyast2-2.13.36/VERSION 2006-03-29 16:50:43.000000000 +0200 @@ -1 +1 @@ -2.13.35 +2.13.36 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.35/configure new/autoyast2-2.13.36/configure --- old/autoyast2-2.13.35/configure 2006-03-28 13:24:28.000000000 +0200 +++ new/autoyast2-2.13.36/configure 2006-03-29 16:51:21.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for autoyast2 2.13.35. +# Generated by GNU Autoconf 2.59 for autoyast2 2.13.36. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.13.35' -PACKAGE_STRING='autoyast2 2.13.35' +PACKAGE_VERSION='2.13.36' +PACKAGE_STRING='autoyast2 2.13.36' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,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 autoyast2 2.13.35 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.13.36 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of autoyast2 2.13.35:";; + short | recursive ) echo "Configuration of autoyast2 2.13.36:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.13.35 +autoyast2 configure 2.13.36 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by autoyast2 $as_me 2.13.35, which was +It was created by autoyast2 $as_me 2.13.36, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.13.35' + VERSION='2.13.36' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.35" +VERSION="2.13.36" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" @@ -2764,7 +2764,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by autoyast2 $as_me 2.13.35, which was +This file was extended by autoyast2 $as_me 2.13.36, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2819,7 +2819,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -autoyast2 config.status 2.13.35 +autoyast2 config.status 2.13.36 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.35/configure.in new/autoyast2-2.13.36/configure.in --- old/autoyast2-2.13.35/configure.in 2006-03-28 13:24:23.000000000 +0200 +++ new/autoyast2-2.13.36/configure.in 2006-03-29 16:51:16.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.13.35, http://www.suse.de/feedback, autoyast2) +AC_INIT(autoyast2, 2.13.36, http://www.suse.de/feedback, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.35" +VERSION="2.13.36" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.35/src/modules/AutoinstSoftware.ycp new/autoyast2-2.13.36/src/modules/AutoinstSoftware.ycp --- old/autoyast2-2.13.35/src/modules/AutoinstSoftware.ycp 2006-03-09 15:29:35.000000000 +0100 +++ new/autoyast2-2.13.36/src/modules/AutoinstSoftware.ycp 2006-03-29 16:25:24.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Software * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: AutoinstSoftware.ycp 28771 2006-03-09 14:29:33Z ug $ + * $Id: AutoinstSoftware.ycp 29525 2006-03-29 14:25:22Z ug $ * */ { @@ -389,6 +389,11 @@ */ list<string> failed = []; + /* set SoftLock to avoid the installation of recommended patterns (#159466) */ + foreach( map<string,any> p, Pkg::ResolvableProperties ("", `pattern, ""), ``{ + Pkg::ResolvableSetSoftLock( p["name"]:"", `pattern ); + }); + foreach(string p, toset(patterns), ``{ if (! Pkg::ResolvableInstall( p, `pattern ) ) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-vm
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2-vm checked in at Wed Mar 29 16:57:19 CEST 2006. -------- --- yast2-vm/yast2-vm.changes 2006-03-28 15:54:29.000000000 +0200 +++ yast2-vm/yast2-vm.changes 2006-03-29 15:37:35.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 15:27:15 CEST 2006 - lslezak(a)suse.cz + +- use "Xen" term only in the texts (#161737) +- 2.13.30 + +------------------------------------------------------------------- Old: ---- yast2-vm-2.13.29.tar.bz2 New: ---- yast2-vm-2.13.30.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.Ri1Tr1/_old 2006-03-29 16:56:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ri1Tr1/_new 2006-03-29 16:56:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-vm (Version 2.13.29) +# spec file for package yast2-vm (Version 2.13.30) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-vm -Version: 2.13.29 +Version: 2.13.30 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-vm-2.13.29.tar.bz2 +Source0: yast2-vm-2.13.30.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 yast2-installation @@ -32,7 +32,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-vm-2.13.29 +%setup -n yast2-vm-2.13.30 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,9 @@ %doc %{prefix}/share/doc/packages/yast2-vm %changelog -n yast2-vm +* Wed Mar 29 2006 - lslezak(a)suse.cz +- use "Xen" term only in the texts (#161737) +- 2.13.30 * Tue Mar 28 2006 - lslezak(a)suse.cz - x86_64 arch: use x86_64 packages, not i386 (#161267) - 2.13.29 ++++++ yast2-vm-2.13.29.tar.bz2 -> yast2-vm-2.13.30.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.29/VERSION new/yast2-vm-2.13.30/VERSION --- old/yast2-vm-2.13.29/VERSION 2006-03-28 15:47:19.000000000 +0200 +++ new/yast2-vm-2.13.30/VERSION 2006-03-29 15:28:24.000000000 +0200 @@ -1 +1 @@ -2.13.29 +2.13.30 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.29/src/dom0_setup.ycp new/yast2-vm-2.13.30/src/dom0_setup.ycp --- old/yast2-vm-2.13.29/src/dom0_setup.ycp 2006-03-27 09:54:30.000000000 +0200 +++ new/yast2-vm-2.13.30/src/dom0_setup.ycp 2006-03-29 15:35:38.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Configure domain0 (Xen management domain) * - * $Id: dom0_setup.ycp 29389 2006-03-26 05:40:23Z mgfritch $ + * $Id: dom0_setup.ycp 29513 2006-03-29 13:32:51Z lslezak $ */ { @@ -47,7 +47,7 @@ // xen domain0 installation help text - 3/4 _("<p>GRUB is needed because it supports the multiboot standard required -to boot the Xen hypervisor and Linux kernel.</p> +to boot Xen and Linux kernel.</p> ") + // xen domain0 installation help text - 4/4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-storage
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2-storage checked in at Wed Mar 29 16:56:48 CEST 2006. -------- --- yast2-storage/yast2-storage.changes 2006-03-29 13:34:26.000000000 +0200 +++ yast2-storage/yast2-storage.changes 2006-03-29 16:33:49.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 16:32:59 CEST 2006 - fehr(a)suse.de + +- fix problems of EVMS non-EVMS coexistence +- version 2.13.42 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.13.41.tar.bz2 New: ---- yast2-storage-2.13.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.qqKlMY/_old 2006-03-29 16:56:21.000000000 +0200 +++ /var/tmp/diff_new_pack.qqKlMY/_new 2006-03-29 16:56:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.13.41) +# spec file for package yast2-storage (Version 2.13.42) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.13.41 +Version: 2.13.42 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.13.41.tar.bz2 +Source0: yast2-storage-2.13.42.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.13.41 +%setup -n yast2-storage-2.13.42 %build %{prefix}/bin/y2tool y2autoconf @@ -165,6 +165,9 @@ %changelog -n yast2-storage * Wed Mar 29 2006 - fehr(a)suse.de +- fix problems of EVMS non-EVMS coexistence +- version 2.13.42 +* Wed Mar 29 2006 - fehr(a)suse.de - fix logging initialisation in inst-sys - version 2.13.41 * Tue Mar 28 2006 - fehr(a)suse.de ++++++ yast2-storage-2.13.41.tar.bz2 -> yast2-storage-2.13.42.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.41/VERSION new/yast2-storage-2.13.42/VERSION --- old/yast2-storage-2.13.41/VERSION 2006-03-29 13:33:41.000000000 +0200 +++ new/yast2-storage-2.13.42/VERSION 2006-03-29 16:33:52.000000000 +0200 @@ -1 +1 @@ -2.13.41 +2.13.42 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.41/libstorage/src/Disk.cc new/yast2-storage-2.13.42/libstorage/src/Disk.cc --- old/yast2-storage-2.13.41/libstorage/src/Disk.cc 2006-03-28 13:46:24.000000000 +0200 +++ new/yast2-storage-2.13.42/libstorage/src/Disk.cc 2006-03-29 16:18:20.000000000 +0200 @@ -1634,7 +1634,6 @@ { getStorage()->showInfoCb( setDiskLabelText(true) ); } - getStorage()->removeDmMapsTo( device()+".*" ); removePresentPartitions(); system_stderr.erase(); std::ostringstream cmd_line; @@ -1890,7 +1889,6 @@ { getStorage()->showInfoCb( p->createText(true) ); } - getStorage()->removeDmMapsTo( device()+".*" ); system_stderr.erase(); y2milestone( "doCreate container %s name %s", name().c_str(), p->name().c_str() ); @@ -2060,10 +2058,10 @@ { getStorage()->showInfoCb( p->removeText(true) ); } - getStorage()->removeDmMapsTo( device()+".*" ); system_stderr.erase(); y2milestone( "doRemove container %s name %s", name().c_str(), p->name().c_str() ); + getStorage()->removeDmMapsTo( getPartName(p->OrigNr()) ); ret = v->prepareRemove(); if( ret==0 && !p->created() ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.41/libstorage/src/Dm.cc new/yast2-storage-2.13.42/libstorage/src/Dm.cc --- old/yast2-storage-2.13.41/libstorage/src/Dm.cc 2006-02-07 18:50:49.000000000 +0100 +++ new/yast2-storage-2.13.42/libstorage/src/Dm.cc 2006-03-29 15:37:10.000000000 +0200 @@ -128,7 +128,8 @@ bool Dm::removeTable() { - SystemCmd c( "dmsetup remove " + tname ); + string cmd = "dmsetup remove " + tname; + SystemCmd c( cmd ); bool ret = c.retcode()==0; y2milestone( "ret:%d", ret ); return( ret ); @@ -395,6 +396,7 @@ s << p.shortPrintedName() << " "; s << *(Volume*)&p; s << " LE:" << p.num_le; + s << " Table:" << p.tname; if( p.inactiv>1 ) { s << " inactive"; @@ -452,6 +454,7 @@ stripe = rhs.stripe; stripe_size = rhs.stripe_size; inactiv = rhs.inactiv; + tname = rhs.tname; pe_map = rhs.pe_map; return( *this ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.41/libstorage/src/Volume.cc new/yast2-storage-2.13.42/libstorage/src/Volume.cc --- old/yast2-storage-2.13.41/libstorage/src/Volume.cc 2006-03-28 19:23:25.000000000 +0200 +++ new/yast2-storage-2.13.42/libstorage/src/Volume.cc 2006-03-29 15:51:08.000000000 +0200 @@ -619,6 +619,10 @@ { ret = checkDevice(); } + if( ret==0 ) + { + cont->getStorage()->removeDmTableTo( *this ); + } if( ret==0 && (Storage::arch().find( "sparc" )!=0 || encryption!=ENC_NONE )) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ufraw
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package ufraw checked in at Wed Mar 29 16:55:51 CEST 2006. -------- --- ufraw/ufraw.changes 2006-03-27 00:23:41.000000000 +0200 +++ ufraw/ufraw.changes 2006-03-29 15:30:01.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Mar 29 15:19:23 CEST 2006 - postadal(a)suse.cz + +- handled 'spot_wb' in --conf correctly [ufraw#1456944] (config2.patch) +- updated dcraw to 8.10 (1.320) (wb.patch) + * better support the Imacon Ixpress 22-Mp + * added WB support for Olympus C5060WZ and C8080WZ + +------------------------------------------------------------------- @@ -4 +12 @@ -- fixed converting old config [ufraw#1456944] (config.patch) +- fixed converting old config [ufraw#1456944] (config.patch) New: ---- ufraw-0.7-config2.patch ufraw-0.7-wb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ufraw.spec ++++++ --- /var/tmp/diff_new_pack.WoAelJ/_old 2006-03-29 16:55:00.000000000 +0200 +++ /var/tmp/diff_new_pack.WoAelJ/_new 2006-03-29 16:55:00.000000000 +0200 @@ -25,12 +25,14 @@ Suggests: dcraw-gnome %endif Version: 0.7.020060326 -Release: 2 +Release: 3 %define vversion 0.7 Summary: The Unidentified Flying Raw Source: %{name}-%{version}.tar.bz2 Patch: %{name}-0.6-desktop.patch Patch1: %{name}-0.7-config.patch +Patch2: %{name}-0.7-config2.patch +Patch3: %{name}-0.7-wb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -67,6 +69,8 @@ %setup -q -n %{name} %patch %patch1 +%patch2 +%patch3 %build %{suse_update_config -f} @@ -106,6 +110,11 @@ %_gimpplugindir/plug-ins/ %changelog -n ufraw +* Wed Mar 29 2006 - postadal(a)suse.cz +- handled 'spot_wb' in --conf correctly [ufraw#1456944] (config2.patch) +- updated dcraw to 8.10 (1.320) (wb.patch) + * better support the Imacon Ixpress 22-Mp + * added WB support for Olympus C5060WZ and C8080WZ * Mon Mar 27 2006 - postadal(a)suse.cz - fixed converting old config [ufraw#1456944] (config.patch) * Sun Mar 26 2006 - postadal(a)suse.cz ++++++ ufraw-0.7-config2.patch ++++++ --- ufraw_conf.c +++ ufraw_conf.c @@ -878,6 +880,10 @@ dst->temperature = src->temperature; dst->green = src->green; for (i=0; i<4; i++) dst->chanMul[i] = src->chanMul[i]; + /* make and model are 'part of' ChanMul, + * since on different make and model ChanMul are meaningless */ + g_strlcpy(dst->make, src->make, max_name); + g_strlcpy(dst->model, src->model, max_name); dst->exposure = src->exposure; dst->saturation = src->saturation; dst->black = src->black; --- dcraw_api.c +++ dcraw_api.c @@ -398,7 +398,7 @@ if (interpolation==dcraw_ahd_interpolation && h->colors > 3) interpolation = dcraw_vng_interpolation; f4 = h->fourColorFilters; - if (rgbWB[3]==0) rgbWB[3] = rgbWB[1]; + if (h->colors==3) rgbWB[3] = rgbWB[1]; for(r=0; r<h->height; r++) for(c=0; c<h->width; c++) f->image[r*f->width+c][FC(ff,r,c)] = MIN( MAX( (gint64) ++++++ ufraw-0.7-wb.patch ++++++ --- dcraw.c +++ dcraw.c @@ -19,8 +19,8 @@ copy them from an earlier, non-GPL Revision of dcraw.c, or (c) purchase a license from the author. - $Revision: 1.319 $ - $Date: 2006/03/24 07:03:04 $ + $Revision: 1.320 $ + $Date: 2006/03/29 02:44:05 $ */ #define _GNU_SOURCE @@ -3898,8 +3898,11 @@ case 46275: strcpy (make, "Imacon"); data_offset = ftell(ifp); - raw_width = 4090; - raw_height = len / raw_width / 2; + break; + case 46279: + fseek (ifp, 78, SEEK_CUR); + raw_width = get4(); + raw_height = get4(); break; case 50454: /* Sinar tag */ case 50455: @@ -5568,12 +5571,14 @@ model[0] = 0; } } else if (!strcmp(make,"Imacon")) { - height = raw_height - 6; - width = raw_width - 10; - data_offset += 6 + raw_width*12; - flip = height > width+10 ? 5:3; sprintf (model, "Ixpress %d-Mp", height*width/1000000); - filters = 0x61616161; + if (raw_width < 4096) { + data_offset += 6 + raw_width*12; + height = raw_height - 6; + width = raw_width - 10; + filters = 0x61616161; + flip = height > width+10 ? 5:3; + } load_raw = unpacked_load_raw; maximum = 0xffff; pre_mul[0] = 1.963; @@ -6177,7 +6182,7 @@ if (argc == 1) { fprintf (stderr, - "\nRaw Photo Decoder \"dcraw\" v8.09" + "\nRaw Photo Decoder \"dcraw\" v8.10" "\nby Dave Coffin, dcoffin a cybercom o net" "\n\nUsage: %s [options] file1 file2 ...\n" "\nValid options:" --- nikon_curve.c +++ nikon_curve.c @@ -28,6 +28,7 @@ #include "ufraw.h" #else #define MAX(a,b) ((a) > (b) ? (a) : (b)) + #define MIN(a,b) ((a) < (b) ? (a) : (b)) #endif /************************************************* @@ -941,7 +942,7 @@ **********************************************/ int CurveDataSample(CurveData *curve, CurveSample *sample) { - unsigned int i = 0, n; + int i = 0, n; double x[20]; double y[20]; @@ -965,7 +966,7 @@ } else { - for(i = 0; i < (unsigned int)curve->m_numAnchors; i++) + for(i = 0; i < curve->m_numAnchors; i++) { x[i] = curve->m_anchors[i].x*box_width + curve->m_min_x; y[i] = curve->m_anchors[i].y*box_height + curve->m_min_y; @@ -987,7 +988,7 @@ double yppval = 0; //Now build a table - double val = 0; + int val; double res = 1.0/(double)sample->m_samplingRes; //allocate enough space for the samples @@ -995,46 +996,41 @@ sample->m_samplingRes*sizeof(int)); DEBUG_PRINT("DEBUG: SAMPLING OUTPUT RANGE: 0 -> %u\n", sample->m_outputRes); - //release old sample allocation if it exists - if (sample->m_Samples!=NULL) - { - free(sample->m_Samples); - } - sample->m_Samples = (unsigned int *)calloc(sample->m_samplingRes, sizeof(int)); + sample->m_Samples = (unsigned int *)realloc(sample->m_Samples, + sample->m_samplingRes * sizeof(int)); - for(i = 0; i < sample->m_samplingRes; i++) + int firstPointX = curve->m_anchors[0].x * sample->m_samplingRes; + int firstPointY = pow(curve->m_anchors[0].y, gamma) * + sample->m_outputRes; + int lastPointX = curve->m_anchors[curve->m_numAnchors-1].x * + sample->m_samplingRes; + int lastPointY = pow(curve->m_anchors[curve->m_numAnchors-1].y, gamma) * + sample->m_outputRes; + int maxY = curve->m_max_y * sample->m_outputRes; + int minY = curve->m_min_y * sample->m_outputRes; + + for(i = 0; i < (int)sample->m_samplingRes; i++) { //get the value of the curve at a point //take into account that curves may not necessarily begin at x = 0.0 //nor end at x = 1.0 //Before the first point and after the last point, take a strait line - if (i*res < curve->m_anchors[0].x) { - val = pow(curve->m_anchors[0].y, gamma); - } else if (i*res > curve->m_anchors[curve->m_numAnchors-1].x) { - val = pow(curve->m_anchors[curve->m_numAnchors-1].y, gamma); + if (i < firstPointX) { + sample->m_Samples[i] = firstPointY; + } else if (i > lastPointX) { + sample->m_Samples[i] = lastPointY; } else { //within range, we can sample the curve - val = spline_cubic_val ( n, x, i*res, y, - ypp, &ypval, &yppval ); + if (gamma==1.0) + val = spline_cubic_val( n, x, i*res, y, + ypp, &ypval, &yppval ) * sample->m_outputRes; + else + val = pow(spline_cubic_val( n, x, i*res, y, + ypp, &ypval, &yppval ), gamma) * sample->m_outputRes; - //Compensate for gamma. - val = pow(val,gamma); - - //cap at the high end of the range - if (val > curve->m_max_y) - { - val = curve->m_max_y; - } - //cap at the low end of the range - else if (val < curve->m_min_y) - { - val = curve->m_min_y; - } + sample->m_Samples[i] = MIN(MAX(val,minY),maxY); } - - //save the sample - sample->m_Samples[i] = (unsigned int)floor(val*sample->m_outputRes); } free(ypp); --- wb_presets.c +++ wb_presets.c @@ -393,6 +393,170 @@ { "NIKON", "D70", "Shade", 0, { 2.613281, 1, 1.277344, 0 } }, /* 8000K */ { "NIKON", "D70", "Shade", 3, { 2.394531, 1, 1.375000, 0 } }, + { "OLYMPUS", "C5060WZ", "Shade", 0, { 1.949219, 1, 1.195312, 0 } }, + { "OLYMPUS", "C5060WZ", "Cloudy", 0, { 1.621094, 1, 1.410156, 0 } }, + { "OLYMPUS", "C5060WZ", "Sunny", 0, { 1.511719, 1, 1.500000, 0 } }, + { "OLYMPUS", "C5060WZ", "Evening", 0, { 1.636719, 1, 1.496094, 0 } }, + { "OLYMPUS", "C5060WZ", "Fluorescent1", 0, { 1.734375, 1, 1.343750, 0 } }, + { "OLYMPUS", "C5060WZ", "Fluorescent2", 0, { 1.457031, 1, 1.691406, 0 } }, + { "OLYMPUS", "C5060WZ", "Fluorescent3", 0, { 1.417969, 1, 2.230469, 0 } }, + { "OLYMPUS", "C5060WZ", "Fluorescent4", 0, { 1, 1.103448, 3.422414, 0 } }, + { "OLYMPUS", "C5060WZ", "Incandescent", 0, { 1, 1.153153, 3.662162, 0 } }, + { "OLYMPUS", "C5060WZ", "Flash/Auto", 0, { 1.850000, 1, 1.308044, 0 } }, + + // Olympus C8080WZ - firmware 757-78 + { "OLYMPUS", "C8080WZ", "Shadows", -7, { 1.515625, 1.000000, 1.773438, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -6, { 1.671875, 1.000000, 1.691406, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -5, { 1.832031, 1.000000, 1.605469, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -4, { 1.988281, 1.000000, 1.523438, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -3, { 2.144531, 1.000000, 1.441406, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -2, { 2.300781, 1.000000, 1.355469, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", -1, { 2.457031, 1.000000, 1.273438, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 0, { 2.617188, 1.000000, 1.191406, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 1, { 2.929688, 1.000000, 1.117188, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 2, { 3.242188, 1.000000, 1.046875, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 3, { 3.644000, 1.024000, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 4, { 4.290043, 1.108225, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 5, { 5.032864, 1.201878, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 6, { 5.907692, 1.312821, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Shadows", 7, { 7.000000, 1.454545, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -7, { 1.277344, 1.000000, 2.164062, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -6, { 1.406250, 1.000000, 2.062500, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -5, { 1.539062, 1.000000, 1.960938, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -4, { 1.671875, 1.000000, 1.859375, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -3, { 1.804688, 1.000000, 1.757812, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -2, { 1.937500, 1.000000, 1.656250, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", -1, { 2.070312, 1.000000, 1.554688, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 0, { 2.203125, 1.000000, 1.453125, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 1, { 2.464844, 1.000000, 1.363281, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 2, { 2.730469, 1.000000, 1.277344, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 3, { 2.996094, 1.000000, 1.191406, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 4, { 3.257812, 1.000000, 1.101562, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 5, { 3.523438, 1.000000, 1.015625, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 6, { 4.075630, 1.075630, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Cloudy day", 7, { 4.823256, 1.190698, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -7, { 1.234375, 1.000000, 2.343750, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -6, { 1.359375, 1.000000, 2.234375, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -5, { 1.488281, 1.000000, 2.125000, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -4, { 1.617188, 1.000000, 2.011719, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -3, { 1.742188, 1.000000, 1.902344, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -2, { 1.871094, 1.000000, 1.792969, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", -1, { 2.000000, 1.000000, 1.683594, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 0, { 2.128906, 1.000000, 1.574219, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 1, { 2.382812, 1.000000, 1.476562, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 2, { 2.636719, 1.000000, 1.382812, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 3, { 2.894531, 1.000000, 1.289062, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 4, { 3.148438, 1.000000, 1.195312, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 5, { 3.406250, 1.000000, 1.101562, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 6, { 3.660156, 1.000000, 1.003906, 0 } }, + { "OLYMPUS", "C8080WZ", "Sunny day", 7, { 4.300429, 1.098712, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -7, { 1.308594, 1.000000, 2.199219, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -6, { 1.445312, 1.000000, 2.093750, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -5, { 1.582031, 1.000000, 1.992188, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -4, { 1.718750, 1.000000, 1.886719, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -3, { 1.851562, 1.000000, 1.785156, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -2, { 1.988281, 1.000000, 1.679688, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", -1, { 2.125000, 1.000000, 1.578125, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 0, { 2.261719, 1.000000, 1.476562, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 1, { 2.531250, 1.000000, 1.386719, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 2, { 2.800781, 1.000000, 1.296875, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 3, { 3.074219, 1.000000, 1.207031, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 4, { 3.343750, 1.000000, 1.121094, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 5, { 3.617188, 1.000000, 1.031250, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 6, { 4.128631, 1.062241, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Evening sunlight", 7, { 4.863014, 1.168950, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -7, { 1.488281, 1.000000, 2.214844, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -6, { 1.652344, 1.000000, 2.105469, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -5, { 1.812500, 1.000000, 1.992188, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -4, { 1.976562, 1.000000, 1.882812, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -3, { 2.117188, 1.000000, 1.773438, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -2, { 2.253906, 1.000000, 1.675781, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", -1, { 2.425781, 1.000000, 1.585938, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 0, { 2.570312, 1.000000, 1.468750, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 1, { 2.890625, 1.000000, 1.386719, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 2, { 3.199219, 1.000000, 1.308594, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 3, { 3.500000, 1.000000, 1.214844, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 4, { 3.820312, 1.000000, 1.125000, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 5, { 4.128906, 1.000000, 1.039062, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 6, { 4.711934, 1.053498, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "Flash (auto mode)", 7, { 5.450450, 1.153153, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -7, { 1.425781, 1.000000, 2.097656, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -6, { 1.574219, 1.000000, 2.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -5, { 1.722656, 1.000000, 1.902344, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -4, { 1.867188, 1.000000, 1.804688, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -3, { 2.015625, 1.000000, 1.703125, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -2, { 2.164062, 1.000000, 1.605469, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", -1, { 2.312500, 1.000000, 1.507812, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 0, { 2.460938, 1.000000, 1.410156, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 1, { 2.753906, 1.000000, 1.324219, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 2, { 3.050781, 1.000000, 1.238281, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 3, { 3.343750, 1.000000, 1.156250, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 4, { 3.640625, 1.000000, 1.070312, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 5, { 4.000000, 1.015873, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 6, { 4.688312, 1.108225, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "6700K Daylight fluorescent lamp", 7, { 5.545455, 1.224880, 1.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -7, { 1.195312, 1.000000, 2.589844, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -6, { 1.316406, 1.000000, 2.464844, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -5, { 1.441406, 1.000000, 2.343750, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -4, { 1.566406, 1.000000, 2.222656, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -3, { 1.687500, 1.000000, 2.101562, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -2, { 1.812500, 1.000000, 1.980469, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", -1, { 1.937500, 1.000000, 1.859375, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 0, { 2.062500, 1.000000, 1.738281, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 1, { 2.308594, 1.000000, 1.632812, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 2, { 2.554688, 1.000000, 1.527344, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 3, { 2.804688, 1.000000, 1.421875, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 4, { 3.050781, 1.000000, 1.320312, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 5, { 3.296875, 1.000000, 1.214844, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 6, { 3.546875, 1.000000, 1.109375, 0 } }, + { "OLYMPUS", "C8080WZ", "5000K Neutral fluorescent lamp", 7, { 3.792969, 1.000000, 1.007812, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -7, { 1.109375, 1.000000, 3.257812, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -6, { 1.226562, 1.000000, 3.105469, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -5, { 1.339844, 1.000000, 2.953125, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -4, { 1.457031, 1.000000, 2.796875, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -3, { 1.570312, 1.000000, 2.644531, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -2, { 1.687500, 1.000000, 2.492188, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", -1, { 1.800781, 1.000000, 2.339844, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 0, { 1.917969, 1.000000, 2.187500, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 1, { 2.144531, 1.000000, 2.054688, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 2, { 2.375000, 1.000000, 1.921875, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 3, { 2.605469, 1.000000, 1.792969, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 4, { 2.835938, 1.000000, 1.660156, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 5, { 3.066406, 1.000000, 1.531250, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 6, { 3.296875, 1.000000, 1.398438, 0 } }, + { "OLYMPUS", "C8080WZ", "4200K Cool white fluorescent lamp", 7, { 3.527344, 1.000000, 1.265625, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -7, { 1.000000, 1.347368, 5.963158, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -6, { 1.000000, 1.224880, 5.167464, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -5, { 1.000000, 1.117904, 4.484716, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -4, { 1.000000, 1.028112, 3.911647, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -3, { 1.046875, 1.000000, 3.593750, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -2, { 1.125000, 1.000000, 3.386719, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", -1, { 1.203125, 1.000000, 3.179688, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 0, { 1.281250, 1.000000, 2.972656, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 1, { 1.433594, 1.000000, 2.792969, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 2, { 1.585938, 1.000000, 2.613281, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 3, { 1.742188, 1.000000, 2.437500, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 4, { 1.894531, 1.000000, 2.257812, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 5, { 2.046875, 1.000000, 2.078125, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 6, { 2.203125, 1.000000, 1.902344, 0 } }, + { "OLYMPUS", "C8080WZ", "3500K White fluorescent lamp", 7, { 2.355469, 1.000000, 1.722656, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -7, { 1.000000, 1.488372, 6.988372, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -6, { 1.000000, 1.347368, 6.026316, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -5, { 1.000000, 1.230769, 5.235577, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -4, { 1.000000, 1.132743, 4.566372, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -3, { 1.000000, 1.049180, 4.000000, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -2, { 1.023438, 1.000000, 3.589844, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", -1, { 1.093750, 1.000000, 3.371094, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 0, { 1.164062, 1.000000, 3.152344, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 1, { 1.300781, 1.000000, 2.960938, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 2, { 1.441406, 1.000000, 2.773438, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 3, { 1.582031, 1.000000, 2.582031, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 4, { 1.722656, 1.000000, 2.394531, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 5, { 1.722656, 1.000000, 2.394531, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 6, { 2.000000, 1.000000, 2.015625, 0 } }, + { "OLYMPUS", "C8080WZ", "3000K Tungsten", 7, { 2.140625, 1.000000, 1.828125, 0 } }, +// Fin ajout + { "OLYMPUS", "E-1", "3000K Tungsten", -7, { 1.015625, 1, 1.867188, 0 } }, { "OLYMPUS", "E-1", "3000K Tungsten", -6, { 1.007812, 1, 1.875000, 0 } }, { "OLYMPUS", "E-1", "3000K Tungsten", -5, { 1, 1, 1.890625, 0 } }, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-packager
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2-packager checked in at Wed Mar 29 16:55:21 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-03-28 17:43:06.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-03-29 12:21:45.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Mar 29 11:46:29 CEST 2006 - locilka(a)suse.cz + +- Merged proofread texts for SignatureCheckDialogs +- Adjusted dialogs for SignatureCheckDialogs to show informative + icons/images (warning/error/question). +- Improved SignatureCheckDialogs UI +- Stopping ZMD after the Sync is done when is wasn't running before + (#161279) +- 2.13.55 + +------------------------------------------------------------------- +Wed Mar 29 08:59:34 CEST 2006 - locilka(a)suse.cz + +- Moving ZMD sync from pkg_finish to SourceManager module (#161279) + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.54.tar.bz2 New: ---- yast2-packager-2.13.55.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.SfVI2Q/_old 2006-03-29 16:53:58.000000000 +0200 +++ /var/tmp/diff_new_pack.SfVI2Q/_new 2006-03-29 16:53:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.54) +# spec file for package yast2-packager (Version 2.13.55) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.54 +Version: 2.13.55 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.54.tar.bz2 +Source0: yast2-packager-2.13.55.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -41,7 +41,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.54 +%setup -n yast2-packager-2.13.55 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,16 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Wed Mar 29 2006 - locilka(a)suse.cz +- Merged proofread texts for SignatureCheckDialogs +- Adjusted dialogs for SignatureCheckDialogs to show informative + icons/images (warning/error/question). +- Improved SignatureCheckDialogs UI +- Stopping ZMD after the Sync is done when is wasn't running before + (#161279) +- 2.13.55 +* Wed Mar 29 2006 - locilka(a)suse.cz +- Moving ZMD sync from pkg_finish to SourceManager module (#161279) * Tue Mar 28 2006 - locilka(a)suse.cz - Added the first implementation of SignatureCheckDialogs module. - 2.13.54 ++++++ yast2-packager-2.13.54.tar.bz2 -> yast2-packager-2.13.55.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/VERSION new/yast2-packager-2.13.55/VERSION --- old/yast2-packager-2.13.54/VERSION 2006-03-28 13:41:14.000000000 +0200 +++ new/yast2-packager-2.13.55/VERSION 2006-03-29 12:21:19.000000000 +0200 @@ -1 +1 @@ -2.13.54 +2.13.55 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/configure new/yast2-packager-2.13.55/configure --- old/yast2-packager-2.13.54/configure 2006-03-28 17:45:55.000000000 +0200 +++ new/yast2-packager-2.13.55/configure 2006-03-29 14:10:19.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.54. +# Generated by GNU Autoconf 2.59 for yast2-packager 2.13.55. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.13.54' -PACKAGE_STRING='yast2-packager 2.13.54' +PACKAGE_VERSION='2.13.55' +PACKAGE_STRING='yast2-packager 2.13.55' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -728,7 +728,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-packager 2.13.54 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.13.55 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.13.54:";; + short | recursive ) echo "Configuration of yast2-packager 2.13.55:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.13.54 +yast2-packager configure 2.13.55 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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-packager $as_me 2.13.54, which was +It was created by yast2-packager $as_me 2.13.55, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.13.54' + VERSION='2.13.55' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.54" +VERSION="2.13.55" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2695,7 +2695,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-packager $as_me 2.13.54, which was +This file was extended by yast2-packager $as_me 2.13.55, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2750,7 +2750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.13.54 +yast2-packager config.status 2.13.55 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/configure.in new/yast2-packager-2.13.55/configure.in --- old/yast2-packager-2.13.54/configure.in 2006-03-28 17:45:50.000000000 +0200 +++ new/yast2-packager-2.13.55/configure.in 2006-03-29 14:10:14.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.54, http://www.suse.de/feedback, yast2-packager) +AC_INIT(yast2-packager, 2.13.55, http://www.suse.de/feedback, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.54" +VERSION="2.13.55" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/src/clients/pkg_finish.ycp new/yast2-packager-2.13.55/src/clients/pkg_finish.ycp --- old/yast2-packager-2.13.54/src/clients/pkg_finish.ycp 2006-03-28 13:42:10.000000000 +0200 +++ new/yast2-packager-2.13.55/src/clients/pkg_finish.ycp 2006-03-29 09:09:51.000000000 +0200 @@ -7,9 +7,8 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> - * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: pkg_finish.ycp 29461 2006-03-28 11:42:01Z locilka $ + * $Id: pkg_finish.ycp 29493 2006-03-29 07:09:43Z locilka $ * */ @@ -18,169 +17,11 @@ textdomain "packager"; import "Installation"; -import "Report"; -import "Message"; any ret = nil; string func = ""; map param = $[]; - // ------------------------------------------------------------------------------------------------------ - // adding YaST installation source into the ZMD - - /** - * Runs a bash command with timeout. - * @struct Returns map $[ - * "exit" : int_return_code, - * "stdout" : [ "script", "stdout", "lines" ], - * "stderr" : [ "script", "stderr", "lines" ], - * ] - * - * @param string command - * @param integer timeout in sec. - * @return map with out, err and ret_code - */ - map RunCommandWithTimeout (string run_command, integer script_time_out) { - y2milestone("Running command \"%1\" in background...", run_command); - - boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command); - if (!started) { - y2error("Cannot run '%1'", run_command); - return nil; - } - - list<string> script_out = []; - list<string> script_err = []; - integer time_spent = 0; - integer return_code = nil; - boolean cont_loop = true; - integer sleep_step = 20; - script_time_out = script_time_out * 1000; - - // while continuing is needed and while it is possible - while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) { - // time-out - if (time_spent >= script_time_out) { - y2error("Command '%1' timed-out after %2 mces", run_command, time_spent); - cont_loop = false; - } - - time_spent = time_spent + sleep_step; - sleep(sleep_step); - } - y2milestone("Time spent: %1 msec", time_spent); - - // fetching the return code if not timed-out - if (cont_loop) { - script_out = (list<string>) SCR::Read(.background.newout); - script_err = (list<string>) SCR::Read(.background.newerr); - return_code = (integer) SCR::Read(.background.status); - } - SCR::Execute(.background.kill, ""); - - map command_ret = $[ - "exit" : return_code, - "stdout" : script_out, - "stderr" : script_err, - ]; - return command_ret; - } - - /** - * Returns count of services matching the pattern. Returns 'nil' - * if something fails. - * - * @param string grep_pattern to match the ZYPP service - * @return integer count of matching lines - */ - integer CountOfZMDServicesMatching (string grep_pattern) { - map ret = RunCommandWithTimeout( - sformat("TERM=dumb /usr/bin/rug service-list; exit $?"), - 60 - ); - if (ret != nil && ret["stdout"]:nil != nil) { - list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], { - return regexpmatch(one_line, grep_pattern); - }); - return size(matching); - } else { - y2error("Counting of services failed, returned %1", ret); - return nil; - } - } - - /* Adds a ZYPP service into ZMD */ - boolean AddZYPPServiceIntoZMD () { - map ret = RunCommandWithTimeout( - "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?", - 60 - ); - if (ret != nil && ret["exit"]:nil == 0) { - return true; - } else { - y2error("Adding ZYPP service failed, returned %1", ret); - return false; - } - } - - /** - * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed - * in the ZMD services, adds one if it is missing. - * Everything is done via the .background agent with timeout (number in seconds). - */ - boolean SyncYaSTInstSourceWithZMD () { - // Notes for maintainer: - // - using .background agent because of ZMD/rug call that can stuck - // - using 'exit $?' that work well with ZMD/rug and .background together - // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug - - y2milestone("--- Syncing YaST inst source with ZMD ---"); - string zmd_service_name = "/etc/init.d/novell-zmd"; - string rug_command = "/usr/bin/rug"; - - // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD' - map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); - y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); - if (zmd_status == nil || zmd_status["exit"]:nil != 0) { - // Starting the service - map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60); - y2milestone("ZMD start: %1", zmd_start); - // Checking the status after start - map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); - y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); - if (zmd_status == nil || zmd_status["exit"]:nil != 0) { - Report::Error(Message::CannotStartService(zmd_service_name)); - y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status); - y2milestone("--- Syncing finished ---"); - return false; - } - } - - // Check whether the ZYPP service is already in zmd db or not - integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*"); - if (count_of_services == nil) { - y2warning("Cannot get list of services..."); - } else if (count_of_services > 0) { - y2milestone("ZYPP service already presented (%1)", count_of_services); - y2milestone("--- Syncing finished ---"); - return true; - } - - // Count of services were 'nil' or '0' - if (AddZYPPServiceIntoZMD()) { - y2milestone("Adding ZYPP service succeeded"); - } else { - Report::Error(Message::CannotWriteSettingsTo("ZMD")); - y2error("Adding ZYPP service failed"); - } - - y2milestone("--- Syncing finished ---"); - return true; - } - - // adding YaST installation source into the ZMD - // ------------------------------------------------------------------------------------------------------ - /* Check arguments */ if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { func = (string)WFM::Args(0); @@ -203,9 +44,6 @@ } else if (func == "Write") { - // Bug 156030 + 161299 - YaST installation sources must be synced with ZMD - boolean sync_ret = SyncYaSTInstSourceWithZMD(); - Pkg::SourceCacheCopyTo (Installation::destdir); // disable all sources and finish target diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.55/src/modules/SignatureCheckDialogs.ycp --- old/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp 2006-03-28 17:31:05.000000000 +0200 +++ new/yast2-packager-2.13.55/src/modules/SignatureCheckDialogs.ycp 2006-03-29 13:47:33.000000000 +0200 @@ -16,22 +16,39 @@ import "Popup"; // Defining icons for dialogs - term error_icon = `Empty(); - term warning_icon = `Empty(); - term question_icon = `Empty(); - -// TODO: support icons -// /** -// * Module constructor -// */ -// global void InitDialogs () { -// map ui_capabilities = UI::GetDisplayInfo(); -// if (ui_capabilities["HasLocalImageSupport"]:false) { -// error_icon = `HBox(`Image("error", ""), `HSpacing(1)); -// warning_icon = `HBox(`Image("warning", ""), `HSpacing(1)); -// question_icon = `HBox(`Image("question", ""), `HSpacing(1)); -// } -// } + map <string, string> msg_icons = $[ + "error" : "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_error.png", + "warning" : "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_warning.png", + "question" : "/usr/share/YaST2/theme/current/icons/32x32/apps/msg_warning.png", + ]; + + // UI can show images + boolean has_local_image_support = nil; + + /** + * Returns term with message icon + * + * @param string message type "error", "warning" or "question" + * @return term `Image(...) with margins + */ + term MessageIcon (string msg_type) { + // lazy loading + if (has_local_image_support == nil) { + map ui_capabilities = UI::GetDisplayInfo(); + has_local_image_support = ui_capabilities["HasLocalImageSupport"]:false; + } + + // UI can show images + if (has_local_image_support) { + if (msg_icons[msg_type]:nil == nil) { + y2warning("Message type %1 not defined", msg_type); + return `Empty(); + } + return `MarginBox(1, 0.5, `Image(msg_icons[msg_type]:"", "[!]")); + } else { + return `Empty(); + } + } /** * Returns term of yes/no buttons @@ -127,30 +144,30 @@ global boolean UseUnsignedItem (symbol item_type, string item_name) { string description_text = sformat((item_type == `package ? // popup question, %1 stands for the package name - _("The package '%1' is not digitally signed. This means that the origin -of the integrity of the package can not be verified. Installing the package + _("The package %1 is not digitally signed. This means that the origin +and integrity of the package cannot be verified. Installing the package may put the integrity of your system at risk. -Do you want to install it anyway?") +Install it anyway?") : // popup question, %1 stands for the filename - _("The file '%1' is not digitally signed. This means that the origin -of the integrity of the file can not be verified. Using the file -may put the integrity of your system at risk. + _("The file %1 is not digitally signed. This means that the origin +and integrity of the file cannot be verified. Using the file may put +the integrity of your system at risk. -Do you want to use it anyway?") +Use it anyway?") ), item_name); UI::OpenDialog( `opt(`decorated), `VBox( `HBox ( - `VCenter(warning_icon), + `VCenter(MessageIcon("warning")), // popup heading `VCenter(`Heading( _("Signature Check Failed"))), `HStretch() ), - `Label(description_text), + `MarginBox(0.5, 0.5, `Label(description_text)), YesNoButtons(`no) ) ); @@ -174,20 +191,20 @@ global boolean UseCorruptedItem (symbol item_type, string item_name) { string description_text = sformat((item_type == `package ? // popup question, %1 stands for the package name - _("The integrity check for package '%1' failed. This means that + _("The integrity check for package %1 failed. This means that the package has been changed by accident or by an attacker -since the repository creator has signed it. Installing it +since the repository creator signed it. Installing it is a big risk for the integrity and security of your system. -Do you want to install it anyway?") +Install it anyway?") : // popup question, %1 stands for the filename - _("The integrity check for file '%1' failed. This means that + _("The integrity check for file %1 failed. This means that the file has been changed by accident or by an attacker -since the repository creator has signed it. Installing it +since the repository creator signed it. Installing it is a big risk for the integrity and security of your system. -Do you want to use it anyway?") +Use it anyway?") ), item_name); UI::OpenDialog( @@ -195,11 +212,11 @@ `VBox( // popup heading `HBox ( - `VCenter(error_icon), + `VCenter(MessageIcon("error")), `VCenter(`Heading( _("Validation Check Failed"))), `HStretch() ), - `Label(description_text), + `MarginBox(0.5, 0.5, `Label(description_text)), YesNoButtons(`no) ) ); @@ -223,30 +240,34 @@ global symbol ItemSignedWithUnknownSignature (symbol item_type, string item_name, string key_id) { string description_text = sformat((item_type == `package ? // popup question, %1 stands for the package name, %2 for the key ID - _("The package '%1' is digitally signed with an unknown GnuPG key '%2' -and we cannot find that key. This means that a trust relationship to the creator of the package -can not be established. Installing the package may put the integrity of your system at risk. + _("The package %1 is digitally signed with an unknown +GnuPG key '%2'. +This means that a trust relationship to the creator of the package +cannot be established. Installing the package may put the integrity +of your system at risk. -Do you want to install it anyway?") +Install it anyway?") : // popup question, %1 stands for the filename, %2 for the key ID - _("The file '%1' is digitally signed with an unknown GnuPG key '%2' -and we cannot find that key. This means that a trust relationship to the creator of the file -can not be established. Using the file may put the integrity of your system at risk. + _("The file %1 is digitally signed with an unknown +GnuPG key '%2'. +This means that a trust relationship to the creator of the file +cannot be established. Using the file may put the integrity +of your system at risk. -Do you want to use it anyway?") +Use it anyway?") ), item_name, key_id); UI::OpenDialog( `opt(`decorated), `VBox( `HBox ( - `VCenter(warning_icon), + `VCenter(MessageIcon("warning")), // popup heading - `VCenter(`Heading( _("Uknown GnuPG Key"))), + `VCenter(`Heading( _("Unknown GnuPG Key"))), `HStretch() ), - `Label(description_text), + `MarginBox(0.5, 0.5, `Label(description_text)), YesNoButtons(`no) ) ); @@ -274,40 +295,46 @@ */ global symbol ItemSignedWithPublicSignature (symbol item_type, string item_name, string key_id, string key_name) { string description_text = sformat((item_type == `package ? - // popup question, %1 stands for the package name - _("The package '%1' is digitally signed + // popup question, %1 stands for the package name, %2 for the key ID, %3 for the key name + _("The package %1 is digitally signed with key '%2 (%3)'. -There is no trust relationship to the owner of the key. You may chose to import -the key into your set of trusted keys in the Import dialog and then proceed -with the installation. You can also chose just to install the package anyway, -but be aware that packages from untrusted sources can put the integrity -of your system at risk.") + +There is no trust relationship to the owner of the key. +If you trust the owner, import the key into your set +of trusted keys then proceed with the installation. +Installing a package from an unknown source can put +the integrity of your system at risk. It is safest +to skip the package.") : - // popup question, %1 stands for the filename + // popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name _("The file '%1' is digitally signed with key '%2 (%3)'. -There is no trust relationship to the owner of the key. You may chose to import -the key into your set of trusted keys in the Import dialog and then proceed -with the installation. You can also chose just to use the file anyway, -but be aware that packages from untrusted sources can put the integrity -of your system at risk.") + +There is no trust relationship to the owner of the key. +If you trust the owner, import the key into your set +of trusted keys then proceed with the installation. +Installing a file from an unknown source can put +the integrity of your system at risk. It is safest +to skip it.") ), item_name, key_id, key_name); UI::OpenDialog( `opt(`decorated), `VBox( `HBox ( - `VCenter(warning_icon), + `VCenter(MessageIcon("warning")), // popup heading `VCenter(`Heading( _("Signed with Untrusted Public Key"))), `HStretch() ), - `Label(description_text), + `MarginBox(0.5, 0.5, `Label(description_text)), `HBox ( // push button - `PushButton(`id(`key_import), _("Key &Import Dialog")), + `PushButton(`id(`key_import), _("&Import Key")), + `HSpacing(1), // push button `PushButton(`id(`install), _("Install &Anyway")), + `HSpacing(1), // push button `PushButton(`id(`skip), _("&Skip Package")) ) @@ -332,42 +359,68 @@ * @return symbol */ global symbol ImportGPGKeyDialog (string key_id, string key_name, string key_location, string key_detailed_description) { - // FIXME: add somewhere this additional text - // additional warning text (kind of help) - string warning_text = sformat(_("The owner of the key may distribute updates, packages and package repositories -that will be considered trusted by your system and which will be offered for installation -and update without any further warning. Importing the key thus allows the key owner -to have a certain amount of control over the software on your system and you should -only do this if you trust her/him. YaST comes up with a warning dialog for every -package that's not signed by a trusted (imported) key; this will happen to packages -by the package creator with key '%1' if you chose not to import."), key_id); + // additional Richtext (HTML) warning text (kind of help), %1 stands for the key ID + string warning_text = sformat(_("<p>The owner of the key may distribute updates, +packages, and package repositories that your system will trust and offer +for installation and update without any further warning. In this way, +importing the key allows the key owner to have a certain amount of control +over the software on your system.</p> + +<p>Only trust a key if you are confident that the owner can be trusted. +A warning dialog opens for every package that is not signed by a trusted (imported) key. +If you do not import the key, packages created by the owner of key '%1' +show this warning.</p>"), key_id); + + // popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...) + string dialog_text = sformat(_("The GnuPG key '%1 (%2)' +has been found at '%3'. + +You can choose to import it into your keyring of trusted +public keys, meaning that you trust the owner of the key. +You should be sure that you can trust the owner and that +the key really belongs to that owner before importing it."), + key_id, key_name, key_location); UI::OpenDialog( `opt(`decorated), - `VBox( - `HBox ( - `VCenter(question_icon), - // popup heading - `VCenter(`Heading(_("Import Public GnuPG Key"))), - `HStretch() - ), - `Label(sformat( - // popup message, %1 stands for GPG key ID, %2 for key name, %3 for key location (URL or ...) - _("The GnuPG key '%1 (%2)' has been found -on location '%3'. - -You can chose to import it into your keyring of trusted public keys - that means -you trust the owner of the key. You should be sure that you can trust the owner -and that the key really belongs to that owner before considering to import it."), - key_id, key_name, key_location - )), `HBox ( - // push button - `PushButton(`id(`import), _("&Import")), - // push button - `PushButton(`id(`details), _("&Details")), - // push button - `PushButton(`id(`dont_import), _("Do &Not Import")) + `VSpacing(19), + // left-side help + `HWeight(3, + `VBox ( + `RichText(warning_text) + ) + ), + `HSpacing(1.5), + // dialog + `HWeight(5, + `VBox( + `Top ( + `VBox ( + `HBox ( + `VCenter(MessageIcon("question")), + // popup heading + `VCenter(`Heading(_("Import Public GnuPG Key"))), + `HStretch() + ), + // dialog message + `MarginBox(0.5, 0.5, `Label(dialog_text)) + ) + ), + // dialog buttons + `Bottom( + `HBox ( + // push button + `PushButton(`id(`import), _("&Import")), + `HSpacing(1), + // push button + `PushButton(`id(`details), _("&Details")), + `HSpacing(1), + // push button + `PushButton(`id(`dont_import), _("Do &Not Import")) + ) + ) + ) ) ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.13.54/src/modules/SourceManager.ycp new/yast2-packager-2.13.55/src/modules/SourceManager.ycp --- old/yast2-packager-2.13.54/src/modules/SourceManager.ycp 2006-03-28 15:51:57.000000000 +0200 +++ new/yast2-packager-2.13.55/src/modules/SourceManager.ycp 2006-03-29 11:52:17.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Anas Nashif <nashif(a)suse.de> * Status: Work in Progress * - * $Id: SourceManager.ycp 29470 2006-03-28 12:11:22Z visnov $ + * $Id: SourceManager.ycp 29499 2006-03-29 09:52:14Z locilka $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -681,5 +681,205 @@ return source_overview; } + // ------------------------------------------------------------------------------------------------------ + // adding YaST installation source into the ZMD + + /** + * Runs a bash command with timeout. + * @struct Returns map $[ + * "exit" : int_return_code, + * "stdout" : [ "script", "stdout", "lines" ], + * "stderr" : [ "script", "stderr", "lines" ], + * ] + * + * @param string command + * @param integer timeout in sec. + * @return map with out, err and ret_code + */ + map RunCommandWithTimeout (string run_command, integer script_time_out) { + y2milestone("Running command \"%1\" in background...", run_command); + + boolean started = (boolean) SCR::Execute(.background.run_output_err, run_command); + if (!started) { + y2error("Cannot run '%1'", run_command); + return nil; + } + + list<string> script_out = []; + list<string> script_err = []; + integer time_spent = 0; + integer return_code = nil; + boolean cont_loop = true; + integer sleep_step = 20; + script_time_out = script_time_out * 1000; + + // while continuing is needed and while it is possible + while (cont_loop && ((boolean) SCR::Read(.background.output_open) || (integer) SCR::Read(.background.pid) > 0)) { + // time-out + if (time_spent >= script_time_out) { + y2error("Command '%1' timed-out after %2 mces", run_command, time_spent); + cont_loop = false; + } + + time_spent = time_spent + sleep_step; + sleep(sleep_step); + } + y2milestone("Time spent: %1 msec", time_spent); + + // fetching the return code if not timed-out + if (cont_loop) { + script_out = (list<string>) SCR::Read(.background.newout); + script_err = (list<string>) SCR::Read(.background.newerr); + return_code = (integer) SCR::Read(.background.status); + } + SCR::Execute(.background.kill, ""); + + map command_ret = $[ + "exit" : return_code, + "stdout" : script_out, + "stderr" : script_err, + ]; + return command_ret; + } + + /** + * Returns count of services matching the pattern. Returns 'nil' + * if something fails. + * + * @param string grep_pattern to match the ZYPP service + * @return integer count of matching lines + */ + integer CountOfZMDServicesMatching (string grep_pattern) { + map ret = RunCommandWithTimeout( + sformat("TERM=dumb /usr/bin/rug service-list; exit $?"), + 60 + ); + if (ret != nil && ret["stdout"]:nil != nil) { + list <string> matching = filter (string one_line, (list <string>) ret["stdout"]:[], { + return regexpmatch(one_line, grep_pattern); + }); + return size(matching); + } else { + y2error("Counting of services failed, returned %1", ret); + return nil; + } + } + + /* Adds a ZYPP service into ZMD */ + boolean AddZYPPServiceIntoZMD () { + map ret = RunCommandWithTimeout( + "TERM=dumb /usr/bin/rug service-add --type=zypp /installation; rug subscribe zypp; exit $?", + 60 + ); + if (ret != nil && ret["exit"]:nil == 0) { + return true; + } else { + y2error("Adding ZYPP service failed, returned %1", ret); + return false; + } + } + + /* ZMD service name - used for starting and stopping ZMD */ + string zmd_service_name = "/etc/init.d/novell-zmd"; + + /** + * Stops zmd when it 'was not running'. + * It's expected that ZMD is running. + * + * @param boolean was_running + * @return boolean true if successful + */ + boolean StopZMDIfItWasNotRunning (boolean was_running) { + // It was running, nothing to change + if (was_running) return true; + + y2milestone("Stopping service ZMD %1", zmd_service_name); + map zmd_stop = RunCommandWithTimeout(sformat("TERM=dumb %1 stop; exit $?", zmd_service_name), 60); + y2milestone("ZMD stop: %1", zmd_stop); + if (zmd_stop == nil || zmd_stop["exit"]:nil != 0) { + y2error("Cannot stop service %1", zmd_service_name); + Report::Error(Message::CannotStopService(zmd_service_name)); + } + + y2milestone("ZMD stopped"); + return true; + } + + /** + * Checks whether ZMD is running, starts it when isn't. Checks whether a ZYPP source is listed + * in the ZMD services, adds one if it is missing. + * Everything is done via the .background agent with timeout (number in seconds). + * + * @return boolean whether the syncing succeeds + */ + global boolean SyncYaSTInstSourceWithZMD () { + // Notes for maintainer: + // - using .background agent because of ZMD/rug call that can stuck + // - using 'exit $?' that work well with ZMD/rug and .background together + // - using TERM=dumb to suppress colors, progress bars etc. from ZMD/rug + // - when the function finishes, it must leave ZMD in the same status (running/stopped) + // as it was when the function started + // + // WARNIG: this function starts ZMD and expects that LIBZYPP has no lock over + // the RPM database. You can run it only when the RPM is not locked + // otherwise the ZMD will block itself! + + y2milestone("--- Syncing YaST inst source with ZMD ---"); + string rug_command = "/usr/bin/rug"; + + // Check the ZMD status and start if not running, using 'exit $?' because of buggy behavior '.background vs. ZMD' + map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); + y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); + // If the ZMD wasn't running, we will try to start it and then we will have to stop it at the end + boolean zmd_was_running = ((integer)zmd_status["exit"]:nil==0 ? true:false); + + if (zmd_status == nil || zmd_status["exit"]:nil != 0) { + // Starting the service + map zmd_start = RunCommandWithTimeout(sformat("TERM=dumb %1 start; exit $?", zmd_service_name), 60); + y2milestone("ZMD start: %1", zmd_start); + // Checking the status after start + map zmd_status = RunCommandWithTimeout(sformat("TERM=dumb %1 ping 1>/dev/null; exit $?", rug_command), 60); + y2milestone("ZMD status: %1, err: %2", zmd_status["exit"]:nil, zmd_status["stderr"]:[]); + if (zmd_status == nil || zmd_status["exit"]:nil != 0) { + y2error("Cannot start service %1, returned %2", zmd_service_name, zmd_status); + Report::Error(Message::CannotStartService(zmd_service_name)); + + // In case of timeout + if (zmd_status == nil) StopZMDIfItWasNotRunning(zmd_was_running); + y2milestone("--- Syncing finished ---"); + return false; + } + } + + // Check whether the ZYPP service is already in zmd db or not + integer count_of_services = CountOfZMDServicesMatching(".*ZYPP.*/installation.*"); + if (count_of_services == nil) { + y2warning("Cannot get list of services..."); + } else if (count_of_services > 0) { + y2milestone("ZYPP service already presented (%1)", count_of_services); + + // Stop ZMD if needed + StopZMDIfItWasNotRunning(zmd_was_running); + y2milestone("--- Syncing finished ---"); + return true; + } + + // Count of services were 'nil' or '0' + if (AddZYPPServiceIntoZMD()) { + y2milestone("Adding ZYPP service succeeded"); + } else { + Report::Error(Message::CannotWriteSettingsTo("ZMD")); + y2error("Adding ZYPP service failed"); + } + + // Stop ZMD if needed + StopZMDIfItWasNotRunning(zmd_was_running); + y2milestone("--- Syncing finished ---"); + return true; + } + + // adding YaST installation source into the ZMD + // ------------------------------------------------------------------------------------------------------ + /* EOF */ -} +} \ No newline at end of file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit istanbul
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package istanbul checked in at Wed Mar 29 16:54:56 CEST 2006. -------- --- GNOME/istanbul/istanbul.changes 2006-03-07 00:30:10.000000000 +0100 +++ istanbul/istanbul.changes 2006-03-29 14:13:32.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 14:13:25 CEST 2006 - sbrabec(a)suse.cz + +- Fixed dependencies. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ istanbul.spec ++++++ --- /var/tmp/diff_new_pack.vDAZLF/_old 2006-03-29 16:53:25.000000000 +0200 +++ /var/tmp/diff_new_pack.vDAZLF/_new 2006-03-29 16:53:25.000000000 +0200 @@ -13,11 +13,13 @@ Name: istanbul BuildRequires: gnutls-devel gstreamer-plugins-devel gstreamer-plugins-excess intltool krb5 libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser python-devel python-gstreamer update-desktop-files Version: 0.1.1 -Release: 8 +Release: 13 License: GPL Group: Productivity/Other Autoreqprov: on -Requires: python-gnome python-gnome-extras +Requires: python-gnome python-gnome-extras python-gstreamer +# For theora codec: +Requires: gstreamer-plugins-extra Summary: Istanbul desktop session recorder URL: http://live.gnome.org/Istanbul Source: %{name}-%{version}.tar.bz2 @@ -63,6 +65,8 @@ %{_datadir}/pixmaps/istanbul.png %changelog -n istanbul +* Wed Mar 29 2006 - sbrabec(a)suse.cz +- Fixed dependencies. * Tue Mar 07 2006 - gekker(a)suse.de - remove python-cairo From BuildRequires, required by gtk-python * Mon Mar 06 2006 - gekker(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-ncurses
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Wed Mar 29 16:53:53 CEST 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-03-28 13:48:08.000000000 +0200 +++ yast2-ncurses/yast2-ncurses.changes 2006-03-29 14:46:07.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 29 14:44:34 CEST 2006 - gs(a)suse.de + +- Show/set correct status information for packages in versions view + (available packages) +- 2.13.16 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.13.15.tar.bz2 New: ---- yast2-ncurses-2.13.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.vK0mpn/_old 2006-03-29 16:53:39.000000000 +0200 +++ /var/tmp/diff_new_pack.vK0mpn/_new 2006-03-29 16:53:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.13.15) +# spec file for package yast2-ncurses (Version 2.13.16) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.13.15 +Version: 2.13.16 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.13.15.tar.bz2 +Source0: yast2-ncurses-2.13.16.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -40,7 +40,7 @@ %prep -%setup -n yast2-ncurses-2.13.15 +%setup -n yast2-ncurses-2.13.16 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,10 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Wed Mar 29 2006 - gs(a)suse.de +- Show/set correct status information for packages in versions view + (available packages) +- 2.13.16 * Tue Mar 28 2006 - gs(a)suse.de - YOU patch installation: avoid duplicate entries in package list, show download size, show scripts ++++++ yast2-ncurses-2.13.15.tar.bz2 -> yast2-ncurses-2.13.16.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.15/VERSION new/yast2-ncurses-2.13.16/VERSION --- old/yast2-ncurses-2.13.15/VERSION 2006-03-28 13:25:59.000000000 +0200 +++ new/yast2-ncurses-2.13.16/VERSION 2006-03-29 14:44:17.000000000 +0200 @@ -1 +1 @@ -2.13.15 +2.13.16 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.15/src/ObjectStatStrategy.cc new/yast2-ncurses-2.13.16/src/ObjectStatStrategy.cc --- old/yast2-ncurses-2.13.15/src/ObjectStatStrategy.cc 2006-03-15 17:25:00.000000000 +0100 +++ new/yast2-ncurses-2.13.16/src/ObjectStatStrategy.cc 2006-03-29 13:56:18.000000000 +0200 @@ -485,6 +485,7 @@ return false; } +#ifdef OLD_CODE // ok = slbPtr->set_status( newstatus ); ok = slbPtr->set_status( S_Update ); // FIXME only works for installed if ( ok ) @@ -495,6 +496,21 @@ slbPtr->setLicenceConfirmed (false); NCMIL << "Set user candidate returns: " << (ret?"true":"false") << endl; } +#endif + + // this package is the candidate now + ok = slbPtr->setCandidate( objPtr ); + NCMIL << "Set user candidate returns: " << (ok?"true":"false") << endl; + + if ( ok ) + { + // set new package status + ok = slbPtr->set_status( newstatus ); + + // the new candidate can have a different one + slbPtr->setLicenceConfirmed (false); + } + NCMIL << "Set status of: " << slbPtr->name() << " to: " << newstatus << " returns: " << (ok?"true":"false") << endl; @@ -518,6 +534,7 @@ return retStatus; } +#ifdef OLD_CODE // ZyppStatus status = slbPtr->status(); if (objPtr == slbPtr->candidateObj()) @@ -525,23 +542,28 @@ else if (slbPtr->hasInstalledObj() && slbPtr->installedObj()->edition() == objPtr->edition() ) retStatus = S_Del; -/* - if ( slbPtr->hasInstalledObj() - && slbPtr->edition() == slbPtr->getInstalledObj()->edition() ) +#endif + + ZyppStatus status = slbPtr->status(); + NCDBG << "STATUS of " << slbPtr->name() << ": " << slbPtr->status() << endl; + + if (slbPtr->hasInstalledObj() && + slbPtr->installedObj()->edition() == objPtr->edition() ) { // installed package: show status S_KeepInstalled or S_Delete if ( status == S_KeepInstalled || status == S_Del ) - retStatus = status; + retStatus = status; + } - else if ( slbPtr->isCandidateObj() ) + else if ( objPtr == slbPtr->candidateObj() ) { if ( status != S_KeepInstalled - && status != S_Del ) - retStatus = status; + && status != S_Del ) + retStatus = status; } // else show S_NoInst -*/ + return retStatus; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit vlan
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package vlan checked in at Wed Mar 29 16:53:34 CEST 2006. -------- --- vlan/vlan.changes 2006-01-25 21:42:41.000000000 +0100 +++ vlan/vlan.changes 2006-03-29 13:58:36.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 13:58:02 CEST 2006 - poeml(a)suse.de + +- updated README for usage of hardware descriptions for ETHERDEVICE + [#150771] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlan.spec ++++++ --- /var/tmp/diff_new_pack.COJEJP/_old 2006-03-29 16:53:00.000000000 +0200 +++ /var/tmp/diff_new_pack.COJEJP/_new 2006-03-29 16:53:00.000000000 +0200 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,7 +14,7 @@ BuildRequires: gcc-c++ URL: http://www.candelatech.com/~greear/vlan.html Version: 1.8 -Release: 28 +Release: 34 Summary: 802.1q VLAN Implementation for Linux License: GPL Group: Productivity/Networking/Other @@ -55,6 +55,9 @@ %attr(555,root,root) %{_sbindir}/vconfig %changelog -n vlan +* Wed Mar 29 2006 - poeml(a)suse.de +- updated README for usage of hardware descriptions for ETHERDEVICE + [#150771] * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Sun Jan 15 2006 - schwab(a)suse.de ++++++ README.SuSE ++++++ --- vlan/README.SuSE 2006-01-15 21:04:10.000000000 +0100 +++ vlan/README.SuSE 2006-03-29 13:57:44.000000000 +0200 @@ -10,7 +10,7 @@ The file should contain something like this: - ETHERDEVICE=eth0 + ETHERDEVICE="eth-id-xx:xx:xx:xx:xx:xx" IPADDR=10.11.1.1 NETMASK=255.255.255.0 NETWORK=10.11.1.0 @@ -18,9 +18,13 @@ STARTMODE=onboot The ETHERDEVICE variable specifies to which ethernet interface the -VLAN interface should be attached. All the other variables are standard -for configuring an IP interface (STARTMODE defines whether the interface -is automatically brought up at system boot time - this is usually of -concern for hotplugging devices, or interfaces that need to be brought -up manually. Setting it to onboot should be the right thing for VLAN -interfaces). +VLAN interface should be attached. Also refer to `man ifcfg-vlan`. It +could be a simple as "eth0", but in case that more than one interface +is present it is wise to use the hardware description instead, as +shown above. + +All the other variables are standard for configuring an IP interface +(STARTMODE defines whether the interface is automatically brought up +at system boot time - this is usually of concern for hotplugging +devices, or interfaces that need to be brought up manually. Setting it +to onboot should be the right thing for VLAN interfaces). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit util-linux
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package util-linux checked in at Wed Mar 29 16:52:55 CEST 2006. -------- --- util-linux/util-linux.changes 2006-03-28 17:54:13.000000000 +0200 +++ util-linux/util-linux.changes 2006-03-29 13:55:09.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 13:54:32 CEST 2006 - olh(a)suse.de + +- clearify comments about mac disk label handling in fdisk + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.0nLaQM/_old 2006-03-29 16:52:07.000000000 +0200 +++ /var/tmp/diff_new_pack.0nLaQM/_new 2006-03-29 16:52:07.000000000 +0200 @@ -20,7 +20,7 @@ Group: System/Base Autoreqprov: on Version: 2.12r -Release: 23 +Release: 24 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-%version.tar.bz2 Source2: nologin.c @@ -577,6 +577,8 @@ %endif %changelog -n util-linux +* Wed Mar 29 2006 - olh(a)suse.de +- clearify comments about mac disk label handling in fdisk * Tue Mar 28 2006 - hvogel(a)suse.de - more fixes for the fdiskwrap patch [#160822] * Tue Mar 21 2006 - okir(a)suse.de ++++++ util-linux-2.11q-fs_mac.diff ++++++ --- /var/tmp/diff_new_pack.0nLaQM/_old 2006-03-29 16:52:09.000000000 +0200 +++ /var/tmp/diff_new_pack.0nLaQM/_new 2006-03-29 16:52:09.000000000 +0200 @@ -31,9 +31,9 @@ +mac_info( void ) { + puts( + _("\n\tThere is a valid Mac label on this disk.\n" -+ "\tUnfortunately Linux cannot handle these\n" -+ "\tdisks at the moment. Nevertheless some\n" -+ "\tadvice:\n" ++ "\tUnfortunately fdisk(1) cannot handle these disks.\n" ++ "\tUse either pdisk or parted to modify the partition table.\n" ++ "\tNevertheless some advice:\n" + "\t1. fdisk will destroy its contents on write.\n" + "\t2. Be sure that this disk is NOT a still vital\n" + "\t part of a volume group. (Otherwise you may\n" @@ -225,7 +225,7 @@ } + + if (mac_label) { -+ printf(_("\tSorry - this fdisk cannot handle MAC disk labels." ++ printf(_("\tSorry - this fdisk cannot handle Mac disk labels." + "\n\tIf you want to add DOS-type partitions, create" + "\n\ta new empty DOS partition table first. (Use o.)" + "\n\tWARNING: " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit ttf-arphic
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package ttf-arphic checked in at Wed Mar 29 16:52:04 CEST 2006. -------- --- ttf-arphic/ttf-arphic.changes 2006-02-28 11:39:09.000000000 +0100 +++ ttf-arphic/ttf-arphic.changes 2006-03-29 15:59:42.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 15:59:23 CEST 2006 - mfabian(a)suse.de + +- add zh_SG to the provides for zh_CN and zh_HK to the provides + for zh_TW. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ttf-arphic.spec ++++++ --- /var/tmp/diff_new_pack.tpRWLP/_old 2006-03-29 16:50:09.000000000 +0200 +++ /var/tmp/diff_new_pack.tpRWLP/_new 2006-03-29 16:50:09.000000000 +0200 @@ -16,7 +16,7 @@ PreReq: %suseconfig_fonts_prereq Autoreqprov: on Version: 20001125 -Release: 593 +Release: 597 URL: http://www.arphic.com.tw/ # ttf files have been downloaded from debian. Source0: ttf-arphic.tar.bz2 @@ -43,7 +43,7 @@ %package -n ttf-arphic-bkai00mp Group: System/X11/Fonts Provides: scalable-font-zh-TW -Provides: locale(zh_TW) +Provides: locale(zh_TW;zh_HK) Requires: ttf-arphic Summary: AR PL KaitiM Big5 Chinese TrueType font by Arphic Technology @@ -61,7 +61,7 @@ %package -n ttf-arphic-bsmi00lp Group: System/X11/Fonts Provides: scalable-font-zh-TW -Provides: locale(zh_TW) +Provides: locale(zh_TW;zh_HK) Requires: ttf-arphic Summary: AR PL Mingti2L Big5 Chinese TrueType font by Arphic Technology @@ -79,7 +79,7 @@ %package -n ttf-arphic-gkai00mp Group: System/X11/Fonts Provides: scalable-font-zh-CN -Provides: locale(zh_CN) +Provides: locale(zh_CN;zh_SG) Requires: ttf-arphic Summary: AR PL KaitiM GB Chinese TrueType font by Arphic Technology @@ -97,7 +97,7 @@ %package -n ttf-arphic-gbsn00lp Group: System/X11/Fonts Provides: scalable-font-zh-CN -Provides: locale(zh_CN) +Provides: locale(zh_CN;zh_SG) Requires: ttf-arphic Summary: AR PL SungtiL GB Chinese TrueType font by Arphic Technology @@ -181,6 +181,9 @@ %config /usr/X11R6/lib/X11/fonts/truetype/fonts.scale.gbsn00lp %changelog -n ttf-arphic +* Wed Mar 29 2006 - mfabian(a)suse.de +- add zh_SG to the provides for zh_CN and zh_HK to the provides + for zh_TW. * Tue Feb 28 2006 - zsu(a)suse.de - add Provides: locale(zh_CN) or locale(zh_TW) to each sub package. * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit suseRegister
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package suseRegister checked in at Wed Mar 29 16:52:00 CEST 2006. -------- --- suseRegister/suseRegister.changes 2006-03-29 11:03:05.000000000 +0200 +++ suseRegister/suseRegister.changes 2006-03-29 15:25:41.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 15:24:52 CEST 2006 - mc(a)suse.de + +- start zmd as soon as possible + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.YlLHKx/_old 2006-03-29 16:51:36.000000000 +0200 +++ /var/tmp/diff_new_pack.YlLHKx/_new 2006-03-29 16:51:36.000000000 +0200 @@ -12,7 +12,7 @@ Name: suseRegister Version: 1.0 -Release: 33 +Release: 34 Summary: Registration tool Group: Productivity/Other License: GPL @@ -57,6 +57,8 @@ %changelog -n suseRegister * Wed Mar 29 2006 - mc(a)suse.de +- start zmd as soon as possible +* Wed Mar 29 2006 - mc(a)suse.de - set accept=mandatory if auto-args are send back * Tue Mar 28 2006 - mc(a)suse.de - add --ignore-failure to rug sa command [#160069] ++++++ suseRegister-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register --- old/suseRegister-1.0/suse_register 2006-03-29 10:58:55.000000000 +0200 +++ new/suseRegister-1.0/suse_register 2006-03-29 16:07:11.000000000 +0200 @@ -1154,6 +1154,8 @@ $msg = `$zmdInit start 2>&1`; $code = ($?>>8); + sleep 2; + foreach my $cnt (1..10) { if(-e $GUID_FILE) @@ -1168,7 +1170,7 @@ if($code != 0) { - logPrintExit("Cannot start zmd: ".($msg?$msg:""), 7); + logPrintExit("Cannot start zmd: ".($msg?$msg:"").($msg2?$msg2."($code)":"($code)"), 7); } } return $code; @@ -2062,6 +2064,9 @@ } openlog("suse_register", "ndelay,pid", 'user'); +# call this as soon as possible. +rugStart(); + if (defined $logfile && $logfile ne "") { open($LOGDESCR, ">> $logfile") or do { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Wed Mar 29 16:51:29 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 13:31:02.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-03-29 15:01:29.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 29 15:00:06 CEST 2006 - kkaempf(a)suse.de + +- report proper error if .rpm file can't be found (#160402) +- dont ask for media 0 +- rev 2751 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.P5E81x/_old 2006-03-29 16:49:38.000000000 +0200 +++ /var/tmp/diff_new_pack.P5E81x/_new 2006-03-29 16:49:38.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1 -Release: 20 +Release: 21 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -69,6 +69,10 @@ %changelog -n libzypp-zmd-backend * Wed Mar 29 2006 - kkaempf(a)suse.de +- report proper error if .rpm file can't be found (#160402) +- dont ask for media 0 +- rev 2751 +* Wed Mar 29 2006 - kkaempf(a)suse.de - call the correct 'getZYpp()' function. - fix argument parsing in resolve-dependencies (#161699) - rev 2748 ++++++ zmd-backend-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/MediaChangeCallback.h new/zmd-backend-7.1.1/src/MediaChangeCallback.h --- old/zmd-backend-7.1.1/src/MediaChangeCallback.h 2006-03-09 11:48:40.000000000 +0100 +++ new/zmd-backend-7.1.1/src/MediaChangeCallback.h 2006-03-29 14:57:27.000000000 +0200 @@ -6,7 +6,7 @@ | /_____||_| |_| |_| | | | \---------------------------------------------------------------------*/ -/** \file zmd/backend/MediaChangeCallback.cc +/** \file zmd/backend/MediaChangeCallback.h * */ @@ -48,23 +48,31 @@ DBG << "requestMedia(" << source << ", " << mediumNr << ", " << error << ", " << description << ")" << endl; - // request media via stdout + if (mediumNr > 0) { - std::cout << "10|" << mediumNr; + // request media via stdout - std::string product_name; + std::cout << "10|" << mediumNr; - // get name of the product - for (zypp::ResStore::iterator it = source.resolvables().begin(); it != source.resolvables().end(); it++) - { - // is it a product object? - if (zypp::isKind<zypp::Product>( *it )) + std::string product_name; + + // get name of the product + for (zypp::ResStore::iterator it = source.resolvables().begin(); it != source.resolvables().end(); it++) { - product_name = (*it)->name(); - break; - } + // is it a product object? + if (zypp::isKind<zypp::Product>( *it )) + { + product_name = (*it)->name(); + break; + } + } + + if (product_name.empty()) { + product_name = description; + } + + std::cout << "|" << product_name << std::endl; } - std::cout << "|" << product_name << std::endl; // and abort here. // This will end the 'transact' helper and its up to ZMD to evaluate the diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1/src/transact.cc new/zmd-backend-7.1.1/src/transact.cc --- old/zmd-backend-7.1.1/src/transact.cc 2006-03-28 22:25:32.000000000 +0200 +++ new/zmd-backend-7.1.1/src/transact.cc 2006-03-29 14:51:01.000000000 +0200 @@ -139,7 +139,7 @@ ZYPP_CAUGHT( expt_r ); result = 1; if (m_callback.mediaNr() != 0 // exception due to MediaChange callback ? - || !m_callback.description().empty()) + && !m_callback.description().empty()) { cerr << "Need media " << m_callback.mediaNr() << ": " << m_callback.description() << endl; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit horde
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package horde checked in at Wed Mar 29 16:50:01 CEST 2006. -------- --- horde/horde.changes 2006-03-27 15:07:41.000000000 +0200 +++ horde/horde.changes 2006-03-29 15:00:17.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 15:07:49 CEST 2006 - mmarek(a)suse.cz + +- fix insecure eval() calls (backport from 3.0.10 release) + [#161768] (eval.patch) + +------------------------------------------------------------------- New: ---- horde-3.0.9-eval.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ horde.spec ++++++ --- /var/tmp/diff_new_pack.7FS8h7/_old 2006-03-29 16:49:24.000000000 +0200 +++ /var/tmp/diff_new_pack.7FS8h7/_new 2006-03-29 16:49:24.000000000 +0200 @@ -17,10 +17,11 @@ Autoreqprov: on Requires: mod_php_any php-gettext php-mcrypt php-imap php-pear php-pear-log php-session php-dom php php5-pear-auth_sasl php5-pear-date php5-pear-db php5-pear-file php5-pear-mail php5-pear-mail_mime Version: 3.0.9 -Release: 9 +Release: 10 Source0: %{name}-%{version}.tar.bz2 Source2: README.SuSE Patch1: %{name}-%{version}-log.patch +Patch2: %{name}-%{version}-eval.patch URL: http://www.horde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -44,6 +45,7 @@ %prep %setup -q %patch1 +%patch2 grep -ErZl '/usr/(local/)?bin/php' . | \ xargs -0 sed -ri 's@/usr/(local/)?bin/php@/usr/bin/php5@' cp -a %{S:2} . @@ -84,6 +86,9 @@ %attr(0750, wwwrun, www) %dir /var/log/horde %changelog -n horde +* Wed Mar 29 2006 - mmarek(a)suse.cz +- fix insecure eval() calls (backport from 3.0.10 release) + [#161768] (eval.patch) * Mon Mar 27 2006 - mmarek(a)suse.cz - require php-dom, which is needed by the configuration tool [#159335] ++++++ horde-3.0.9-eval.patch ++++++ --- lib/Horde/Util.php +++ lib/Horde/Util.php @@ -71,7 +71,7 @@ if (func_num_args() == 0) { return false; } - $eval = false; + $include = false; $args = func_get_args(); $function = array_shift($args); if (is_array($function)) { @@ -82,17 +82,31 @@ ($function == 'include_once') || ($function == 'require') || ($function == 'require_once')) { - $eval = true; - } elseif (!function_exists($function) && - ($function != 'eval')) { + $include = true; + } elseif (!function_exists($function)) { return false; } ob_start(); - if ($eval) { - eval($function . " '" . implode(',', $args) . "';"); - } elseif ($function == 'eval') { - eval($args[0]); + if ($include) { + $file = implode(',', $args); + switch ($function) { + case 'include': + include $file; + break; + + case 'include_once': + include_once $file; + break; + + case 'require': + require $file; + break; + + case 'require_once': + require_once $file; + break; + } } else { call_user_func_array($function, $args); } --- services/help/index.php +++ services/help/index.php @@ -53,7 +53,7 @@ require HORDE_TEMPLATES . '/help/menu.inc'; } elseif ($show == 'about') { require $fileroot . '/lib/version.php'; - eval('$version = "' . ucfirst($module) . ' " . ' . String::upper($module) . '_VERSION;'); + $version = String::ucfirst($module) . ' ' . constant(String::upper($module) . '_VERSION'); $credits = Util::bufferOutput('include', $fileroot . '/docs/CREDITS'); $credits = String::convertCharset($credits, 'iso-8859-1', NLS::getCharset()); require HORDE_TEMPLATES . '/help/about.inc'; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit gfxboot
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package gfxboot checked in at Wed Mar 29 16:49:33 CEST 2006. -------- --- arch/i386/gfxboot/gfxboot.changes 2006-03-28 18:04:09.000000000 +0200 +++ gfxboot/gfxboot.changes 2006-03-29 16:35:23.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 16:35:12 CEST 2006 - snwint(a)suse.de + +- better 'welcome' screen + +------------------------------------------------------------------- Old: ---- gfxboot-3.2.17.tar.bz2 New: ---- gfxboot-3.2.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.18i6V2/_old 2006-03-29 16:48:20.000000000 +0200 +++ /var/tmp/diff_new_pack.18i6V2/_new 2006-03-29 16:48:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 3.2.17) +# spec file for package gfxboot (Version 3.2.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,10 +17,10 @@ Obsoletes: gfxboot-devel Autoreqprov: on Summary: Graphical Boot Logo for LILO and SYSLINUX -Version: 3.2.17 +Version: 3.2.18 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-3.2.17.tar.bz2 +Source: gfxboot-3.2.18.tar.bz2 Source1: NLD.tar.bz2 Source2: SLES.tar.bz2 Source3: SuSE.tar.bz2 @@ -58,6 +58,8 @@ /usr/share/gfxboot %changelog -n gfxboot +* Wed Mar 29 2006 - snwint(a)suse.de +- better 'welcome' screen * Tue Mar 28 2006 - snwint(a)suse.de - added new 'welcome' screen * Mon Mar 27 2006 - snwint(a)suse.de ++++++ NLD.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/NLD/Makefile new/themes/NLD/Makefile --- old/themes/NLD/Makefile 2006-03-28 17:54:35.000000000 +0200 +++ new/themes/NLD/Makefile 2006-03-29 16:29:36.000000000 +0200 @@ -17,7 +17,7 @@ DEFAULT_LANG = PIC_COMMON = timer_a.jpg -PIC_INSTALL = back.jpg welcome.jpg text*.jpg +PIC_INSTALL = back.jpg welcome.jpg text*.pcx PIC_BOOT = back-low.jpg FILES_INST = init languages $(TRANSLATIONS) 16x16.fnt kroete.dat \ ++++++ SLES.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SLES/Makefile new/themes/SLES/Makefile --- old/themes/SLES/Makefile 2006-03-28 17:54:26.000000000 +0200 +++ new/themes/SLES/Makefile 2006-03-29 16:29:26.000000000 +0200 @@ -17,7 +17,7 @@ DEFAULT_LANG = PIC_COMMON = timer_a.jpg -PIC_INSTALL = back.jpg welcome.jpg text*.jpg +PIC_INSTALL = back.jpg welcome.jpg text*.pcx PIC_BOOT = back-low.jpg FILES_INST = init languages $(TRANSLATIONS) 16x16.fnt kroete.dat \ ++++++ SuSE.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/Makefile new/themes/SuSE/Makefile --- old/themes/SuSE/Makefile 2006-03-28 16:18:18.000000000 +0200 +++ new/themes/SuSE/Makefile 2006-03-29 15:46:02.000000000 +0200 @@ -17,7 +17,7 @@ DEFAULT_LANG = PIC_COMMON = timer_a.jpg -PIC_INSTALL = back.jpg welcome.jpg text*.jpg +PIC_INSTALL = back.jpg welcome.jpg text*.pcx PIC_BOOT = back-low.jpg FILES_INST = init languages $(TRANSLATIONS) 16x16.fnt kroete.dat \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/bsplash.inc new/themes/SuSE/bsplash.inc --- old/themes/SuSE/bsplash.inc 2006-03-28 17:53:38.000000000 +0200 +++ new/themes/SuSE/bsplash.inc 2006-03-29 16:31:18.000000000 +0200 @@ -22,14 +22,14 @@ /.b_tmp2 11 def /bsplash.list [ - [ 680 45 -5 0 100 "text2a.jpg" -1 0 0 .undef .undef .undef ] - [ 680 95 -5 0 100 "text2b.jpg" -1 0 0 .undef .undef .undef ] - [ 680 145 -5 0 100 "text2c.jpg" -1 0 0 .undef .undef .undef ] - [ 690 470 -5 0 100 "text1.jpg" -50 0 0 .undef .undef .undef ] - [ 70 40 0 0 100 "text3.jpg" -80 0 0 .undef .undef .undef ] - [ 90 425 0 2 50 "text4a.jpg" -150 0 0 .undef .undef .undef ] - [ 90 485 0 0 50 "text4b.jpg" -150 0 0 .undef .undef .undef ] - [ 90 535 0 -2 50 "text4c.jpg" -150 0 0 .undef .undef .undef ] + [ 680 45 -20 0 10 "text2a.pcx" -1 0 0 .undef .undef .undef ] + [ 680 95 -20 0 10 "text2b.pcx" -1 0 0 .undef .undef .undef ] + [ 680 145 -20 0 10 "text2c.pcx" -1 0 0 .undef .undef .undef ] + [ 690 470 -20 0 10 "text1.pcx" -7 0 0 .undef .undef .undef ] + [ 70 40 0 0 10 "text3.pcx" -10 0 0 .undef .undef .undef ] + [ 90 415 0 20 10 "text4a.pcx" -15 0 0 .undef .undef .undef ] + [ 90 485 0 0 10 "text4b.pcx" -15 0 0 .undef .undef .undef ] + [ 90 535 0 -20 10 "text4c.pcx" -15 0 0 .undef .undef .undef ] ] def @@ -51,8 +51,8 @@ over .b_h get 2 index .b_steps get 3 index .b_dy get abs mul add savescreen over .b_back rot put - dup .b_w get over .b_h get savescreen over .b_tmp1 rot put - dup .b_w get over .b_h get savescreen over .b_tmp2 rot put + dup .b_w get 1 sub over .b_h get 1 sub savescreen over .b_tmp1 rot put + dup .b_w get 1 sub over .b_h get 1 sub savescreen over .b_tmp2 rot put } { pop } ifelse @@ -136,10 +136,11 @@ dup .b_tmp2 get over .b_tmp1 get over length memcpy % draw text - 0 0 moveto white over .b_mask get 2 index .b_tmp1 get blend + 0 0 moveto 0x333333 over .b_mask get 2 index .b_tmp1 get blend + 1 1 moveto white over .b_mask get 2 index .b_tmp1 get blend % blend result with background - dup .b_tmp1 get over .b_count get 255 mul 2 index .b_steps get div 2 index .b_tmp2 get blend + 0 0 moveto dup .b_tmp1 get over .b_count get 255 mul 2 index .b_steps get div 2 index .b_tmp2 get blend % show result dup .b_x get over .b_dx get 2 index .b_count get mul 10 div add Binary files old/themes/SuSE/text1.jpg and new/themes/SuSE/text1.jpg differ Binary files old/themes/SuSE/text1.pcx and new/themes/SuSE/text1.pcx differ Binary files old/themes/SuSE/text2a.jpg and new/themes/SuSE/text2a.jpg differ Binary files old/themes/SuSE/text2a.pcx and new/themes/SuSE/text2a.pcx differ Binary files old/themes/SuSE/text2b.jpg and new/themes/SuSE/text2b.jpg differ Binary files old/themes/SuSE/text2b.pcx and new/themes/SuSE/text2b.pcx differ Binary files old/themes/SuSE/text2c.jpg and new/themes/SuSE/text2c.jpg differ Binary files old/themes/SuSE/text2c.pcx and new/themes/SuSE/text2c.pcx differ Binary files old/themes/SuSE/text3.jpg and new/themes/SuSE/text3.jpg differ Binary files old/themes/SuSE/text3.pcx and new/themes/SuSE/text3.pcx differ Binary files old/themes/SuSE/text4a.jpg and new/themes/SuSE/text4a.jpg differ Binary files old/themes/SuSE/text4a.pcx and new/themes/SuSE/text4a.pcx differ Binary files old/themes/SuSE/text4b.jpg and new/themes/SuSE/text4b.jpg differ Binary files old/themes/SuSE/text4b.pcx and new/themes/SuSE/text4b.pcx differ Binary files old/themes/SuSE/text4c.jpg and new/themes/SuSE/text4c.jpg differ Binary files old/themes/SuSE/text4c.pcx and new/themes/SuSE/text4c.pcx differ ++++++ gfxboot-3.2.17.tar.bz2 -> gfxboot-3.2.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.17/Changelog new/gfxboot-3.2.18/Changelog --- old/gfxboot-3.2.17/Changelog 2006-03-28 18:02:45.000000000 +0200 +++ new/gfxboot-3.2.18/Changelog 2006-03-29 16:30:39.000000000 +0200 @@ -1,3 +1,6 @@ +29/3/2006: v3.2.18 + - better 'welcome' screen + 28/3/2006: v3.2.17 - added new 'welcome' screen diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.17/VERSION new/gfxboot-3.2.18/VERSION --- old/gfxboot-3.2.17/VERSION 2006-03-28 18:02:22.000000000 +0200 +++ new/gfxboot-3.2.18/VERSION 2006-03-29 16:30:20.000000000 +0200 @@ -1 +1 @@ -3.2.17 +3.2.18 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.17/bincode.asm new/gfxboot-3.2.18/bincode.asm --- old/gfxboot-3.2.17/bincode.asm 2006-02-09 16:09:16.000000000 +0100 +++ new/gfxboot-3.2.18/bincode.asm 2006-03-29 16:08:41.000000000 +0200 @@ -9442,8 +9442,8 @@ add ecx,ecx xor edx,edx div ecx - or eax,eax - jz prim_usleep_90 + ; or eax,eax + ; jz prim_usleep_90 mov ecx,eax push ecx call get_time ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit SuSEfirewall2
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package SuSEfirewall2 checked in at Wed Mar 29 16:49:19 CEST 2006. -------- --- SuSEfirewall2/SuSEfirewall2.changes 2006-03-06 16:33:04.000000000 +0100 +++ SuSEfirewall2/SuSEfirewall2.changes 2006-03-28 16:20:04.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 28 16:19:52 CEST 2006 - lnussel(a)suse.de + +- introduce FW_FORWARD_ALWAYS_INOUT_DEV for use with XEN (#154133) + +------------------------------------------------------------------- Old: ---- SuSEfirewall2-3.4_SVNr139.tar.bz2 New: ---- SuSEfirewall2-3.4_SVNr140.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.EqI8do/_old 2006-03-29 16:48:06.000000000 +0200 +++ /var/tmp/diff_new_pack.EqI8do/_new 2006-03-29 16:48:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package SuSEfirewall2 (Version 3.4_SVNr139) +# spec file for package SuSEfirewall2 (Version 3.4_SVNr140) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ # icecream 0 Name: SuSEfirewall2 -Version: 3.4_SVNr139 +Version: 3.4_SVNr140 Release: 1 License: GPL Group: Productivity/Networking/Security @@ -205,6 +205,8 @@ rm -rf %{buildroot} %changelog -n SuSEfirewall2 +* Tue Mar 28 2006 - lnussel(a)suse.de +- introduce FW_FORWARD_ALWAYS_INOUT_DEV for use with XEN (#154133) * Mon Mar 06 2006 - lnussel(a)suse.de - log and drop multicast packets separately in order to prevent flooding other log targets (#155326) ++++++ SuSEfirewall2-3.4_SVNr139.tar.bz2 -> SuSEfirewall2-3.4_SVNr140.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.4_SVNr139/EXAMPLES.html new/SuSEfirewall2-3.4_SVNr140/EXAMPLES.html --- old/SuSEfirewall2-3.4_SVNr139/EXAMPLES.html 2006-01-03 11:08:36.000000000 +0100 +++ new/SuSEfirewall2-3.4_SVNr140/EXAMPLES.html 2006-03-28 16:18:35.000000000 +0200 @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2 configuration examples</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.0" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2410433"></a>SuSEfirewall2 configuration examples</h1></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id2482864">1. Simple dialup</a></span></dt><dt><span class="section"><a href="#id2482885">2. Small home network</a></span></dt><dt><span class="section"><a href="#id2482907">3. Small home network with additional WLAN</a></span></dt><dt><span class="section"><a href="#id2460290">4. Small company with external mail and web server</a></span></dt><dt><span class="section"><a href="#id2460323">5. Company with IPsec tunnel to subsidiary</a></span></dt><dt><span class="section"><a href="#id2460397">6. Company with web server in DMZ</a></span></dt><dt><span class="section"><a href="#id2459845">7. Complex scenario</a></span></dt><dt><span class="section"><a href="#id2459967">8. Laptop in private network but with additional public IP adresses</a></span></dt></dl></div><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2 configuration examples</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2412343"></a>SuSEfirewall2 configuration examples</h1></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id2483278">1. Simple dialup</a></span></dt><dt><span class="section"><a href="#id2483299">2. Small home network</a></span></dt><dt><span class="section"><a href="#id2483321">3. Small home network with additional WLAN</a></span></dt><dt><span class="section"><a href="#id2460778">4. Small company with external mail and web server</a></span></dt><dt><span class="section"><a href="#id2460811">5. Company with IPsec tunnel to subsidiary</a></span></dt><dt><span class="section"><a href="#id2460887">6. Company with web server in DMZ</a></span></dt><dt><span class="section"><a href="#id2460309">7. Complex scenario</a></span></dt><dt><span class="section"><a href="#id2460432">8. Laptop in private network but with additional public IP adresses</a></span></dt></dl></div><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p> All options <span class="emphasis"><em>not</em></span> mentioned in a scenario should be left as they are in the default <code class="filename">sysconfig/SuSEfirewall2</code> config file. Backup default config: <code class="filename">/usr/share/doc/packages/SuSEfirewall2/SuSEfirewall2.sysconfig</code> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2482864"></a>1. Simple dialup</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483278"></a>1. Simple dialup</h2></div></div></div><p> A user with his nice SUSE Linux PC wants to be protected when connected to the internet via the ISDN dialup of his ISP. He wants to offer no services to the internet. He is not connected to any other network, nor @@ -15,7 +15,7 @@ </p><div class="informalexample"><pre class="programlisting"> FW_DEV_EXT="ippp0"</pre></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2482885"></a>2. Small home network</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483299"></a>2. Small home network</h2></div></div></div><p> A family owns multiple PCs, a SUSE Linux PC is connected to the internet via DSL. The family's LAN uses private IPs therefore masquerading has to be used. The Firewall provides no services whatsoever. The address of the @@ -27,7 +27,7 @@ FW_MASQUERADE="yes" FW_MASQ_NETS="192.168.10.0/24"</pre></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2482907"></a>3. Small home network with additional WLAN</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483321"></a>3. Small home network with additional WLAN</h2></div></div></div><p> Same network as above but additionally the Firewall is also connected to a wireless network. Hosts in the wireless network should get internet access but are not allowed to communicate with the internal network. The @@ -41,7 +41,7 @@ FW_MASQUERADE="yes" FW_MASQ_NETS="192.168.10.0/24 192.168.20.0/24"</pre></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460290"></a>4. Small company with external mail and web server</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460778"></a>4. Small company with external mail and web server</h2></div></div></div><p> A company uses it's SUSE Linux PC to access the internet via an ISDN dialup of it's ISP. It has got a static IP address and a web server running on the PC plus it's mail-/pop3-server for the company. Squid is @@ -56,7 +56,7 @@ FW_SERVICES_INT_UDP="domain" FW_PROTECT_FROM_INT="yes"</pre></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460323"></a>5. Company with IPsec tunnel to subsidiary</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460811"></a>5. Company with IPsec tunnel to subsidiary</h2></div></div></div><p> A small company wants access to the internet for it's client PCs. Additionally the subsidiariaries client PCs should get access to the local network through an IPsec tunnel. Internet traffic should be @@ -83,7 +83,7 @@ flow. </p></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460397"></a>6. Company with web server in DMZ</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460887"></a>6. Company with web server in DMZ</h2></div></div></div><p> This company has got a more complex setup: @@ -149,7 +149,7 @@ target port of 53 (DNS) or 25 (Mail) to the local servers on the firewall. - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2459845"></a>7. Complex scenario</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460309"></a>7. Complex scenario</h2></div></div></div><p> </p><pre class="screen"> Internet @@ -207,7 +207,7 @@ # internet access to web server and trusted company access to internal Server FW_FORWARD_MASQ="0/0,10.0.10.2,tcp,80 0/0,10.0.10.2,tcp,443 \ 192.168.1.0/24,10.0.2.3,tcp,22"</pre></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2459967"></a>8. Laptop in private network but with additional public IP adresses</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460432"></a>8. Laptop in private network but with additional public IP adresses</h2></div></div></div><p> </p><pre class="screen"> Internet diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.4_SVNr139/FAQ.html new/SuSEfirewall2-3.4_SVNr140/FAQ.html --- old/SuSEfirewall2-3.4_SVNr139/FAQ.html 2006-01-03 11:08:39.000000000 +0100 +++ new/SuSEfirewall2-3.4_SVNr140/FAQ.html 2006-03-28 16:18:39.000000000 +0200 @@ -1,37 +1,37 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2 FAQ</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.0" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2410433"></a>SuSEfirewall2 FAQ</h1></div></div><hr /></div><div class="qandaset"><dl><dt>1. <a href="#id2459642"> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2 FAQ</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2412343"></a>SuSEfirewall2 FAQ</h1></div></div><hr /></div><div class="qandaset"><dl><dt>1. <a href="#id2483245"> How do I allow access to my application XYZ on my firewall? - </a></dt><dt>2. <a href="#id2482887"> + </a></dt><dt>2. <a href="#id2483302"> How can I reduce the generated rule set as much as possible? - </a></dt><dt>3. <a href="#id2460331"> + </a></dt><dt>3. <a href="#id2460818"> How can I be sure that the firewall rules are active when I connect to the internet? - </a></dt><dt>4. <a href="#id2460385"> + </a></dt><dt>4. <a href="#id2460873"> How many interfaces are supported for each zone (EXT/DMZ/INT)? - </a></dt><dt>5. <a href="#id2460403"> + </a></dt><dt>5. <a href="#id2460891"> Why is communication between two interfaces in the same zone not working? - </a></dt><dt>6. <a href="#id2459774"> + </a></dt><dt>6. <a href="#id2460920"> I have set a web server in my DMZ. How do I configure SuSEfirewall2 to let people on the internet access my pages? - </a></dt><dt>7. <a href="#id2459807"> + </a></dt><dt>7. <a href="#id2460271"> What if my Server has a private IP address, how do I enable external access then? - </a></dt><dt>8. <a href="#id2459855">Some service does not work when the firewall is enabled. How do I find out what's wrong? - </a></dt><dt>9. <a href="#id2459929"> + </a></dt><dt>8. <a href="#id2460318">Some service does not work when the firewall is enabled. How do I find out what's wrong? + </a></dt><dt>9. <a href="#id2460392"> Some web site that offers port scanning claims my system is not protected properly as it still responds to ICMP echo requests (ping) - </a></dt><dt>10. <a href="#id2459952"> + </a></dt><dt>10. <a href="#id2460416"> Can't the evil guys detect whether my host is online if it responds to ICMP echo requests? - </a></dt><dt>11. <a href="#id2459972"> + </a></dt><dt>11. <a href="#id2460436"> SuSEfirewall2 drops most packets but it doesn't fully hide the presence of my machine. Isn't that a security hole? - </a></dt><dt>12. <a href="#id2459993"> + </a></dt><dt>12. <a href="#id2460457"> The ipsec0 interface I had with kernel 2.4 is gone. How do I assign IPsec traffic to a different zone now? - </a></dt><dt>13. <a href="#id2460044"> + </a></dt><dt>13. <a href="#id2460508"> Why is SuSEfirewall2 so slow? / Can't you just use iptables-restore? - </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%" /><tbody><tr class="question"><td align="left" valign="top"><a id="id2459642"></a><a id="id2459644"></a><b>1.</b></td><td align="left" valign="top"><p> + </a></dt></dl><table border="0" summary="Q and A Set"><col align="left" width="1%" /><tbody><tr class="question"><td align="left" valign="top"><a id="id2483245"></a><a id="id2483247"></a><b>1.</b></td><td align="left" valign="top"><p> How do I allow access to my application XYZ on my firewall? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -48,7 +48,7 @@ into <code class="varname">FW_SERVICES_EXT_TCP</code> and execute <span><strong class="command">SuSEfirewall2</strong></span> again. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2482887"></a><a id="id2482889"></a><b>2.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2483302"></a><a id="id2483304"></a><b>2.</b></td><td align="left" valign="top"><p> How can I reduce the generated rule set as much as possible? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><div class="itemizedlist"><ul type="disc"><li><p> Set <code class="varname">FW_PROTECT_FROM_INTERNAL</code> to <code class="literal">"no"</code> @@ -65,7 +65,7 @@ Then you will have got much less rules, but also a lesser security. Better spend 50$ on a faster processor and more ram instead of using an old 486 as firewall. - </p></li></ul></div></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460331"></a><a id="id2460333"></a><b>3.</b></td><td align="left" valign="top"><p> + </p></li></ul></div></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460818"></a><a id="id2460820"></a><b>3.</b></td><td align="left" valign="top"><p> How can I be sure that the firewall rules are active when I connect to the internet? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -78,11 +78,11 @@ packet filtering rules are actually installed with the command <span><strong class="command">SuSEfirewall2 status</strong></span> - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460385"></a><a id="id2460387"></a><b>4.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460873"></a><a id="id2460875"></a><b>4.</b></td><td align="left" valign="top"><p> How many interfaces are supported for each zone (EXT/DMZ/INT)? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> Any number you want - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460403"></a><a id="id2460405"></a><b>5.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460891"></a><a id="id2460893"></a><b>5.</b></td><td align="left" valign="top"><p> Why is communication between two interfaces in the same zone not working? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -93,7 +93,7 @@ traffic with <code class="varname">FW_FORWARD</code>. Keep in mind that this affects all interfaces in all zones. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2459774"></a><a id="id2459776"></a><b>6.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460920"></a><a id="id2460922"></a><b>6.</b></td><td align="left" valign="top"><p> I have set a web server in my DMZ. How do I configure SuSEfirewall2 to let people on the internet access my pages? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -103,7 +103,7 @@ just configure <code class="varname">FW_FORWARD_TCP</code> like this: </p><div class="informalexample"><pre class="programlisting">FW_FORWARD="0/0,1.1.1.1,tcp,80"</pre></div><p> - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2459807"></a><a id="id2459809"></a><b>7.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460271"></a><a id="id2460273"></a><b>7.</b></td><td align="left" valign="top"><p> What if my Server has a private IP address, how do I enable external access then? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -118,7 +118,7 @@ FW_MASQUERADE="yes" FW_FORWARD_MASQ="0/0,10.0.0.1,tcp,80"</pre></div><p> - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2459855"></a><a id="id2459857"></a><b>8.</b></td><td align="left" valign="top"><p>Some service does not work when the firewall is enabled. How do I find out what's wrong? + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460318"></a><a id="id2460320"></a><b>8.</b></td><td align="left" valign="top"><p>Some service does not work when the firewall is enabled. How do I find out what's wrong? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> Enable logging of all dropped packets and disable the log limit in @@ -146,7 +146,7 @@ If everything works again don't forget to set the log options back to normal to not fill up you log files. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2459929"></a><a id="id2459931"></a><b>9.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460392"></a><a id="id2460394"></a><b>9.</b></td><td align="left" valign="top"><p> Some web site that offers port scanning claims my system is not protected properly as it still responds to ICMP echo requests (ping) </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -155,20 +155,20 @@ seriously impact the ability to track down network problems. It is therefore not considered nice behaviour for an internet citizen to drop pings. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2459952"></a><a id="id2459954"></a><b>10.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460416"></a><a id="id2460418"></a><b>10.</b></td><td align="left" valign="top"><p> Can't the evil guys detect whether my host is online if it responds to ICMP echo requests? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> Yes but they can detect that anyways. The router at your provider behaves different depending on whether someone is dialed in or not. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2459972"></a><a id="id2459975"></a><b>11.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460436"></a><a id="id2460438"></a><b>11.</b></td><td align="left" valign="top"><p> SuSEfirewall2 drops most packets but it doesn't fully hide the presence of my machine. Isn't that a security hole? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> You machine is never fully invisible, see previous question. The purpose of dropping packets is not to hide your machine but to slow down port scans. - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2459993"></a><a id="id2459996"></a><b>12.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460457"></a><a id="id2460459"></a><b>12.</b></td><td align="left" valign="top"><p> The <code class="literal">ipsec0</code> interface I had with kernel 2.4 is gone. How do I assign IPsec traffic to a different zone now? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> @@ -184,7 +184,7 @@ FW_SERVICES_EXT_UDP="isakmp" FW_PROTECT_FROM_INT="no"</pre></div><p> - </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460044"></a><a id="id2460046"></a><b>13.</b></td><td align="left" valign="top"><p> + </p></td></tr><tr class="question"><td align="left" valign="top"><a id="id2460508"></a><a id="id2460510"></a><b>13.</b></td><td align="left" valign="top"><p> Why is SuSEfirewall2 so slow? / Can't you just use iptables-restore? </p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.4_SVNr139/README.html new/SuSEfirewall2-3.4_SVNr140/README.html --- old/SuSEfirewall2-3.4_SVNr139/README.html 2006-01-03 11:08:42.000000000 +0100 +++ new/SuSEfirewall2-3.4_SVNr140/README.html 2006-03-28 16:18:42.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.0" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2410433"></a>SuSEfirewall2</h1></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id2459640">1. Introduction</a></span></dt><dt><span class="section"><a href="#id2482919">2. Quickstart</a></span></dt><dd><dl><dt><span class="section"><a href="#id2482924">2.1. YaST2 firewall module</a></span></dt><dt><span class="section"><a href="#id2460296">2.2. Manual configuration</a></span></dt></dl></dd><dt><span class="section"><a href="#id2460355">3. Some words about security</a></span></dt><dt><span class="section"><a href="#id2459800">4. Reporting bugs</a></span></dt><dt><span class="section"><a href="#id2459824">5. Links</a></span></dt></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2459640"></a>1. Introduction</h2></div></div></div><p> +<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>SuSEfirewall2</title><link rel="stylesheet" href="susebooks.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.69.1" /></head><body><div class="article" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="id2412343"></a>SuSEfirewall2</h1></div></div><hr /></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="#id2460133">1. Introduction</a></span></dt><dt><span class="section"><a href="#id2483332">2. Quickstart</a></span></dt><dd><dl><dt><span class="section"><a href="#id2483337">2.1. YaST2 firewall module</a></span></dt><dt><span class="section"><a href="#id2460784">2.2. Manual configuration</a></span></dt></dl></dd><dt><span class="section"><a href="#id2460842">3. Some words about security</a></span></dt><dt><span class="section"><a href="#id2460264">4. Reporting bugs</a></span></dt><dt><span class="section"><a href="#id2460288">5. Links</a></span></dt></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460133"></a>1. Introduction</h2></div></div></div><p> <code class="literal">SuSEfirewall2</code> is a shell script wrapper for the Linux firewall setup tool (<code class="literal">iptables</code>). It's controlled by a @@ -12,14 +12,14 @@ </p><div class="itemizedlist"><ul type="disc"><li><p>sets up secure filter rules by default</p></li><li><p>easy to configure</p></li><li><p>requires only a small configuration effort</p></li><li><p>zone based setup. Interfaces are grouped into zones</p></li><li><p>supports an arbitrary number of zones</p></li><li><p>supports forwarding, masquerading, port redirection</p></li><li><p>supports RPC services with dynamically assigned ports</p></li><li><p>allows special treatment of IPsec packets</p></li><li><p>IPv6 support (no forwarding/masquerading)</p></li><li><p>allows insertion of custom rules through hooks</p></li></ul></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2482919"></a>2. Quickstart</h2></div></div></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2482924"></a>2.1. YaST2 firewall module</h3></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2483332"></a>2. Quickstart</h2></div></div></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2483337"></a>2.1. YaST2 firewall module</h3></div></div></div><p> The YaST2 firewall module is the recommended tool for configuring SuSEfirewall2. It offers the most common features with a nice user interface and help texts. It also takes care of proper activation of the init scripts. - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2460296"></a>2.2. Manual configuration</h3></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2460784"></a>2.2. Manual configuration</h3></div></div></div><p> Enable the SuSEfirewall2 boot scripts: @@ -37,7 +37,7 @@ <code class="filename">EXAMPLES</code> file in <code class="filename">/usr/share/doc/packages/SuSEfirewall2</code> - </p></div></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460355"></a>3. Some words about security</h2></div></div></div><p> + </p></div></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460842"></a>3. Some words about security</h2></div></div></div><p> SuSEfirewall2 is a frontend for iptables which sets up kernel packet filters, nothing more and nothing less. This means that you are not @@ -76,13 +76,13 @@ Check your log files regularly for unusual entries. </p></li></ul></div><p> - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2459800"></a>4. Reporting bugs</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460264"></a>4. Reporting bugs</h2></div></div></div><p> Report any problems via <a href="http://www.suse.de/feedback" target="_top">http://www.suse.de/feedback</a>. For discussion about SuSEfirewall2 join the <a href="http://www.suse.com/us/private/support/online_help/mailinglists/index.html" target="_top">suse-security</a> mailinglist. - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2459824"></a>5. Links</h2></div></div></div><p> + </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2460288"></a>5. Links</h2></div></div></div><p> <a href="EXAMPLES.html" target="_top">Examples</a> </p><p> <a href="FAQ.html" target="_top">Frequently Asked Questions</a> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.4_SVNr139/SuSEfirewall2 new/SuSEfirewall2-3.4_SVNr140/SuSEfirewall2 --- old/SuSEfirewall2-3.4_SVNr139/SuSEfirewall2 2006-03-06 16:30:49.000000000 +0100 +++ new/SuSEfirewall2-3.4_SVNr140/SuSEfirewall2 2006-03-28 16:17:06.000000000 +0200 @@ -570,6 +570,16 @@ done } +xen_forward_hack() +{ + local dev iptables + for iptables in "$IPTABLES" "$IP6TABLES"; do + for dev in $FW_FORWARD_ALWAYS_INOUT_DEV; do + $iptables -A FORWARD -i $dev -o $dev -j ACCEPT + done + done +} + function set_basic_rules() { load_modules ip_tables ip_conntrack $FW_LOAD_MODULES @@ -632,6 +642,8 @@ $IP6TABLES -A INPUT -j "$ACCEPT" -i lo $IP6TABLES -A OUTPUT -j "$ACCEPT" -o lo + xen_forward_hack + # workaround for ip6tables without state matching if [ "$IP6TABLES_HAVE_STATE" != 1 ]; then for itype in $stateless_icmpv6_types $safe_icmpv6_replies; do diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.4_SVNr139/SuSEfirewall2.sysconfig new/SuSEfirewall2-3.4_SVNr140/SuSEfirewall2.sysconfig --- old/SuSEfirewall2-3.4_SVNr139/SuSEfirewall2.sysconfig 2006-03-02 14:44:33.000000000 +0100 +++ new/SuSEfirewall2-3.4_SVNr140/SuSEfirewall2.sysconfig 2006-03-28 16:29:10.000000000 +0200 @@ -950,3 +950,20 @@ # FW_LOAD_MODULES="ip_conntrack_ftp ip_nat_ftp" # FW_LOAD_MODULES= + +## Type: string +## Default: +# +# 33.) +# Bridge interfaces without IP address +# +# Traffic on bridge interfaces like the one used by xen appears to +# enter and leave on the same interface. Add such interfaces here in +# order to install special permitting rules for them. +# +# Format: list of interface names separated by space +# +# Example: +# FW_FORWARD_ALWAYS_INOUT_DEV="xenbr0" +# +FW_FORWARD_ALWAYS_INOUT_DEV= ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-storage
by root＠suse.de 29 Mar '06

29 Mar '06

Hello community, here is the log from the commit of package yast2-storage checked in at Wed Mar 29 13:40:18 CEST 2006. -------- --- /work/SRC/all/yast2-storage/yast2-storage.changes 2006-03-28 19:50:03.000000000 +0200 +++ /work/src/done/STABLE/yast2-storage/yast2-storage.changes 2006-03-29 13:34:26.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 13:34:18 CEST 2006 - fehr(a)suse.de + +- fix logging initialisation in inst-sys +- version 2.13.41 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.13.40.tar.bz2 New: ---- yast2-storage-2.13.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.aeSZa0/_old 2006-03-29 13:37:57.000000000 +0200 +++ /var/tmp/diff_new_pack.aeSZa0/_new 2006-03-29 13:37:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.13.40) +# spec file for package yast2-storage (Version 2.13.41) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.13.40 +Version: 2.13.41 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.13.40.tar.bz2 +Source0: yast2-storage-2.13.41.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.13.40 +%setup -n yast2-storage-2.13.41 %build %{prefix}/bin/y2tool y2autoconf @@ -164,6 +164,9 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %changelog -n yast2-storage +* Wed Mar 29 2006 - fehr(a)suse.de +- fix logging initialisation in inst-sys +- version 2.13.41 * Tue Mar 28 2006 - fehr(a)suse.de - speed up detection of encryption type on large fs (#158950) - version 2.13.40 ++++++ yast2-storage-2.13.40.tar.bz2 -> yast2-storage-2.13.41.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.40/VERSION new/yast2-storage-2.13.41/VERSION --- old/yast2-storage-2.13.40/VERSION 2006-03-28 19:50:58.000000000 +0200 +++ new/yast2-storage-2.13.41/VERSION 2006-03-29 13:33:41.000000000 +0200 @@ -1 +1 @@ -2.13.40 +2.13.41 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.13.40/storage/src/modules/Storage.ycp new/yast2-storage-2.13.41/storage/src/modules/Storage.ycp --- old/yast2-storage-2.13.40/storage/src/modules/Storage.ycp 2006-03-28 15:18:16.000000000 +0200 +++ new/yast2-storage-2.13.41/storage/src/modules/Storage.ycp 2006-03-29 13:34:53.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht * "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen * näher erklärt. * - * $Id: Storage.ycp 29473 2006-03-28 13:18:12Z fehr $ + * $Id: Storage.ycp 29503 2006-03-29 11:34:49Z fehr $ */ { @@ -2958,10 +2958,10 @@ global define map<string,map> ReReadTargetMap() ``{ - y2milestone("start reread"); + y2milestone("start reread sint:%1", sint ); probe_done = false; if( sint == nil ) - sint = createInterface(); + InitLibstorage(); else LibStorage::StorageInterface::rescanEverything( sint ); conts = getContainers(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0