March 2006 - openSUSE Commits - openSUSE Mailing Lists

commit pvm
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package pvm checked in at Tue Mar 28 18:35:14 CEST 2006. -------- --- /work/SRC/all/pvm/pvm.changes 2006-01-25 21:40:42.000000000 +0100 +++ /work/src/done/STABLE/pvm/pvm.changes 2006-03-22 18:47:02.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 22 18:19:15 CET 2006 - mrueckert(a)suse.de + +- added pvm-3.4.5_missing_format_param.patch + o fixes missing parameter for printf expression. (#133904) + o use vsnprintf instead of vsprintf + +------------------------------------------------------------------- New: ---- pvm-3.4.5_missing_format_param.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pvm.spec ++++++ --- /var/tmp/diff_new_pack.ezkJvQ/_old 2006-03-28 18:34:53.000000000 +0200 +++ /var/tmp/diff_new_pack.ezkJvQ/_new 2006-03-28 18:34:53.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-fortran readline-devel tcsh Summary: Parallel Virtual Machine Version: 3.4.5 -Release: 9 +Release: 16 License: LGPL, Other License(s), see package Group: Development/Libraries/Parallel Source0: ftp://ftp.netlib.org/pvm3/%{name}-%{version}.tar.bz2 @@ -23,6 +23,7 @@ Patch1: pvm-%{version}-cons.patch Patch2: pvm-%{version}-gcc4.patch Patch3: pvm-3.4.5_missing_includes.patch +Patch4: pvm-3.4.5_missing_format_param.patch URL: http://www.epm.ornl.gov/pvm/pvm_home.html BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _pvm_root /usr/lib/pvm3 @@ -151,6 +152,7 @@ %patch1 %patch2 -p1 %patch3 +%patch4 %build mkdir -p src/%{_pvm_arch} @@ -239,6 +241,10 @@ %{_mandir}/man3/* %changelog -n pvm +* Wed Mar 22 2006 - mrueckert(a)suse.de +- added pvm-3.4.5_missing_format_param.patch + o fixes missing parameter for printf expression. (#133904) + o use vsnprintf instead of vsprintf * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jan 23 2006 - mrueckert(a)suse.de ++++++ pvm-3.4.5_missing_format_param.patch ++++++ Index: src/pvmlog.c =================================================================== --- src/pvmlog.c.orig +++ src/pvmlog.c @@ -348,7 +348,8 @@ char *fmt; va_list ap; { - char vtmp[255]; + size_t vlen = 255; + char vtmp[vlen]; int cnt = 0; int cc; @@ -362,7 +363,7 @@ /* snag var arg string, in case re-use whacks it... */ /* (thank you very much x86_64... :-Q */ - vsprintf(vtmp, fmt, ap); + vsnprintf(vtmp, vlen, fmt, ap); if (log_how & 1) { if (atnewline) { @@ -488,7 +489,7 @@ pvmlogprintf("em=0x%lx\n", (long) em); for (i=0; i < 10 ; i++ ) - pvmlogprintf("[%x/%c]", em[i]); + pvmlogprintf("[%x/%c]", em[i], em[i]); pvmlogprintf("\n"); pvmlogprintf("%s: %s\n", s, em); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

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

28 Mar '06

Hello community, here is the log from the commit of package yast2-packager checked in at Tue Mar 28 18:34:42 CEST 2006. -------- --- /work/SRC/all/yast2-packager/yast2-packager.changes 2006-03-28 12:53:17.000000000 +0200 +++ /work/src/done/STABLE/yast2-packager/yast2-packager.changes 2006-03-28 17:43:06.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Mar 28 17:42:20 CEST 2006 - locilka(a)suse.cz + +- Added the first implementation of SignatureCheckDialogs module. +- 2.13.54 + +------------------------------------------------------------------- +Tue Mar 28 14:10:29 CEST 2006 - visnov(a)suse.cz + +- Show type of installation source if name is not known + +------------------------------------------------------------------- +Tue Mar 28 13:41:20 CEST 2006 - locilka(a)suse.cz + +- Moving ZMD sync to the pkg_finish client that is called after the + switch_scr client (#161299). + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.53.tar.bz2 New: ---- yast2-packager-2.13.54.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.xwU2sG/_old 2006-03-28 18:34:22.000000000 +0200 +++ /var/tmp/diff_new_pack.xwU2sG/_new 2006-03-28 18:34:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.53) +# spec file for package yast2-packager (Version 2.13.54) # # 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.53 +Version: 2.13.54 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.53.tar.bz2 +Source0: yast2-packager-2.13.54.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.53 +%setup -n yast2-packager-2.13.54 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,14 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Tue Mar 28 2006 - locilka(a)suse.cz +- Added the first implementation of SignatureCheckDialogs module. +- 2.13.54 +* Tue Mar 28 2006 - visnov(a)suse.cz +- Show type of installation source if name is not known +* Tue Mar 28 2006 - locilka(a)suse.cz +- Moving ZMD sync to the pkg_finish client that is called after the + switch_scr client (#161299). * Tue Mar 28 2006 - visnov(a)suse.cz - fix slideshow in 1st stage (#154324) - 2.13.53 ++++++ yast2-packager-2.13.53.tar.bz2 -> yast2-packager-2.13.54.tar.bz2 ++++++ ++++ 3256 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-packager-2.13.53/Makefile.am new/yast2-packager-2.13.54/Makefile.am --- old/yast2-packager-2.13.53/Makefile.am 2006-03-13 14:18:11.000000000 +0100 +++ new/yast2-packager-2.13.54/Makefile.am 2006-03-28 17:45:50.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-packager-2.13.53/VERSION new/yast2-packager-2.13.54/VERSION --- old/yast2-packager-2.13.53/VERSION 2006-03-28 11:36:19.000000000 +0200 +++ new/yast2-packager-2.13.54/VERSION 2006-03-28 13:41:14.000000000 +0200 @@ -1 +1 @@ -2.13.53 +2.13.54 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-packager-2.13.53/configure.in new/yast2-packager-2.13.54/configure.in --- old/yast2-packager-2.13.53/configure.in 2006-03-13 14:18:11.000000000 +0100 +++ new/yast2-packager-2.13.54/configure.in 2006-03-28 17:45:50.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.41, http://www.suse.de/feedback, yast2-packager) +AC_INIT(yast2-packager, 2.13.54, 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.41" +VERSION="2.13.54" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" 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-packager-2.13.53/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.13.54/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.13.53/src/clients/inst_rpmcopy.ycp 2006-03-28 11:32:23.000000000 +0200 +++ new/yast2-packager-2.13.54/src/clients/inst_rpmcopy.ycp 2006-03-28 13:42:10.000000000 +0200 @@ -13,7 +13,7 @@ * Packages module : * "installed" * - * $Id: inst_rpmcopy.ycp 29429 2006-03-27 14:28:35Z locilka $ + * $Id: inst_rpmcopy.ycp 29461 2006-03-28 11:42:01Z locilka $ */ { @@ -34,7 +34,6 @@ import "Report"; import "Kernel"; import "Service"; - import "Message"; // variables related to installation source caching @@ -500,162 +499,6 @@ // end of installation source caching functions // ------------------------------------------------------------------------------------------------------ - // ------------------------------------------------------------------------------------------------------ - // 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 - // ------------------------------------------------------------------------------------------------------ - Pkg::SetLocale (Language::language); SlideShow::SetLanguage (Language::language); @@ -937,10 +780,5 @@ } } - // Bug 156030 - YaST installation sources must be synced with ZMD - UI::OpenDialog(`Label(_("Configuring installed system") + "...")); - boolean sync_ret = SyncYaSTInstSourceWithZMD(); - UI::CloseDialog(); - return result; } 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-packager-2.13.53/src/clients/pkg_finish.ycp new/yast2-packager-2.13.54/src/clients/pkg_finish.ycp --- old/yast2-packager-2.13.53/src/clients/pkg_finish.ycp 2006-02-14 07:29:56.000000000 +0100 +++ new/yast2-packager-2.13.54/src/clients/pkg_finish.ycp 2006-03-28 13:42:10.000000000 +0200 @@ -7,8 +7,9 @@ * * Authors: * Jiri Srain <jsrain(a)suse.cz> + * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: pkg_finish.ycp 27936 2006-02-13 20:01:14Z olh $ + * $Id: pkg_finish.ycp 29461 2006-03-28 11:42:01Z locilka $ * */ @@ -17,11 +18,169 @@ 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); @@ -44,6 +203,9 @@ } 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 --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-packager-2.13.53/src/clients/test.ycp new/yast2-packager-2.13.54/src/clients/test.ycp --- old/yast2-packager-2.13.53/src/clients/test.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.54/src/clients/test.ycp 2006-03-27 15:55:00.000000000 +0200 @@ -0,0 +1,156 @@ +{ + textdomain "packager"; + import "Service"; + import "Message"; + + /** + * 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) { + 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 { + y2error("Adding ZYPP service failed"); + } + + y2milestone("--- Syncing finished ---"); + return true; + } + + SyncYaSTInstSourceWithZMD(); +} 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-packager-2.13.53/src/modules/SignatureCheckDialogs.ycp new/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp --- old/yast2-packager-2.13.53/src/modules/SignatureCheckDialogs.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.54/src/modules/SignatureCheckDialogs.ycp 2006-03-28 17:31:05.000000000 +0200 @@ -0,0 +1,387 @@ +/** + * Module: SignatureCheckDialogs.ycp + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + * Dialogs handling for RPM/Source GPM signatures. + * + * $Id: SignatureCheckDialogs.ycp 28363 2006-02-24 12:27:15Z locilka $ + */ + +{ + textdomain "packager"; + + module "SignatureCheckDialogs"; + + import "Label"; + 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)); +// } +// } + + /** + * Returns term of yes/no buttons + * + * @param symbol default button `yes or `no + * @return term with buttons + */ + term YesNoButtons (symbol default_button) { + term yes_button = `PushButton(`id(`yes), Label::YesButton()); + term no_button = `PushButton(`id(`no), Label::NoButton()); + + if (default_button == `yes) { + yes_button = `PushButton(`id(`yes), `opt(`default), Label::YesButton()); + } else { + no_button = `PushButton(`id(`no), `opt(`default), Label::NoButton()); + } + + return `HBox ( + yes_button, + `HSpacing(2), + no_button + ); + } + + /** + * Returns 'true' (yes), 'false' (no) or 'nil' (cancel) + * + * @return boolean user input yes==true + */ + boolean WaitForYesNoCancelUserInput() { + any user_input = nil; + boolean ret = nil; + + while (true) { + user_input = UI::UserInput(); + // yes button + if (user_input == `yes) { + ret = true; + break; + // no button + } else if (user_input == `no) { + ret = false; + break; + // closing window uisng [x] + } else if (user_input == `cancel) { + ret = nil; + break; + } else { + y2error("Unknown user input: '%1'", user_input); + continue; + } + } + + return ret; + } + + /** + * Waits for user input and checks it agains accepted symbols. + * Returns the default symbol in case of `cancel (user closes the dialog). + * + * @param list <symbol> of accepted symbol by UserInput + * @param symbol default return for case of `cancel + */ + symbol WaitForSymbolUserInput (list <symbol> list_of_accepted, symbol default_symb) { + symbol user_input = nil; + symbol ret = nil; + + while (true) { + user_input = (symbol) UI::UserInput(); + if (contains(list_of_accepted, user_input)) { + ret = user_input; + break; + } else if (user_input == `cancel) { + ret = default_symb; + break; + } else { + y2error("Unknown user input: '%1'", user_input); + continue; + } + } + + return ret; + } + + /** + * Used for unsiged file or package. Opens dialog asking whether user wants + * to use this unsigned item. + * + * @param symbol item_type `file or `package + * @param string item_name file name or package name + * @return boolean use or don't use ('true' if 'yes') + */ + 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 +may put the integrity of your system at risk. + +Do you want to 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. + +Do you want to use it anyway?") + ), item_name); + + UI::OpenDialog( + `opt(`decorated), + `VBox( + `HBox ( + `VCenter(warning_icon), + // popup heading + `VCenter(`Heading( _("Signature Check Failed"))), + `HStretch() + ), + `Label(description_text), + YesNoButtons(`no) + ) + ); + + boolean ret = WaitForYesNoCancelUserInput(); + // default value + if (ret == nil) ret = false; + + UI::CloseDialog(); + return ret; + } + + /** + * Used for corrupted file or package. Opens dialog asking whether user wants + * to use this corrupted item. + * + * @param symbol item_type `file or `package + * @param string item_name file name or package name + * @return boolean use or don't use ('true' if 'yes') + */ + 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 package has been changed by accident or by an attacker +since the repository creator has signed it. Installing it +is a big risk for the integrity and security of your system. + +Do you want to install it anyway?") + : + // popup question, %1 stands for the filename + _("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 +is a big risk for the integrity and security of your system. + +Do you want to use it anyway?") + ), item_name); + + UI::OpenDialog( + `opt(`decorated), + `VBox( + // popup heading + `HBox ( + `VCenter(error_icon), + `VCenter(`Heading( _("Validation Check Failed"))), + `HStretch() + ), + `Label(description_text), + YesNoButtons(`no) + ) + ); + + boolean ret = WaitForYesNoCancelUserInput(); + // default value + if (ret == nil) ret = false; + + UI::CloseDialog(); + return ret; + } + + /** + * Used for file or package signed by unknown key. + * + * @param symbol item_type `file or `package + * @param string item_name file name or package name + * @param string key_id + * @return symbol `yes, `no or `retry + */ + 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. + +Do you want to 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. + +Do you want to use it anyway?") + ), item_name, key_id); + + UI::OpenDialog( + `opt(`decorated), + `VBox( + `HBox ( + `VCenter(warning_icon), + // popup heading + `VCenter(`Heading( _("Uknown GnuPG Key"))), + `HStretch() + ), + `Label(description_text), + YesNoButtons(`no) + ) + ); + + // This will optionally offer to retrieve the key from gpg keyservers + // That's why it returns 'symbol' instead of 'boolean' + // But by now it only handles yes/no/cancel + symbol ret = (WaitForYesNoCancelUserInput() == true ? `yes : `no); + // default value + if (ret == nil) ret = `no; + + UI::CloseDialog(); + return ret; + } + + /** + * Used for file or package signed by a public key. This key is still + * not listed in trusted keys. + * + * @param symbol item_type `file or `package + * @param string item_name file name or package name + * @param string key_id + * @param string key_name + * @return symbol `key_import, `install, `skip + */ + 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 +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.") + : + // popup question, %1 stands for the filename + _("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.") + ), item_name, key_id, key_name); + + UI::OpenDialog( + `opt(`decorated), + `VBox( + `HBox ( + `VCenter(warning_icon), + // popup heading + `VCenter(`Heading( _("Signed with Untrusted Public Key"))), + `HStretch() + ), + `Label(description_text), + `HBox ( + // push button + `PushButton(`id(`key_import), _("Key &Import Dialog")), + // push button + `PushButton(`id(`install), _("Install &Anyway")), + // push button + `PushButton(`id(`skip), _("&Skip Package")) + ) + ) + ); + UI::SetFocus(`skip); + + // wait for one of listed ID's, return the default value in case of `cancel + symbol ret = WaitForSymbolUserInput([`key_import, `install, `skip], `skip); + + UI::CloseDialog(); + return ret; + } + + /** + * ImportGPGKeyDialog + * + * @param string key_id + * @param string key_name + * @param string key_location + * @param string key_detailed_description + * @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); + + 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")) + ) + ) + ); + UI::SetFocus(`details); + + symbol ret = nil; + while (ret == nil || ret == `details) { + // wait for one of listed ID's, return the default value in case of `cancel + ret = WaitForSymbolUserInput([`import, `details, `dont_import], `dont_import); + if (contains([`import, `dont_import], ret)) break; + else if (ret == `details) Popup::LongMessage(key_detailed_description); + } + + UI::CloseDialog(); + return ret; + } +} 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-packager-2.13.53/src/modules/SourceManager.ycp new/yast2-packager-2.13.54/src/modules/SourceManager.ycp --- old/yast2-packager-2.13.53/src/modules/SourceManager.ycp 2006-03-02 09:44:42.000000000 +0100 +++ new/yast2-packager-2.13.54/src/modules/SourceManager.ycp 2006-03-28 15:51:57.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Anas Nashif <nashif(a)suse.de> * Status: Work in Progress * - * $Id: SourceManager.ycp 28410 2006-02-27 15:47:13Z jsrain $ + * $Id: SourceManager.ycp 29470 2006-03-28 12:11:22Z visnov $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -576,7 +576,8 @@ string color = source[ "enabled" ]:true ? "#006600" : "#FF0000"; sitem = sitem + HTML::Colorize("["+status+"] ", color); - sitem = sitem + productData[ "label" ]:"unknown"; + // translators: name of a source if no other idenfication found + sitem = sitem + productData[ "label" ]:generalData["type"]:_("unknown"); sitem = sitem + " ( " + generalData[ "url" ]:"" + ")"; return sitem; } @@ -598,7 +599,7 @@ ? _("On") // corresponds to the "Enable/Disable" button : _("Off"), - productData[ "label" ]:"unknown", + productData[ "label" ]:generalData["type"]:_("Unknown"), generalData[ "url" ]:"" ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Tue Mar 28 18:34:15 CEST 2006. -------- --- /work/SRC/all/BASE/xorg-x11/xorg-x11.changes 2006-03-26 19:19:08.000000000 +0200 +++ /work/src/done/STABLE/xorg-x11/xorg-x11.changes 2006-03-28 17:53:17.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Mar 28 15:40:16 CEST 2006 - sndirsch(a)suse.de + +- p_mappciBIOS_complete.diff: + * fixes system hang (IERR on PCI bus) on Dell (Bug #151644) +- p_xauth.diff: + * fixed remaining issues (dmueller, Bug #98627/147691) + +------------------------------------------------------------------- New: ---- p_mappciBIOS_complete.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.mK0tvO/_old 2006-03-28 18:32:16.000000000 +0200 +++ /var/tmp/diff_new_pack.mK0tvO/_new 2006-03-28 18:32:16.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 29 +Release: 30 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -114,6 +114,7 @@ Patch356: p_bug159532.diff Patch357: p_pci-ce-x.diff Patch358: p_setxkbmap.diff +Patch359: p_mappciBIOS_complete.diff Patch400: p_bug96328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1536,6 +1537,7 @@ %patch356 %patch357 -p2 %patch358 +%patch359 # UTS_RELEASE=`uname -r` UTS_MAJOR=${UTS_RELEASE%%%%.*} @@ -2677,6 +2679,11 @@ %clean %changelog -n xorg-x11 +* Tue Mar 28 2006 - sndirsch(a)suse.de +- p_mappciBIOS_complete.diff: + * fixes system hang (IERR on PCI bus) on Dell (Bug #151644) +- p_xauth.diff: + * fixed remaining issues (dmueller, Bug #98627/147691) * Sun Mar 26 2006 - sndirsch(a)suse.de - p_setxkbmap.diff: * fixed invalid free() in setxkbmap (Bug #71244) ++++++ FILES ++++++ --- /work/SRC/all/BASE/xorg-x11/FILES 2006-03-26 19:19:32.000000000 +0200 +++ /work/src/done/STABLE/xorg-x11/FILES 2006-03-28 15:34:29.000000000 +0200 @@ -154,3 +154,5 @@ - fixes PCI bus scanning on CE systems (pci-pci bridges, Bug #147261) p_setxkbmap.diff [KEEP?] - fixed invalid free() in setxkbmap (Bug #71244) +p_mappciBIOS_complete.diff [KEEP?] +- fixes system hang (IERR on PCI bus) on Dell machines (Bug #151644) ++++++ p_mappciBIOS_complete.diff ++++++ Index: programs/Xserver/hw/xfree86/common/xf86Priv.h =================================================================== RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v retrieving revision 1.1.1.26 diff -u -p -r1.1.1.26 xf86Priv.h --- programs/Xserver/hw/xfree86/common/xf86Priv.h 23 Jan 2006 11:15:21 -0000 1.1.1.26 +++ programs/Xserver/hw/xfree86/common/xf86Priv.h 9 Mar 2006 11:20:37 -0000 @@ -155,6 +155,7 @@ void xf86AddDevToEntity(int entityIndex, extern void xf86PostPreInit(void); extern void xf86PostScreenInit(void); extern memType getValidBIOSBase(PCITAG tag, int num); +extern memType getEmptyPciRange(PCITAG tag, int base_reg); extern int pciTestMultiDeviceCard(int bus, int dev, int func, PCITAG** pTag); /* xf86Config.c */ Index: programs/Xserver/hw/xfree86/common/xf86pciBus.c =================================================================== RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v retrieving revision 1.1.1.57 diff -u -p -r1.1.1.57 xf86pciBus.c --- programs/Xserver/hw/xfree86/common/xf86pciBus.c 13 Sep 2005 10:31:26 -0000 1.1.1.57 +++ programs/Xserver/hw/xfree86/common/xf86pciBus.c 9 Mar 2006 11:20:37 -0000 @@ -1516,29 +1516,117 @@ xf86ReallocatePciResources(int entityInd /* * BIOS releated */ -memType -getValidBIOSBase(PCITAG tag, int num) +static resPtr +getOwnResources(pciVideoPtr pvp, resPtr mem) +{ + resRange range; + int i; + /* Make sure we don't conflict with our own mem resources */ + for (i = 0; i < 6; i++) { + if (!pvp->memBase[i]) + continue; + P_M_RANGE(range,TAG(pvp),pvp->memBase[i],pvp->size[i], + ResExcMemBlock); + mem = xf86AddResToList(mem,&range,-1); + } + return mem; +} + +static void +getPciRangesForMapping(pciVideoPtr pvp, resPtr *map, resPtr *avoid) { - pciVideoPtr pvp = NULL; PciBusPtr pbp; - resPtr m = NULL; - resPtr tmp, avoid, mem = NULL; + resPtr tmp; + + *avoid = xf86DupResList(pciAvoidRes); + + pbp = xf86PciBus; + while (pbp) { + if (pbp->secondary == pvp->bus) { + if (pbp->preferred_pmem) + tmp = xf86DupResList(pbp->preferred_pmem); + else + tmp = xf86DupResList(pbp->pmem); + *map = xf86JoinResLists(*map,tmp); + if (pbp->preferred_mem) + tmp = xf86DupResList(pbp->preferred_mem); + else + tmp = xf86DupResList(pbp->mem); + *map = xf86JoinResLists(*map,tmp); + tmp = *map; + while (tmp) { + tmp->block_end = min(tmp->block_end,PCI_MEM32_LENGTH_MAX); + tmp = tmp->next; + } + } else if ((pbp->primary == pvp->bus) && + (pbp->secondary >= 0) && + (pbp->primary != pbp->secondary)) { + tmp = xf86DupResList(pbp->preferred_pmem); + *avoid = xf86JoinResLists(*avoid, tmp); + tmp = xf86DupResList(pbp->pmem); + *avoid = xf86JoinResLists(*avoid, tmp); + tmp = xf86DupResList(pbp->preferred_mem); + *avoid = xf86JoinResLists(*avoid, tmp); + tmp = xf86DupResList(pbp->mem); + *avoid = xf86JoinResLists(*avoid, tmp); + } + pbp = pbp->next; + } + pciConvertListToHost(pvp->bus,pvp->device,pvp->func, *avoid); + pciConvertListToHost(pvp->bus,pvp->device,pvp->func, *map); +} + +static memType +findPciRange(PCITAG tag, resPtr m, resPtr avoid, CARD32 size) +{ resRange range; - memType ret; + CARD32 alignment = (1 << size) - 1; + + while (m) { + range = xf86GetBlock(RANGE_TYPE(ResExcMemBlock, xf86GetPciDomain(tag)), + PCI_SIZE(ResMem, tag, 1 << size), + m->block_begin, m->block_end, + PCI_SIZE(ResMem, tag, alignment), + avoid); + if (range.type != ResEnd) { + return M2B(tag, range.rBase); + } + m = m->next; + } + return 0; +} + +pciVideoPtr +getPciVideoPtr(tag) +{ int n = 0; - int i; - CARD32 biosSize, alignment; + pciVideoPtr pvp = NULL; if (!xf86PciVideoInfo) return 0; while ((pvp = xf86PciVideoInfo[n++])) { if (pciTag(pvp->bus,pvp->device,pvp->func) == tag) - break; + return pvp; } + return NULL; +} + +memType +getValidBIOSBase(PCITAG tag, int num) +{ + pciVideoPtr pvp = NULL; + memType ret; + CARD32 biosSize; + resPtr mem = NULL; + resPtr avoid = NULL, m = NULL; + resRange range; + + pvp = getPciVideoPtr(tag); + if (!pvp) return 0; biosSize = pvp->biosSize; - alignment = (1 << biosSize) - 1; + if (biosSize > 24) biosSize = 24; @@ -1549,15 +1637,8 @@ getValidBIOSBase(PCITAG tag, int num) /* In some cases the BIOS base register contains the size mask */ if ((memType)(-1 << biosSize) == PCIGETROM(pvp->biosBase)) return 0; - /* Make sure we don't conflict with our own mem resources */ - for (i = 0; i < 6; i++) { - if (!pvp->memBase[i]) - continue; - P_M_RANGE(range,TAG(pvp),pvp->memBase[i],pvp->size[i], - ResExcMemBlock); - mem = xf86AddResToList(mem,&range,-1); - } - P_M_RANGE(range, TAG(pvp),pvp->biosBase,biosSize,ResExcMemBlock); + mem = getOwnResources(pvp,mem); + P_M_RANGE(range, tag, pvp->biosBase,biosSize,ResExcMemBlock); ret = pvp->biosBase; break; case ROM_BASE_MEM0: @@ -1568,7 +1649,7 @@ getValidBIOSBase(PCITAG tag, int num) case ROM_BASE_MEM5: if (!pvp->memBase[num] || (pvp->size[num] < biosSize)) return 0; - P_M_RANGE(range, TAG(pvp),pvp->memBase[num],biosSize, + P_M_RANGE(range, tag ,pvp->memBase[num],biosSize, ResExcMemBlock); ret = pvp->memBase[num]; break; @@ -1580,59 +1661,15 @@ getValidBIOSBase(PCITAG tag, int num) } /* Now find the ranges for validation */ - avoid = xf86DupResList(pciAvoidRes); - pbp = xf86PciBus; - while (pbp) { - if (pbp->secondary == pvp->bus) { - if (pbp->preferred_pmem) - tmp = xf86DupResList(pbp->preferred_pmem); - else - tmp = xf86DupResList(pbp->pmem); - m = xf86JoinResLists(m,tmp); - if (pbp->preferred_mem) - tmp = xf86DupResList(pbp->preferred_mem); - else - tmp = xf86DupResList(pbp->mem); - m = xf86JoinResLists(m,tmp); - tmp = m; - while (tmp) { - tmp->block_end = min(tmp->block_end,PCI_MEM32_LENGTH_MAX); - tmp = tmp->next; - } - } else if ((pbp->primary == pvp->bus) && - (pbp->secondary >= 0) && - (pbp->primary != pbp->secondary)) { - tmp = xf86DupResList(pbp->preferred_pmem); - avoid = xf86JoinResLists(avoid, tmp); - tmp = xf86DupResList(pbp->pmem); - avoid = xf86JoinResLists(avoid, tmp); - tmp = xf86DupResList(pbp->preferred_mem); - avoid = xf86JoinResLists(avoid, tmp); - tmp = xf86DupResList(pbp->mem); - avoid = xf86JoinResLists(avoid, tmp); - } - pbp = pbp->next; - } - pciConvertListToHost(pvp->bus,pvp->device,pvp->func, avoid); - if (mem) - pciConvertListToHost(pvp->bus,pvp->device,pvp->func, mem); - + getPciRangesForMapping(pvp,&m,&avoid); + if (!ret) { /* Return a possible window */ - while (m) { - range = xf86GetBlock(RANGE_TYPE(ResExcMemBlock, xf86GetPciDomain(tag)), - PCI_SIZE(ResMem, TAG(pvp), 1 << biosSize), - m->block_begin, m->block_end, - PCI_SIZE(ResMem, TAG(pvp), alignment), - avoid); - if (range.type != ResEnd) { - ret = M2B(TAG(pvp), range.rBase); - break; - } - m = m->next; - } + ret = findPciRange(tag,m,avoid,biosSize); } else { #if !defined(__ia64__) /* on ia64, trust the kernel, don't look for overlaps */ + if (mem) + pciConvertListToHost(pvp->bus,pvp->device,pvp->func, mem); if (!xf86IsSubsetOf(range, m) || ChkConflict(&range, avoid, SETUP) || (mem && ChkConflict(&range, mem, SETUP))) @@ -1645,6 +1682,22 @@ getValidBIOSBase(PCITAG tag, int num) return ret; } +memType +getEmptyPciRange(PCITAG tag, int base_reg) +{ + resPtr avoid = NULL, m = NULL; + memType ret; + + pciVideoPtr pvp = getPciVideoPtr(tag); + if (!pvp) return 0; + getPciRangesForMapping(pvp,&m,&avoid); + ret = findPciRange(tag,m,avoid,pvp->size[base_reg]); + xf86FreeResList(avoid); + xf86FreeResList(m); + + return ret; +} + /* * xf86Bus.c interface */ Index: programs/Xserver/hw/xfree86/dummylib/Imakefile =================================================================== RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/dummylib/Imakefile,v retrieving revision 1.1.1.8 diff -u -p -r1.1.1.8 Imakefile --- programs/Xserver/hw/xfree86/dummylib/Imakefile 13 Sep 2005 10:31:34 -0000 1.1.1.8 +++ programs/Xserver/hw/xfree86/dummylib/Imakefile 9 Mar 2006 11:20:38 -0000 @@ -8,6 +8,7 @@ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86O SRCS = \ fatalerror.c \ getvalidbios.c \ + getemptypci.c \ logvwrite.c \ pcitestmulti.c \ verrorf.c \ @@ -32,6 +33,7 @@ SRCS = \ OBJS = \ fatalerror.o \ getvalidbios.o \ + getemptypci.o \ logvwrite.o \ pcitestmulti.o \ verrorf.o \ Index: programs/Xserver/hw/xfree86/dummylib/getemptypci.c =================================================================== RCS file: programs/Xserver/hw/xfree86/dummylib/getemptypci.c diff -N programs/Xserver/hw/xfree86/dummylib/getemptypci.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ programs/Xserver/hw/xfree86/dummylib/getemptypci.c 9 Mar 2006 11:20:38 -0000 @@ -0,0 +1,19 @@ + +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + +#include <X11/X.h> +#include "os.h" +#include "xf86.h" +#include "xf86Priv.h" + +/* + * Utility functions required by libxf86_os. + */ + +memType +getEmptyPciRange(PCITAG tag, int base_reg) +{ + return 0; +} Index: programs/Xserver/hw/xfree86/os-support/bus/Pci.c =================================================================== RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v retrieving revision 1.1.1.60 diff -u -p -r1.1.1.60 Pci.c --- programs/Xserver/hw/xfree86/os-support/bus/Pci.c 25 Nov 2005 10:05:28 -0000 1.1.1.60 +++ programs/Xserver/hw/xfree86/os-support/bus/Pci.c 9 Mar 2006 11:20:40 -0000 @@ -1068,6 +1068,20 @@ xf86scanpci(int flags) return pci_devp; } +pciConfigPtr +xf86GetPciConfigFromTag(PCITAG Tag) +{ + pciConfigPtr pDev; + int i = 0; + + for (i = 0 ; (pDev = pci_devp[i]) && i <= MAX_PCI_DEVICES; i++) { + if (Tag == pDev->tag) + return pDev; + } + + return NULL; /* Bad data */ +} + CARD32 pciCheckForBrokenBase(PCITAG Tag,int basereg) { @@ -1160,13 +1174,18 @@ handlePciBIOS(PCITAG Tag, int basereg, /* if we use a mem base save it and move it out of the way */ if (b_reg >= 0 && b_reg <= 5) { + memType emptybase; savebase = pciReadLong(Tag, PCI_MAP_REG_START+(b_reg<<2)); xf86MsgVerb(X_INFO,5,"xf86ReadPciBios: modifying membase[%i]" " for device %i:%i:%i\n", basereg, (int)PCI_BUS_FROM_TAG(Tag), (int)PCI_DEV_FROM_TAG(Tag), (int)PCI_FUNC_FROM_TAG(Tag)); + if (!(emptybase = getEmptyPciRange(Tag,b_reg))) { + xf86Msg(X_ERROR,"Cannot find empty range to map base to\n"); + return 0; + } pciWriteLong(Tag, PCI_MAP_REG_START + (b_reg << 2), - (CARD32)~0); + emptybase); } /* Set ROM base address and enable ROM address decoding */ pciWriteLong(Tag, PCI_MAP_ROM_REG, romaddr Index: programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h =================================================================== RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v retrieving revision 1.1.1.33 diff -u -p -r1.1.1.33 xf86Pci.h --- programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 27 Apr 2005 16:00:07 -0000 1.1.1.33 +++ programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 9 Mar 2006 11:20:40 -0000 @@ -780,6 +780,7 @@ int xf86ReadPciBIOSByType(unsigned int xf86GetAvailablePciBIOSTypes(PCITAG Tag, int basereg, PciBiosType *Buf); pciConfigPtr *xf86scanpci(int flags); +pciConfigPtr xf86GetPciConfigFromTag(PCITAG Tag); extern int pciNumBuses; Index: programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c =================================================================== RCS file: /work/cvsdir/cvs/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v retrieving revision 1.1.1.10 diff -u -p -r1.1.1.10 lnx_pci.c --- programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c 25 Nov 2005 10:05:30 -0000 1.1.1.10 +++ programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c 9 Mar 2006 11:20:40 -0000 @@ -201,6 +201,8 @@ xf86GetOSOffsetFromPCI(PCITAG tag, int s fn = devfn & 0x7; if (tag == pciTag(bus,dev,fn)) { /* ok now look through all the BAR values of this device */ + pciConfigPtr pDev = xf86GetPciConfigFromTag(tag); + for (ndx=0; ndx<7; ndx++) { unsigned long savePtr; /* @@ -208,11 +210,9 @@ xf86GetOSOffsetFromPCI(PCITAG tag, int s * memory attributes */ if (ndx == 6) - savePtr = (0xFFFFFFF0) & - pciReadLong(tag, PCI_CMD_BIOS_REG); + savePtr = PCIGETROM(pDev->pci_baserom); else /* this the ROM bar */ - savePtr = (0xFFFFFFF0) & - pciReadLong(tag, PCI_CMD_BASE_REG + (0x4 * ndx)); + savePtr = (0xFFFFFFF0) & (&pDev->pci_base0)[ndx]; /* find the index of the incoming base */ if (base >= savePtr && base <= (savePtr + size[ndx])) { ++++++ p_xauth.diff ++++++ --- /var/tmp/diff_new_pack.mK0tvO/_old 2006-03-28 18:32:19.000000000 +0200 +++ /var/tmp/diff_new_pack.mK0tvO/_new 2006-03-28 18:32:19.000000000 +0200 @@ -327,3 +327,24 @@ XINIT $client $clientargs -- $server $display $serverargs #endif +--- lib/xtrans/Xtranssock.c 2005-11-30 11:35:05.000000000 +0100 ++++ lib/xtrans/Xtranssock.c 2006-03-28 12:11:36.000000000 +0200 +@@ -1804,6 +1804,7 @@ + + { + char hostnamebuf[256]; ++ char* xauthlocalname = getenv("XAUTHLOCALHOSTNAME"); + + #if defined(IPv6) && defined(AF_INET6) + if (getaddrinfo == NULL) +@@ -1816,6 +1817,10 @@ + { + return (1); + } ++ else if(xauthlocalname && strcmp (xauthlocalname, host) == 0) ++ { ++ return (1); ++ } + #if defined(IPv6) && defined(AF_INET6) + else if (haveIPv6) + { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

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

28 Mar '06

Hello community, here is the log from the commit of package util-linux checked in at Tue Mar 28 18:31:50 CEST 2006. -------- --- /work/SRC/all/BASE/util-linux/util-linux.changes 2006-03-21 11:36:03.000000000 +0100 +++ /work/src/done/STABLE/util-linux/util-linux.changes 2006-03-28 17:54:13.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 28 17:53:46 CEST 2006 - hvogel(a)suse.de + +- more fixes for the fdiskwrap patch [#160822] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.vuGkKO/_old 2006-03-28 18:30:10.000000000 +0200 +++ /var/tmp/diff_new_pack.vuGkKO/_new 2006-03-28 18:30:10.000000000 +0200 @@ -20,7 +20,7 @@ Group: System/Base Autoreqprov: on Version: 2.12r -Release: 21 +Release: 23 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 +* Tue Mar 28 2006 - hvogel(a)suse.de +- more fixes for the fdiskwrap patch [#160822] * Tue Mar 21 2006 - okir(a)suse.de - Update nfs(5) manpage to document security flavors [#159368] * Mon Mar 20 2006 - hvogel(a)suse.de ++++++ util-linux-2.12r-fdiskwrap.patch ++++++ --- /var/tmp/diff_new_pack.vuGkKO/_old 2006-03-28 18:30:11.000000000 +0200 +++ /var/tmp/diff_new_pack.vuGkKO/_new 2006-03-28 18:30:11.000000000 +0200 @@ -83,9 +83,11 @@ static void -seek_sector(int fd, unsigned int secno) { +- long long offset = (long long) secno * sector_size; +- if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1) +seek_sector(int fd, unsigned long long secno) { - long long offset = (long long) secno * sector_size; - if (ext2_llseek(fd, offset, SEEK_SET) == (long long) -1) ++ off_t offset = (off_t) secno * sector_size; ++ if (lseek(fd, offset, SEEK_SET) == (off_t) -1) fatal(unable_to_seek); } @@ -140,7 +142,41 @@ if (doext) { p = ptes[i].ext_pointer; -@@ -1799,7 +1798,7 @@ +@@ -1546,7 +1545,7 @@ + else + printf(_("\nDisk %s: %ld.%ld GB, %lld bytes\n"), + disk_device, megabytes/1000, (megabytes/100)%10, bytes); +- printf(_("%d heads, %d sectors/track, %d cylinders"), ++ printf(_("%d heads, %Ld sectors/track, %d cylinders"), + heads, sectors, cylinders); + if (units_per_sector == 1) + printf(_(", total %llu sectors"), +@@ -1778,20 +1777,21 @@ + struct partition *p; + int i; + +- printf(_("\nDisk %s: %d heads, %d sectors, %d cylinders\n\n"), ++ printf(_("\nDisk %s: %d heads, %Ld sectors, %d cylinders\n\n"), + disk_device, heads, sectors, cylinders); + printf(_("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n")); + for (i = 0 ; i < partitions; i++) { + pe = &ptes[i]; + p = (extend ? pe->ext_pointer : pe->part_table); + if (p != NULL) { +- printf("%2d %02x%4d%4d%5d%4d%4d%5d%11u%11u %02x\n", ++ printf("%2d %02x%4d%4d%5d%4d%4d%5d%11lu%11lu %02x\n", + i + 1, p->boot_ind, p->head, + sector(p->sector), + cylinder(p->sector, p->cyl), p->end_head, + sector(p->end_sector), + cylinder(p->end_sector, p->end_cyl), +- get_start_sect(p), get_nr_sects(p), p->sys_ind); ++ (unsigned long) get_start_sect(p), ++ (unsigned long) get_nr_sects(p), p->sys_ind); + if (p->sys_ind) + check_consistency(p, i); + } +@@ -1799,7 +1799,7 @@ } static void @@ -149,7 +185,16 @@ int i; struct pte *pe = &ptes[0]; struct partition *p; -@@ -1845,8 +1844,8 @@ +@@ -1832,7 +1832,7 @@ + n, h + 1, heads); + if (real_s >= sectors) + fprintf(stderr, _("Partition %d: sector %d greater than " +- "maximum %d\n"), n, s, sectors); ++ "maximum %Ld\n"), n, s, sectors); + if (real_c >= cylinders) + fprintf(stderr, _("Partitions %d: cylinder %d greater than " + "maximum %d\n"), n, real_c + 1, cylinders); +@@ -1845,8 +1845,8 @@ static void verify(void) { int i, j; @@ -160,7 +205,7 @@ struct partition *p; if (warn_geometry()) -@@ -1890,7 +1889,7 @@ +@@ -1890,7 +1890,7 @@ if (extended_offset) { struct pte *pex = &ptes[ext_index]; @@ -169,7 +214,18 @@ get_nr_sects(pex->part_table) - 1; for (i = 4; i < partitions; i++) { -@@ -1923,7 +1922,7 @@ +@@ -1909,8 +1909,8 @@ + } + + if (total > total_number_of_sectors) +- printf(_("Total allocated sectors %d greater than the maximum " +- "%lld\n"), total, total_number_of_sectors); ++ printf(_("Total allocated sectors %ld greater than the maximum" ++ " %lld\n"), total, total_number_of_sectors); + else if (total < total_number_of_sectors) + printf(_("%lld unallocated sectors\n"), + total_number_of_sectors - total); +@@ -1923,7 +1923,7 @@ struct partition *p = ptes[n].part_table; struct partition *q = ptes[ext_index].part_table; long long llimit; @@ -178,7 +234,16 @@ first[partitions], last[partitions]; if (p && p->sys_ind) { -@@ -2228,14 +2227,14 @@ +@@ -1969,7 +1969,7 @@ + if (start > limit) + break; + if (start >= temp+units_per_sector && read) { +- printf(_("Sector %d is already allocated\n"), temp); ++ printf(_("Sector %llu is already allocated\n"), temp); + temp = start; + read = 0; + } +@@ -2228,14 +2228,14 @@ #define MAX_PER_LINE 16 static void @@ -223,6 +288,41 @@ extern int show_begin; extern int aix_label; extern char *partition_type(unsigned char type); +--- util-linux-2.12r/fdisk/fdiskmaclabel.h ++++ util-linux-2.12r/fdisk/fdiskmaclabel.h +@@ -25,9 +25,10 @@ + + /* fdisk.c */ + #define maclabel ((mac_partition *)MBRbuffer) +-extern char MBRbuffer[MAX_SECTOR_SIZE]; ++extern unsigned char MBRbuffer[MAX_SECTOR_SIZE]; + extern char changed[MAXIMUM_PARTS]; +-extern unsigned int heads, sectors, cylinders; ++extern unsigned int heads, cylinders; ++extern unsigned long long sectors; + extern int show_begin; + extern int mac_label; + extern char *partition_type(unsigned char type); +--- util-linux-2.12r/fdisk/fdisksgilabel.c ++++ util-linux-2.12r/fdisk/fdisksgilabel.c +@@ -197,7 +197,7 @@ + w = strlen(disk_device); + + if (xtra) { +- printf(_("\nDisk %s (SGI disk label): %d heads, %d sectors\n" ++ printf(_("\nDisk %s (SGI disk label): %d heads, %llu sectors\n" + "%d cylinders, %d physical cylinders\n" + "%d extra sects/cyl, interleave %d:1\n" + "%s\n" +@@ -211,7 +211,7 @@ + sector_size); + } else { + printf(_("\nDisk %s (SGI disk label): " +- "%d heads, %d sectors, %d cylinders\n" ++ "%d heads, %llu sectors, %d cylinders\n" + "Units = %s of %d * %d bytes\n\n"), + disk_device, heads, sectors, cylinders, + str_units(PLURAL), units_per_sector, --- util-linux-2.12r/fdisk/fdisksgilabel.h +++ util-linux-2.12r/fdisk/fdisksgilabel.h @@ -103,8 +103,9 @@ @@ -237,6 +337,35 @@ extern int show_begin; extern int sgi_label; extern char *partition_type(unsigned char type); +--- util-linux-2.12r/fdisk/fdisksunlabel.c ++++ util-linux-2.12r/fdisk/fdisksunlabel.c +@@ -349,7 +349,7 @@ + } + + snprintf(sunlabel->info, sizeof(sunlabel->info), +- "%s%s%s cyl %d alt %d hd %d sec %d", ++ "%s%s%s cyl %d alt %d hd %d sec %llu", + p ? p->vendor : "", (p && *p->vendor) ? " " : "", + p ? p->model + : (floppy ? _("3,5\" floppy") : _("Linux custom")), +@@ -656,7 +656,7 @@ + w = strlen(disk_device); + if (xtra) + printf( +- _("\nDisk %s (Sun disk label): %d heads, %d sectors, %d rpm\n" ++ _("\nDisk %s (Sun disk label): %d heads, %llu sectors, %d rpm\n" + "%d cylinders, %d alternate cylinders, %d physical cylinders\n" + "%d extra sects/cyl, interleave %d:1\n" + "%s\n" +@@ -670,7 +670,7 @@ + str_units(PLURAL), units_per_sector); + else + printf( +- _("\nDisk %s (Sun disk label): %d heads, %d sectors, %d cylinders\n" ++ _("\nDisk %s (Sun disk label): %d heads, %llu sectors, %d cylinders\n" + "Units = %s of %d * 512 bytes\n\n"), + disk_device, heads, sectors, cylinders, + str_units(PLURAL), units_per_sector); --- util-linux-2.12r/fdisk/fdisksunlabel.h +++ util-linux-2.12r/fdisk/fdisksunlabel.h @@ -37,8 +37,9 @@ @@ -251,18 +380,3 @@ extern int show_begin; extern int sun_label; extern char *partition_type(unsigned char type); ---- util-linux-2.12r/fdisk/fdiskmaclabel.h -+++ util-linux-2.12r/fdisk/fdiskmaclabel.h -@@ -25,9 +25,10 @@ - - /* fdisk.c */ - #define maclabel ((mac_partition *)MBRbuffer) --extern char MBRbuffer[MAX_SECTOR_SIZE]; -+extern unsigned char MBRbuffer[MAX_SECTOR_SIZE]; - extern char changed[MAXIMUM_PARTS]; --extern unsigned int heads, sectors, cylinders; -+extern unsigned int heads, cylinders; -+extern unsigned long long sectors; - extern int show_begin; - extern int mac_label; - extern char *partition_type(unsigned char type); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit lam
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package lam checked in at Tue Mar 28 18:30:00 CEST 2006. -------- --- /work/SRC/all/lam/lam.changes 2006-02-18 00:20:17.000000000 +0100 +++ /work/src/done/STABLE/lam/lam.changes 2006-03-28 17:59:36.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Mar 28 17:57:59 CEST 2006 - mrueckert(a)suse.de + +- removed APSL licensed files +- added lam-7.1.1_no_darwin.patch: + removed references to files in the build system +- cleaned up %build/%install + +------------------------------------------------------------------- New: ---- lam-7.1.1_no_darwin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lam.spec ++++++ --- /var/tmp/diff_new_pack.FFzqFg/_old 2006-03-28 18:29:25.000000000 +0200 +++ /var/tmp/diff_new_pack.FFzqFg/_new 2006-03-28 18:29:25.000000000 +0200 @@ -28,7 +28,7 @@ %{!?rpi: %define rpi --with-rpi=usysv} Summary: Local Area Multicomputer Version: 7.1.1 -Release: 12 +Release: 17 License: Other License(s), see package Group: Development/Libraries/Parallel Source: http://www.mpi.nd.edu/downloads/lam/lam-%{version}.tar.bz2 @@ -37,6 +37,7 @@ Requires: openssh Provides: mpi #Conflicts: mpich mpich2 +Patch: lam-7.1.1_no_darwin.patch %description LAM (Local Area Multicomputer) is an MPI programming environment and @@ -61,9 +62,9 @@ Conflicts: mpich-manpages Summary: Local Area Multicomputer Group: Development/Libraries/Parallel -Autoreqprov: on Obsoletes: lamman lam-manpages -provides: lamman lam-manpages +Provides: lamman lam-manpages +Requires: glibc-devel libstdc++-devel %description devel LAM (Local Area Multicomputer) is an MPI programming environment and @@ -86,40 +87,38 @@ %prep %setup -q +%patch %build -F77=gfortran CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \ +autoreconf +export F77=gfortran +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%configure \ %{rpi} \ - --prefix=/usr \ - --sysconfdir=%_sysconfdir \ - --libdir=%_libdir \ - --mandir=%_mandir \ - --with-rsh="/usr/bin/ssh -x" + --with-rsh="%{_bindir}/ssh -x" make %{?jobs:-j%jobs} all %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install + +%makeinstall for file in README README_LAM COPYRIGHT; do - mv $RPM_BUILD_DIR/lam-%{version}/romio/$file \ - $RPM_BUILD_DIR/lam-%{version}/romio/romio-$file + mv romio/$file romio/romio-$file done -mv $RPM_BUILD_DIR/lam-%{version}/romio/doc/users-guide.ps.gz \ - $RPM_BUILD_DIR/lam-%{version}/romio/doc/romio-users-guide.ps.gz -rm -f $RPM_BUILD_ROOT%{_datadir}/lam/lam-shell-setup.sh -rm -f $RPM_BUILD_ROOT%{_datadir}/lam/lam-shell-setup.csh -rm -f $RPM_BUILD_ROOT%{_datadir}/lam/lam_module.tcl -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/wipe.1* +mv romio/doc/users-guide.ps.gz romio/doc/romio-users-guide.ps.gz +rm -f %{buildroot}%{_datadir}/lam/lam-shell-setup.sh +rm -f %{buildroot}%{_datadir}/lam/lam-shell-setup.csh +rm -f %{buildroot}%{_datadir}/lam/lam_module.tcl +rm -f %{buildroot}%{_mandir}/man1/wipe.1* # Turn off the x bit on the totalview shared library so that rpm # doesn't strip it. #$%@#$%!!! %ifarch %ix86 ppc s390 %arm -chmod a-x $RPM_BUILD_ROOT%{_libdir}/lam/liblam_totalview*so +chmod a-x %{buildroot}%{_libdir}/lam/liblam_totalview*so %endif -rm -f $RPM_BUILD_ROOT/usr/bin/wipe +rm -f %{buildroot}%{_bindir}/wipe find examples -name ".deps" | xargs rm -rfv %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -174,6 +173,11 @@ %{_mandir}/man3/* %changelog -n lam +* Tue Mar 28 2006 - mrueckert(a)suse.de +- removed APSL licensed files +- added lam-7.1.1_no_darwin.patch: + removed references to files in the build system +- cleaned up %%build/%%install * Sat Feb 18 2006 - ro(a)suse.de - cleanup docs (remove .deps) * Wed Jan 25 2006 - mls(a)suse.de ++++++ lam-7.1.1.tar.bz2 ++++++ /work/SRC/all/lam/lam-7.1.1.tar.bz2 /work/src/done/STABLE/lam/lam-7.1.1.tar.bz2 differ: char 11, line 1 ++++++ lam-7.1.1_no_darwin.patch ++++++ Index: share/memory/Makefile.am =================================================================== --- share/memory/Makefile.am.orig +++ share/memory/Makefile.am @@ -14,7 +14,7 @@ include $(top_srcdir)/config/Makefile.options -SUBDIRS = ptmalloc ptmalloc2 darwin7 +SUBDIRS = ptmalloc ptmalloc2 noinst_LTLIBRARIES = libmemory.la libmemory_la_SOURCES = memory_hook.c Index: configure.in =================================================================== --- configure.in.orig +++ configure.in @@ -2443,7 +2443,6 @@ share/pmpi/Makefile share/pmpi/f77/Makefile share/memory/Makefile - share/memory/darwin7/Makefile share/memory/ptmalloc/Makefile share/memory/ptmalloc2/Makefile share/rreq/Makefile ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kdebase3
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package kdebase3 checked in at Tue Mar 28 18:29:20 CEST 2006. -------- --- /work/SRC/all/KDE/kdebase3/kdebase3.changes 2006-03-23 17:21:40.000000000 +0100 +++ /work/src/done/STABLE/kdebase3/kdebase3.changes 2006-03-28 17:46:51.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 28 17:46:23 CEST 2006 - coolo(a)suse.de + +- update media_hal.diff to handle fstab entries more correctly + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.1fysti/_old 2006-03-28 18:27:28.000000000 +0200 +++ /var/tmp/diff_new_pack.1fysti/_new 2006-03-28 18:27:28.000000000 +0200 @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.1 -Release: 46 +Release: 48 %define kde_version 3.5.1 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -321,7 +321,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 59 +Release: 61 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1383,6 +1383,8 @@ %endif %changelog -n kdebase3 +* Tue Mar 28 2006 - coolo(a)suse.de +- update media_hal.diff to handle fstab entries more correctly * Thu Mar 23 2006 - stbinner(a)suse.de - add patch to fix jumpy taskbar size (#156621) - update media_hal.diff to fix setting of mount properties for a ++++++ media_hal.diff ++++++ --- /var/tmp/diff_new_pack.1fysti/_old 2006-03-28 18:27:32.000000000 +0200 +++ /var/tmp/diff_new_pack.1fysti/_new 2006-03-28 18:27:32.000000000 +0200 @@ -1,7 +1,7 @@ Index: medianotifier/medianotifier.cpp =================================================================== ---- medianotifier/medianotifier.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ medianotifier/medianotifier.cpp (.../work/coolos_media) (revision 521818) +--- medianotifier/medianotifier.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ medianotifier/medianotifier.cpp (.../work/coolos_media) (Revision 523597) @@ -54,7 +54,10 @@ { kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " @@ -30,8 +30,8 @@ return false; Index: libmediacommon/medium.cpp =================================================================== ---- libmediacommon/medium.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ libmediacommon/medium.cpp (.../work/coolos_media) (revision 521818) +--- libmediacommon/medium.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ libmediacommon/medium.cpp (.../work/coolos_media) (Revision 523597) @@ -40,6 +40,8 @@ m_properties+= QString::null; /* ICON_NAME */ @@ -52,8 +52,8 @@ const Medium Medium::create(const QStringList &properties) Index: libmediacommon/medium.h =================================================================== ---- libmediacommon/medium.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ libmediacommon/medium.h (.../work/coolos_media) (revision 521818) +--- libmediacommon/medium.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ libmediacommon/medium.h (.../work/coolos_media) (Revision 523597) @@ -22,6 +22,7 @@ #include <qstring.h> #include <qstringlist.h> @@ -98,8 +98,8 @@ #endif Index: mediaimpl.cpp =================================================================== ---- mediaimpl.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ mediaimpl.cpp (.../work/coolos_media) (revision 521818) +--- mediaimpl.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ mediaimpl.cpp (.../work/coolos_media) (Revision 523597) @@ -226,6 +226,8 @@ mp_mounting = &medium; @@ -138,8 +138,8 @@ Index: kfile-plugin/kfile_media.desktop =================================================================== ---- kfile-plugin/kfile_media.desktop (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ kfile-plugin/kfile_media.desktop (.../work/coolos_media) (revision 521818) +--- kfile-plugin/kfile_media.desktop (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ kfile-plugin/kfile_media.desktop (.../work/coolos_media) (Revision 523597) @@ -57,4 +57,4 @@ Name[zh_TW]=媒體資訊 ServiceTypes=KFilePlugin @@ -148,8 +148,8 @@ +MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted Index: kfile-plugin/kfilemediaplugin.cpp =================================================================== ---- kfile-plugin/kfilemediaplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ kfile-plugin/kfilemediaplugin.cpp (.../work/coolos_media) (revision 521818) +--- kfile-plugin/kfilemediaplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ kfile-plugin/kfilemediaplugin.cpp (.../work/coolos_media) (Revision 523597) @@ -64,12 +64,16 @@ addMimeType( "media/floppy_unmounted" ); addMimeType( "media/zip_unmounted" ); @@ -180,8 +180,8 @@ { Index: configure.in.in =================================================================== ---- configure.in.in (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ configure.in.in (.../work/coolos_media) (revision 521818) +--- configure.in.in (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ configure.in.in (.../work/coolos_media) (Revision 523597) @@ -90,6 +90,13 @@ if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) ) @@ -198,8 +198,8 @@ dbus=FOUND Index: mounthelper/kio_media_mounthelper.cpp =================================================================== ---- mounthelper/kio_media_mounthelper.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ mounthelper/kio_media_mounthelper.cpp (.../work/coolos_media) (revision 521818) +--- mounthelper/kio_media_mounthelper.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ mounthelper/kio_media_mounthelper.cpp (.../work/coolos_media) (Revision 523597) @@ -27,6 +27,7 @@ #include <dcopclient.h> #include <dcopref.h> @@ -294,8 +294,8 @@ #include "kio_media_mounthelper.moc" Index: mounthelper/Makefile.am =================================================================== ---- mounthelper/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ mounthelper/Makefile.am (.../work/coolos_media) (revision 521818) +--- mounthelper/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ mounthelper/Makefile.am (.../work/coolos_media) (Revision 523597) @@ -6,7 +6,7 @@ kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp @@ -307,8 +307,8 @@ Index: kcmodule/managermodule.cpp =================================================================== ---- kcmodule/managermodule.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ kcmodule/managermodule.cpp (.../work/coolos_media) (revision 521818) +--- kcmodule/managermodule.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ kcmodule/managermodule.cpp (.../work/coolos_media) (Revision 523597) @@ -39,15 +39,15 @@ QString hal_text = view->kcfg_HalBackendEnabled->text(); hal_text += " ("+i18n("No support for HAL on this system")+")"; @@ -329,8 +329,8 @@ } Index: Makefile.am =================================================================== ---- Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ Makefile.am (.../work/coolos_media) (revision 521818) +--- Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ Makefile.am (.../work/coolos_media) (Revision 523597) @@ -1,5 +1,5 @@ SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ - kfile-plugin kcmodule mimetypes services @@ -347,8 +347,8 @@ + $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot Index: propsdlgplugin/propertiespage.h =================================================================== ---- propsdlgplugin/propertiespage.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0) -+++ propsdlgplugin/propertiespage.h (.../work/coolos_media) (revision 521818) +--- propsdlgplugin/propertiespage.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) ++++ propsdlgplugin/propertiespage.h (.../work/coolos_media) (Revision 523597) @@ -0,0 +1,46 @@ +/* + Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de> @@ -398,8 +398,8 @@ +#endif Index: propsdlgplugin/media_propsdlgplugin.desktop =================================================================== ---- propsdlgplugin/media_propsdlgplugin.desktop (.../KDE/3.5/kdebase/kioslave/media) (revision 0) -+++ propsdlgplugin/media_propsdlgplugin.desktop (.../work/coolos_media) (revision 521818) +--- propsdlgplugin/media_propsdlgplugin.desktop (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) ++++ propsdlgplugin/media_propsdlgplugin.desktop (.../work/coolos_media) (Revision 523597) @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 @@ -410,8 +410,8 @@ +ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted Index: propsdlgplugin/propertiespagegui.ui.h =================================================================== ---- propsdlgplugin/propertiespagegui.ui.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0) -+++ propsdlgplugin/propertiespagegui.ui.h (.../work/coolos_media) (revision 521818) +--- propsdlgplugin/propertiespagegui.ui.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) ++++ propsdlgplugin/propertiespagegui.ui.h (.../work/coolos_media) (Revision 523597) @@ -0,0 +1,22 @@ +/**************************************************************************** +** ui.h extension file, included from the uic-generated form implementation. @@ -437,8 +437,8 @@ + Index: propsdlgplugin/propsdlgshareplugin.h =================================================================== ---- propsdlgplugin/propsdlgshareplugin.h (.../KDE/3.5/kdebase/kioslave/media) (revision 0) -+++ propsdlgplugin/propsdlgshareplugin.h (.../work/coolos_media) (revision 521818) +--- propsdlgplugin/propsdlgshareplugin.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) ++++ propsdlgplugin/propsdlgshareplugin.h (.../work/coolos_media) (Revision 523597) @@ -0,0 +1,44 @@ +/* + Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de> @@ -486,8 +486,8 @@ + Index: propsdlgplugin/Makefile.am =================================================================== ---- propsdlgplugin/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (revision 0) -+++ propsdlgplugin/Makefile.am (.../work/coolos_media) (revision 521818) +--- propsdlgplugin/Makefile.am (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) ++++ propsdlgplugin/Makefile.am (.../work/coolos_media) (Revision 523597) @@ -0,0 +1,12 @@ +METASOURCES = AUTO + @@ -503,8 +503,8 @@ +media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp Index: propsdlgplugin/propertiespage.cpp =================================================================== ---- propsdlgplugin/propertiespage.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 0) -+++ propsdlgplugin/propertiespage.cpp (.../work/coolos_media) (revision 521818) +--- propsdlgplugin/propertiespage.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) ++++ propsdlgplugin/propertiespage.cpp (.../work/coolos_media) (Revision 523597) @@ -0,0 +1,217 @@ +/* + Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de> @@ -725,8 +725,8 @@ +#include "propertiespage.moc" Index: propsdlgplugin/propertiespagegui.ui =================================================================== ---- propsdlgplugin/propertiespagegui.ui (.../KDE/3.5/kdebase/kioslave/media) (revision 0) -+++ propsdlgplugin/propertiespagegui.ui (.../work/coolos_media) (revision 521818) +--- propsdlgplugin/propertiespagegui.ui (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) ++++ propsdlgplugin/propertiespagegui.ui (.../work/coolos_media) (Revision 523597) @@ -0,0 +1,390 @@ +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +<class>PropertiesPageGUI</class> @@ -1120,8 +1120,8 @@ +</UI> Index: propsdlgplugin/propsdlgshareplugin.cpp =================================================================== ---- propsdlgplugin/propsdlgshareplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 0) -+++ propsdlgplugin/propsdlgshareplugin.cpp (.../work/coolos_media) (revision 521818) +--- propsdlgplugin/propsdlgshareplugin.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 0) ++++ propsdlgplugin/propsdlgshareplugin.cpp (.../work/coolos_media) (Revision 523597) @@ -0,0 +1,100 @@ +/* + Copyright (c) 2004 Jan Schaefer <j_schaef(a)informatik.uni-kl.de> @@ -1224,7 +1224,7 @@ +#include "propsdlgshareplugin.moc" + -Property changes on: propsdlgplugin +Eigenschaftsänderungen: propsdlgplugin ___________________________________________________________________ Name: svn:ignore + propertiespagegui.cpp @@ -1239,8 +1239,8 @@ Index: mediamanager/mediamanager.cpp =================================================================== ---- mediamanager/mediamanager.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ mediamanager/mediamanager.cpp (.../work/coolos_media) (revision 521818) +--- mediamanager/mediamanager.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ mediamanager/mediamanager.cpp (.../work/coolos_media) (Revision 523597) @@ -76,14 +76,15 @@ } @@ -1355,8 +1355,8 @@ const QPtrList<Medium> media = m_mediaList.list(); Index: mediamanager/halbackend.cpp =================================================================== ---- mediamanager/halbackend.cpp (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ mediamanager/halbackend.cpp (.../work/coolos_media) (revision 521818) +--- mediamanager/halbackend.cpp (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ mediamanager/halbackend.cpp (.../work/coolos_media) (Revision 523597) @@ -21,9 +21,16 @@ #include <stdlib.h> @@ -1842,7 +1842,7 @@ + + for (; it!=end; ++it) + { -+ if ((*it)->mountedFrom() == medium->deviceNode() || (*it)->realDeviceName() == medium->deviceNode()) ++ if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) + { + QStringList opts = (*it)->mountOptions(); + if (opts.contains("user")) @@ -1861,7 +1861,7 @@ + QString mountPoint = isInFstab(medium); + if (!mountPoint.isNull()) + { -+ kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << endl; ++ kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; + KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); + connect(job, SIGNAL( result (KIO::Job *)), + SLOT( slotResult( KIO::Job *))); @@ -2048,8 +2048,8 @@ #include "halbackend.moc" Index: mediamanager/mediamanager.h =================================================================== ---- mediamanager/mediamanager.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ mediamanager/mediamanager.h (.../work/coolos_media) (revision 521818) +--- mediamanager/mediamanager.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ mediamanager/mediamanager.h (.../work/coolos_media) (Revision 523597) @@ -28,6 +28,7 @@ #include "removablebackend.h" #include "mediadirnotify.h" @@ -2081,8 +2081,8 @@ Index: mediamanager/halbackend.h =================================================================== ---- mediamanager/halbackend.h (.../KDE/3.5/kdebase/kioslave/media) (revision 501904) -+++ mediamanager/halbackend.h (.../work/coolos_media) (revision 521818) +--- mediamanager/halbackend.h (.../KDE/3.5/kdebase/kioslave/media) (Revision 501904) ++++ mediamanager/halbackend.h (.../work/coolos_media) (Revision 523597) @@ -104,6 +104,9 @@ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

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

28 Mar '06

Hello community, here is the log from the commit of package gfxboot checked in at Tue Mar 28 18:27:16 CEST 2006. -------- --- /work/SRC/arch/i386/gfxboot/gfxboot.changes 2006-03-27 16:38:53.000000000 +0200 +++ /work/src/done/STABLE/gfxboot/gfxboot.changes 2006-03-28 18:04:09.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 28 18:03:59 CEST 2006 - snwint(a)suse.de + +- added new 'welcome' screen + +------------------------------------------------------------------- Old: ---- gfxboot-3.2.16.tar.bz2 New: ---- gfxboot-3.2.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.wL9rQM/_old 2006-03-28 18:26:53.000000000 +0200 +++ /var/tmp/diff_new_pack.wL9rQM/_new 2006-03-28 18:26:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gfxboot (Version 3.2.16) +# spec file for package gfxboot (Version 3.2.17) # # 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.16 +Version: 3.2.17 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: gfxboot-3.2.16.tar.bz2 +Source: gfxboot-3.2.17.tar.bz2 Source1: NLD.tar.bz2 Source2: SLES.tar.bz2 Source3: SuSE.tar.bz2 @@ -58,6 +58,8 @@ /usr/share/gfxboot %changelog -n gfxboot +* Tue Mar 28 2006 - snwint(a)suse.de +- added new 'welcome' screen * Mon Mar 27 2006 - snwint(a)suse.de - translations updated * Mon Mar 13 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-13 14:25:13.000000000 +0100 +++ new/themes/NLD/Makefile 2006-03-28 17:54:35.000000000 +0200 @@ -17,7 +17,7 @@ DEFAULT_LANG = PIC_COMMON = timer_a.jpg -PIC_INSTALL = back.jpg +PIC_INSTALL = back.jpg welcome.jpg text*.jpg PIC_BOOT = back-low.jpg FILES_INST = init languages $(TRANSLATIONS) 16x16.fnt kroete.dat \ Binary files old/themes/NLD/welcome.jpg and new/themes/NLD/welcome.jpg differ ++++++ 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-13 14:24:28.000000000 +0100 +++ new/themes/SLES/Makefile 2006-03-28 17:54:26.000000000 +0200 @@ -17,7 +17,7 @@ DEFAULT_LANG = PIC_COMMON = timer_a.jpg -PIC_INSTALL = back.jpg +PIC_INSTALL = back.jpg welcome.jpg text*.jpg PIC_BOOT = back-low.jpg FILES_INST = init languages $(TRANSLATIONS) 16x16.fnt kroete.dat \ Binary files old/themes/SLES/welcome.jpg and new/themes/SLES/welcome.jpg differ ++++++ 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-13 15:08:25.000000000 +0100 +++ new/themes/SuSE/Makefile 2006-03-28 16:18:18.000000000 +0200 @@ -17,7 +17,7 @@ DEFAULT_LANG = PIC_COMMON = timer_a.jpg -PIC_INSTALL = back.jpg +PIC_INSTALL = back.jpg welcome.jpg text*.jpg 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 2005-09-05 11:59:14.000000000 +0200 +++ new/themes/SuSE/bsplash.inc 2006-03-28 17:53:38.000000000 +0200 @@ -8,22 +8,76 @@ % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Some global vars. -% Boot loader splash areas to uncover. -% -/bsplash.areas [ - [ 327 230 144 108 true ] - [ 82 68 131 35 false ] - [ 205 157 125 32 false ] - [ 431 77 173 37 false ] - [ 661 125 61 112 false ] - [ 62 358 162 51 false ] - [ 204 461 95 36 false ] - [ 388 397 127 34 false ] - [ 560 450 169 39 false ] +/.b_x 0 def +/.b_y 1 def +/.b_dx 2 def +/.b_dy 3 def +/.b_steps 4 def +/.b_mask 5 def +/.b_count 6 def +/.b_w 7 def +/.b_h 8 def +/.b_back 9 def +/.b_tmp1 10 def +/.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 ] ] def % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Init splash. +% +% ( ) ==> ( ) +% +/bsplash.init { + bsplash.list { + dup .b_mask get readimage over .b_mask rot put + dup .b_mask get dup .undef ne { + imgsize + 2 index .b_h rot put + over .b_w rot put + + dup .b_x get over .b_y get moveto + dup .b_w get over .b_steps get 2 index .b_dx get abs mul add + 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 + } { + pop + } ifelse + pop + } forall +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Free splash memory. +% +% ( ) ==> ( ) +% +/bsplash.free { + bsplash.list { + dup .b_mask get free dup .b_mask .undef put + dup .b_back get free + dup .b_tmp1 get free + dup .b_tmp2 get free + pop + } forall +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % Show boot loader splash. % % ( ) ==> ( ) @@ -31,72 +85,77 @@ /bsplash.show { currentimage - "splash.jpg" findfile /splash.file over def setimage loadpalette - /max_image_colors max_image_colors image.colors max def + "welcome.jpg" findfile /splash.file over def setimage -% 0 0 moveto currentpoint 1 1 image getpixel setcolor screen.size fillrect - -% 7 0xffffff setpalette 0 0 moveto 0 0 image.size image - "greeting.jpg" findfile /splash.file2 over def setimage + bsplash.init - % center image - image.size screen.size exch 4 -1 roll sub 2 div 3 1 roll exch sub 2 div - /bsplash.y exch def - /bsplash.x exch def - - bsplash.areas 0 get - dup 0 get over 1 get moveto currentpoint bsplash.x bsplash.y rmoveto - 2 index 2 get 3 index 3 get 5 -1 roll pop blendit - 700000 usleep + 500000 usleep { - bsplash.areas rand over length mod get - dup 4 get { - pop - } { - dup 0 get over 1 get moveto currentpoint bsplash.x bsplash.y rmoveto - 2 index 2 get 3 index 3 get 5 -1 roll 4 true put blendit - 70000 usleep - } ifelse - - true - 0 1 bsplash.areas length 1 sub { - bsplash.areas exch get 4 get and - } for - { exit } if + 0 usleep + bsplash.run { exit } if } loop + bsplash.free + setimage - splash.file2 free /splash.file2 .undef def splash.file free /splash.file .undef def -} def - - -/blendit { - /b.w exch def - /b.h exch def - - moveto - /b.back b.h b.w savescreen def - /b.mask currentpoint b.h 1 add b.w 1 add unpackimage def - - currentpoint +} def - 0 0 moveto - 0x303030 b.mask b.back blend - 1 1 moveto - white b.mask b.back blend +% Run splash animations. Return 'true' when done. +% +% ( ) ==> ( true|false ) +% +/bsplash.run { + true - moveto - b.back restorescreen + bsplash.list { + dup .b_mask get .undef ne over .b_count get .undef ne and { + exch pop false exch + + dup .b_count get 1 add over .b_count rot put + + % count runs from 0 ... steps inclusive + + dup .b_count get 0 ge { + + % copy background + dup .b_dx get over .b_count get mul 10 div + over .b_dx get 2 index .b_steps get mul 10 div neg 0 max add + over .b_dy get 2 index .b_count get mul 10 div + 2 index .b_dy get 3 index .b_steps get mul 10 div neg 0 max add + moveto + dup .b_back get 0xff 2 index .b_tmp1 get blend + + % we need 2 copies + 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 + + % 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 + + % show result + dup .b_x get over .b_dx get 2 index .b_count get mul 10 div add + over .b_dx get 2 index .b_steps get mul 10 div neg 0 max add + over .b_y get 2 index .b_dy get 3 index .b_count get mul 10 div add + 2 index .b_dy get 3 index .b_steps get mul 10 div neg 0 max add + moveto + dup .b_tmp2 get restorescreen + + } if + + dup .b_count get over .b_steps get eq { dup .b_count .undef put } if + } if + pop + } forall - b.mask free - b.back free } def diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/themes/SuSE/common.inc new/themes/SuSE/common.inc --- old/themes/SuSE/common.inc 2006-03-27 16:37:16.000000000 +0200 +++ new/themes/SuSE/common.inc 2006-03-28 14:51:46.000000000 +0200 @@ -535,8 +535,6 @@ dup window.init window.show -% fadein_logo - syslinux { enough_mem not livecd and { @@ -557,8 +555,6 @@ } ifelse } if - % fade_warning.init - } def @@ -1106,26 +1102,6 @@ } def -/fadeout_logo { - /cols 256 malloc def - - 0 1 255 { cols exch 0 put } for - - 10 1 150 { - 10 1 100 { - over exch moveto getpixel - cols exch 1 put - } for - pop - } for - cols 10 10 moveto getpixel 0 fade -} def - -/fadein_logo { - cols 10 10 moveto getpixel fadein -} def - - % Allocate and define a new color. % % ( palette ) ==> ( color ) @@ -1166,7 +1142,9 @@ % ( file_name ) ==> ( image ) /readimage { - findfile dup setimage 0 0 image.size unpackimage exch free + findfile dup .undef ne { + dup setimage 0 0 image.size unpackimage exch free + } if } def @@ -1611,57 +1589,8 @@ ptheme small_layout or { /bsplash.done { } def } { - /bsplash.done { } def - % bsplash.show + bsplash.show } ifelse check_arch_boot_dir - -/fade_warning false def - -% ( time ) ==> ( ) -/Timer { -% fade_warning not { return } if - -% /fade.count fade.count 10 sub def - -% fade.count 0 lt { -% /fade_warning false def -% return -% } if - -% fade.count 255 gt { return } if - -% % copy to fade.bg fade.buf -% 0 0 moveto fade.bg 0xff fade.buf blend - -% 0 0 moveto -% fade.fg fade.count fade.buf blend - -% fade.x fade.y moveto fade.buf restorescreen - -} def - - -/fade_warning.init { - /fade.msg "Preliminary theming - no complaints!" def - fade.msg strsize /fade.height exch 1 add def /fade.width exch 1 add def - /fade.x clip.size pop fade.width sub 2 div def - /fade.y 420 def - - /fade.bg fade.x fade.y moveto fade.width fade.height savescreen def - - fade.x fade.y moveto 1 1 rmoveto - 0x806080 setcolor fade.msg show - fade.x fade.y moveto - 0xc04040 setcolor fade.msg show - - /fade.fg fade.x fade.y moveto fade.width fade.height savescreen def - /fade.buf fade.x fade.y moveto fade.width fade.height savescreen def - - /fade.count 0x300 def - - /fade_warning true def -} def - Binary files old/themes/SuSE/text1.jpg and new/themes/SuSE/text1.jpg differ Binary files old/themes/SuSE/text2a.jpg and new/themes/SuSE/text2a.jpg differ Binary files old/themes/SuSE/text2b.jpg and new/themes/SuSE/text2b.jpg differ Binary files old/themes/SuSE/text2c.jpg and new/themes/SuSE/text2c.jpg differ Binary files old/themes/SuSE/text3.jpg and new/themes/SuSE/text3.jpg differ Binary files old/themes/SuSE/text4a.jpg and new/themes/SuSE/text4a.jpg differ Binary files old/themes/SuSE/text4b.jpg and new/themes/SuSE/text4b.jpg differ Binary files old/themes/SuSE/text4c.jpg and new/themes/SuSE/text4c.jpg differ Binary files old/themes/SuSE/welcome.jpg and new/themes/SuSE/welcome.jpg differ ++++++ gfxboot-3.2.16.tar.bz2 -> gfxboot-3.2.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.16/Changelog new/gfxboot-3.2.17/Changelog --- old/gfxboot-3.2.16/Changelog 2006-03-27 16:38:32.000000000 +0200 +++ new/gfxboot-3.2.17/Changelog 2006-03-28 18:02:45.000000000 +0200 @@ -1,3 +1,6 @@ +28/3/2006: v3.2.17 + - added new 'welcome' screen + 27/3/2006: v3.2.16 - translations updated diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gfxboot-3.2.16/VERSION new/gfxboot-3.2.17/VERSION --- old/gfxboot-3.2.16/VERSION 2006-03-21 12:01:56.000000000 +0100 +++ new/gfxboot-3.2.17/VERSION 2006-03-28 18:02:22.000000000 +0200 @@ -1 +1 @@ -3.2.16 +3.2.17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit NetworkManager
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package NetworkManager checked in at Tue Mar 28 18:26:48 CEST 2006. -------- --- /work/SRC/all/NetworkManager/NetworkManager.changes 2006-03-27 18:13:21.000000000 +0200 +++ /work/src/done/STABLE/NetworkManager/NetworkManager.changes 2006-03-28 17:37:59.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Mar 28 17:35:54 CEST 2006 - rml(a)suse.de + +- Don't let wpa_supplicant scan with the airo driver (bug #161389) +- Don't let wpa_supplicant scan when creating a new Ad-Hoc network, + even if using the madwifi driver +- nm-applet: minor HIG-related UI tweaks + +------------------------------------------------------------------- New: ---- nm-0.6-branch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.3g2atM/_old 2006-03-28 18:25:54.000000000 +0200 +++ /var/tmp/diff_new_pack.3g2atM/_new 2006-03-28 18:25:54.000000000 +0200 @@ -31,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 1 +Release: 2 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -41,6 +41,7 @@ Patch3: nm-madwifi-strength-rml.patch Patch4: nm-wireless-driver-workarounds-rml.patch Patch5: nm-debug-wpa-less-rml.patch +Patch6: nm-0.6-branch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: wireless-tools >= %{wireless_version} Requires: dbus-1 >= %{dbus_version} @@ -141,6 +142,7 @@ %patch3 -p0 %patch4 -p0 %patch5 -p0 +%patch6 -p1 %build sed -i s/" --sm-disable"// nm-applet.desktop @@ -205,10 +207,7 @@ %{gnome_datadir}/nm-applet/applet.glade %{gnome_datadir}/icons/hicolor/16x16/apps/*.png %{gnome_datadir}/icons/hicolor/22x22/apps/*.png -%{gnome_datadir}/icons/hicolor/48x48/apps/nm-device-wired.png -%{gnome_datadir}/icons/hicolor/48x48/apps/nm-device-wireless.png -%{gnome_datadir}/icons/hicolor/48x48/apps/nm-device-wireless-encrypted.png -%{gnome_datadir}/icons/hicolor/48x48/apps/nm-no-connection.png +%{gnome_datadir}/icons/hicolor/48x48/apps/*.png %dir %{gnome_datadir}/gnome-vpn-properties %{gnome_datadir}/gnome-vpn-properties/nm-vpn-properties.glade @@ -243,6 +242,11 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Tue Mar 28 2006 - rml(a)suse.de +- Don't let wpa_supplicant scan with the airo driver (bug #161389) +- Don't let wpa_supplicant scan when creating a new Ad-Hoc network, + even if using the madwifi driver +- nm-applet: minor HIG-related UI tweaks * Mon Mar 27 2006 - rml(a)suse.de - Revert ypbind restart behavior (Novell bug #159070) - Bump wpa_supplicant requirement to version 0.4.8-9 (Bug #144268) ++++++ nm-0.6-branch.patch ++++++ NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE ChangeLog | 31 +++++++++++++++++++++++ NEWS | 5 +++ gnome/applet/applet.glade | 60 +++++++++++++++++++++++----------------------- src/nm-netlink-monitor.c | 4 +-- test/nm-tool.c | 4 +-- 5 files changed, 69 insertions(+), 35 deletions(-) diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/ChangeLog NetworkManager-0.6-branch/ChangeLog --- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500 +++ NetworkManager-0.6-branch/ChangeLog 2006-03-27 15:33:31.000000000 -0500 @@ -1,3 +1,34 @@ +2006-03-27 Dan Williams <dcbw(a)redhat.com> + + Patch from Christian Persch <chpe(a)gnome.org> + * gnome/applet/applet.glade + - HIG fixes; mostly for spacing and borders (gnome.org #336220) + +2006-03-27 Dan Williams <dcbw(a)redhat.com> + + Patch from Diffe <diffie(a)blazebox.homeip.net> + * src/backends/NetworkManagerSlackware.c + - Don't restart howl, since it's been replaced by Avahi + in most distributions + +2006-03-27 Dan Williams <dcbw(a)redhat.com> + + Patch from Tor Krill <bugzilla(a)krill.nu> + * configure.in + initscript/Makefile.am + src/backends/Makefile.am + src/backends/NetworkManagerArch.c + initscript/Arch/Makefile.am + initscript/Arch/networkmanager-dispatcher.in + initscript/Arch/networkmanager.in + - Add Arch Linux support, fixes gnome.org #335147 + +2006-03-27 Dan Williams <dcbw(a)redhat.com> + + Patch from Diffe <diffie(a)blazebox.homeip.net> + * initscript/Slackware/rc.networkmanager + - update, fixed gnome.org #333368 + 2006-03-27 Robert Love <rml(a)novell.com> * configure.in: Bump version to 0.6.2. diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/gnome/applet/applet.glade NetworkManager-0.6-branch/gnome/applet/applet.glade --- NetworkManager-0.6.2/gnome/applet/applet.glade 2006-03-23 10:14:45.000000000 -0500 +++ NetworkManager-0.6-branch/gnome/applet/applet.glade 2006-03-27 15:31:57.000000000 -0500 @@ -4,12 +4,12 @@ <glade-interface> <widget class="GtkDialog" id="trust_dialog"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="title" translatable="yes"> </property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property> <property name="modal">True</property> - <property name="resizable">True</property> + <property name="resizable">False</property> <property name="destroy_with_parent">False</property> <property name="decorated">True</property> <property name="skip_taskbar_hint">False</property> @@ -24,7 +24,7 @@ <widget class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="spacing">14</property> <child internal-child="action_area"> <widget class="GtkHButtonBox" id="dialog-action_area1"> @@ -68,7 +68,7 @@ <child> <widget class="GtkHBox" id="hbox1"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">12</property> @@ -160,12 +160,12 @@ </widget> <widget class="GtkDialog" id="driver_sucks_dialog"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="title" translatable="yes"> </property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property> <property name="modal">True</property> - <property name="resizable">True</property> + <property name="resizable">False</property> <property name="destroy_with_parent">False</property> <property name="decorated">True</property> <property name="skip_taskbar_hint">False</property> @@ -180,7 +180,7 @@ <widget class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="spacing">14</property> <child internal-child="action_area"> <widget class="GtkHButtonBox" id="hbuttonbox1"> @@ -211,7 +211,7 @@ <child> <widget class="GtkHBox" id="hbox2"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">12</property> @@ -303,7 +303,7 @@ </widget> <widget class="GtkDialog" id="other_network_dialog"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="title" translatable="yes">Other Wireless Network...</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property> @@ -324,7 +324,7 @@ <widget class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">4</property> + <property name="spacing">2</property> <child internal-child="action_area"> <widget class="GtkHButtonBox" id="dialog-action_area1"> @@ -368,7 +368,7 @@ <child> <widget class="GtkHBox" id="hbox1"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">12</property> @@ -427,8 +427,8 @@ <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">12</property> - <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <widget class="GtkLabel" id="wireless_adapter_label"> @@ -485,7 +485,7 @@ <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">1</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -534,7 +534,7 @@ <property name="justify">GTK_JUSTIFY_LEFT</property> <property name="wrap">False</property> <property name="selectable">False</property> - <property name="xalign">1</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> @@ -618,7 +618,7 @@ </widget> <widget class="GtkDialog" id="passphrase_dialog"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="has_focus">True</property> <property name="title" translatable="yes">Wireless Network Key Required</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> @@ -639,7 +639,7 @@ <widget class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">12</property> + <property name="spacing">2</property> <child internal-child="action_area"> <widget class="GtkHButtonBox" id="dialog-action_area1"> @@ -683,7 +683,7 @@ <child> <widget class="GtkHBox" id="hbox1"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">12</property> @@ -741,7 +741,7 @@ <widget class="GtkHBox" id="hbox7"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <widget class="GtkLabel" id="security_combo_label"> @@ -828,7 +828,7 @@ </widget> <widget class="GtkDialog" id="info_dialog"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="title" translatable="yes">Connection Information</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> @@ -900,7 +900,7 @@ <widget class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <child> <widget class="GtkImage" id="image1"> @@ -926,8 +926,8 @@ <property name="n_rows">14</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">3</property> - <property name="column_spacing">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <widget class="GtkLabel" id="label-interface"> @@ -1752,7 +1752,7 @@ <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <widget class="GtkLabel" id="wep_key_label"> @@ -1990,7 +1990,7 @@ <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <widget class="GtkEntry" id="leap_username_entry"> @@ -2179,8 +2179,8 @@ <property name="n_rows">3</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">4</property> - <property name="column_spacing">4</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <widget class="GtkLabel" id="wpa_psk_label"> @@ -2416,8 +2416,8 @@ <property name="n_rows">10</property> <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">4</property> - <property name="column_spacing">4</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <widget class="GtkLabel" id="wpa-eap-ca-cert-file-label"> @@ -2985,7 +2985,7 @@ <property name="n_columns">2</property> <property name="homogeneous">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <widget class="GtkLabel" id="wep_passphrase_label"> diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/NEWS NetworkManager-0.6-branch/NEWS --- NetworkManager-0.6.2/NEWS 2006-03-27 11:05:17.000000000 -0500 +++ NetworkManager-0.6-branch/NEWS 2006-03-28 09:47:21.000000000 -0500 @@ -3,7 +3,10 @@ Overview of changes since NetworkManager-0.6.2 ============================================== -0.6.2 is a bug fix release. +0.6.2 is a bug fix release. Note that NetworkManager no longer automatically +runs dhcdbd if it is not running. This means that it is now the system's +responsibility to start dhcdbd prior to NetworkManager, e.g. in the +distribution's NetworkManager initscript. * NetworkManager * Many, many bug fixes (Everyone) diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/src/nm-netlink-monitor.c NetworkManager-0.6-branch/src/nm-netlink-monitor.c --- NetworkManager-0.6.2/src/nm-netlink-monitor.c 2006-03-27 10:20:28.000000000 -0500 +++ NetworkManager-0.6-branch/src/nm-netlink-monitor.c 2006-03-27 15:35:20.000000000 -0500 @@ -133,8 +133,8 @@ } gboolean -nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor, - GError **error) +nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor, + GError **error) { struct sockaddr_nl monitor_address = { .nl_family = 0 }; int fd, saved_errno; diff -urN --exclude=initscript --exclude=backends --exclude=configure.in --exclude=CVS NetworkManager-0.6.2/test/nm-tool.c NetworkManager-0.6-branch/test/nm-tool.c --- NetworkManager-0.6.2/test/nm-tool.c 2006-03-02 18:01:33.000000000 -0500 +++ NetworkManager-0.6-branch/test/nm-tool.c 2006-03-27 12:58:53.000000000 -0500 @@ -84,7 +84,7 @@ success = FALSE; break; } - fprintf (stderr, "State: %s\n\n", state_string); + printf ("State: %s\n\n", state_string); return success; } @@ -327,7 +327,7 @@ print_string ("HW Address", hw_addr); /* Capabilities */ - fprintf (stderr, "\n Capabilities:\n"); + printf ("\n Capabilities:\n"); if (caps & NM_DEVICE_CAP_NM_SUPPORTED) print_string (" Supported", "yes"); else ++++++ nm-wireless-driver-workarounds-rml.patch ++++++ --- /var/tmp/diff_new_pack.3g2atM/_old 2006-03-28 18:25:55.000000000 +0200 +++ /var/tmp/diff_new_pack.3g2atM/_new 2006-03-28 18:25:55.000000000 +0200 @@ -1,10 +1,10 @@ Index: src/nm-device-802-11-wireless.c =================================================================== RCS file: /cvs/gnome/NetworkManager/src/nm-device-802-11-wireless.c,v -retrieving revision 1.60.2.3 -diff -u -r1.60.2.3 nm-device-802-11-wireless.c ---- src/nm-device-802-11-wireless.c 9 Mar 2006 21:51:24 -0000 1.60.2.3 -+++ src/nm-device-802-11-wireless.c 27 Mar 2006 15:46:30 -0000 +retrieving revision 1.60.2.5 +diff -u -r1.60.2.5 nm-device-802-11-wireless.c +--- src/nm-device-802-11-wireless.c 27 Mar 2006 16:11:53 -0000 1.60.2.5 ++++ src/nm-device-802-11-wireless.c 28 Mar 2006 15:19:01 -0000 @@ -214,22 +214,13 @@ if ((data_len >= minlen) && range->we_version_compiled >= 18) @@ -116,14 +116,14 @@ guint32 caps; gboolean supports_wpa; -@@ -2489,12 +2494,23 @@ +@@ -2489,12 +2494,25 @@ || (caps & NM_802_11_CAP_PROTO_WPA2); /* Use "AP_SCAN 2" if: - * - The wireless network is non-broadcast or user created - * - The wireless driver does not support WPA -+ * - The wireless driver is orinoco or prism54 -+ * - The wireless network is user created, but not madwifi ++ * - The wireless driver is orinoco, prism54, or airo ++ * - The wireless network is user created + * - The wireless driver does not support WPA + * Otherwise, we prefer "AP_SCAN 1". */ @@ -133,8 +133,10 @@ + if (!strcmp (kernel_driver, "orinoco_cs")) + ap_scan = "AP_SCAN 2"; + else if (!strcmp (kernel_driver, "prism54")) ++ ap_scan = "AP_SCAN 2"; ++ else if (!strcmp (kernel_driver, "airo")) ap_scan = "AP_SCAN 2"; -+ else if (user_created && strcmp (kernel_driver, "ath_pci")) ++ else if (user_created) + ap_scan = "AP_SCAN 2"; + else if (!supports_wpa) + ap_scan = "AP_SCAN 2"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kpowersave
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package kpowersave checked in at Tue Mar 28 17:10:39 CEST 2006. -------- --- /work/SRC/arch/i386/kpowersave/kpowersave.changes 2006-03-28 00:23:12.000000000 +0200 +++ /work/src/done/STABLE/kpowersave/kpowersave.changes 2006-03-28 16:57:29.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 28 16:44:03 CEST 2006 - dkukawka(a)suse.de + +- fixed UTF-8 in desktop files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpowersave.spec ++++++ --- /var/tmp/diff_new_pack.VSYxog/_old 2006-03-28 17:10:19.000000000 +0200 +++ /var/tmp/diff_new_pack.VSYxog/_new 2006-03-28 17:10:19.000000000 +0200 @@ -17,7 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Front-End to powersave Package, Battery Monitor, and General Power Management Support Version: 0.6.0 -Release: 1 +Release: 2 ExclusiveArch: %ix86 x86_64 ia64 ppc Requires: powersave >= 0.12.7 powersave-libs >= 0.12.7 yast2-power-management /sbin/pidof /usr/X11R6/bin/xset Source: %{name}-%{version}.tar.bz2 @@ -80,6 +80,8 @@ /opt/kde3/lib*/libkdeinit_kpowersave.* %changelog -n kpowersave +* Tue Mar 28 2006 - dkukawka(a)suse.de +- fixed UTF-8 in desktop files * Mon Mar 27 2006 - dkukawka(a)suse.de - updated to new stable release 0.6.0: - changed powersave dependency to stable version >= 0.12.7 ++++++ kpowersave-0.6.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/ChangeLog new/kpowersave-0.6.0/ChangeLog --- old/kpowersave-0.6.0/ChangeLog 2006-03-27 23:53:06.000000000 +0200 +++ new/kpowersave-0.6.0/ChangeLog 2006-03-28 16:48:56.000000000 +0200 @@ -1,3 +1,15 @@ +2006-03-28 Danny Kukawka <danny.kukawka(a)web.de> + + Updated package related changelogs: + * ChangeLog.package: + * doc/doxy/changelog.dox: + +2006-03-28 Danny Kukawka <danny.kukawka(a)web.de> + + Fixed UTF-8 in desktop files: + * src/kpowersave-autostart.desktop: + * src/kpowersave.desktop: + 2006-03-27 Danny Kukawka <danny.kukawka(a)web.de> * Doxyfile, configure.in.in, src/main.cpp: update version diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/ChangeLog.package new/kpowersave-0.6.0/ChangeLog.package --- old/kpowersave-0.6.0/ChangeLog.package 2006-03-27 23:53:06.000000000 +0200 +++ new/kpowersave-0.6.0/ChangeLog.package 2006-03-28 16:48:56.000000000 +0200 @@ -5,6 +5,11 @@ * * ******************************************************************* ------------------------------------------------------------------- +Tue Mar 28 16:44:03 CEST 2006 - dkukawka(a)suse.de + +- fixed UTF-8 in desktop files + +------------------------------------------------------------------- Mon Mar 27 23:19:38 CEST 2006 - dkukawka(a)suse.de - updated to new stable release 0.6.0: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/doc/doxy/changelog.dox new/kpowersave-0.6.0/doc/doxy/changelog.dox --- old/kpowersave-0.6.0/doc/doxy/changelog.dox 2006-03-27 23:52:18.000000000 +0200 +++ new/kpowersave-0.6.0/doc/doxy/changelog.dox 2006-03-28 16:47:52.000000000 +0200 @@ -2,6 +2,9 @@ * \page changelog Changelog * \section changelist_sec All changes in the package since init * +* Tue Mar 28 16:44:03 CEST 2006 - dkukawka(a)suse.de +* - fixed UTF-8 in desktop files +* * Mon Mar 27 23:19:38 CEST 2006 - dkukawka(a)suse.de * - updated to new stable release 0.6.0: * - changed powersave dependency to stable version >= 0.12.7 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/src/kpowersave-autostart.desktop new/kpowersave-0.6.0/src/kpowersave-autostart.desktop --- old/kpowersave-0.6.0/src/kpowersave-autostart.desktop 2006-03-27 23:51:50.000000000 +0200 +++ new/kpowersave-0.6.0/src/kpowersave-autostart.desktop 2006-03-28 16:47:20.000000000 +0200 @@ -1,4 +1,4 @@ -[Desktop Entry] +[Desktop Entry] Encoding=UTF-8 Name=kpowersave Name[xx]=xxkpowersavexx diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kpowersave-0.6.0/src/kpowersave.desktop new/kpowersave-0.6.0/src/kpowersave.desktop --- old/kpowersave-0.6.0/src/kpowersave.desktop 2006-03-27 23:51:50.000000000 +0200 +++ new/kpowersave-0.6.0/src/kpowersave.desktop 2006-03-28 16:47:20.000000000 +0200 @@ -1,4 +1,4 @@ -[Desktop Entry] +[Desktop Entry] Encoding=UTF-8 Name=kpowersave Name[xx]=xxkpowersavexx ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit dhcdbd
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package dhcdbd checked in at Tue Mar 28 17:09:41 CEST 2006. -------- --- /work/SRC/all/dhcdbd/dhcdbd.changes 2006-03-21 21:28:17.000000000 +0100 +++ /work/src/done/STABLE/dhcdbd/dhcdbd.changes 2006-03-28 16:58:55.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 28 16:58:28 CEST 2006 - rml(a)suse.de + +- Log debugging spew less readily (Novell bug #161138) + +------------------------------------------------------------------- New: ---- dhcdbd-less-verbose-logging-rml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcdbd.spec ++++++ --- /var/tmp/diff_new_pack.WXlDu9/_old 2006-03-28 17:08:43.000000000 +0200 +++ /var/tmp/diff_new_pack.WXlDu9/_new 2006-03-28 17:08:43.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-devel Summary: DHCP D-BUS Daemon Version: 1.12 -Release: 8 +Release: 10 License: GPL Group: Productivity/Networking/Boot/Utilities URL: http://people.redhat.com/~jvdias/dhcdbd @@ -23,6 +23,7 @@ Patch1: dhcdbd-remove-named-user-rml.patch Patch2: dhcdbd-no-nr_open-rml.patch Patch3: dhcdbd-dbus-reconnect-thoenig-02.patch +Patch4: dhcdbd-less-verbose-logging-rml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: dhcp-client >= 3.0.3 dbus-1 >= 0.60 @@ -42,6 +43,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p0 +%patch4 -p1 %build make CFLAGS="-Wall $RPM_OPT_FLAGS" CC='gcc' LIBDIR=%_lib @@ -65,6 +67,8 @@ %dir /var/lib/named %changelog -n dhcdbd +* Tue Mar 28 2006 - rml(a)suse.de +- Log debugging spew less readily (Novell bug #161138) * Tue Mar 21 2006 - rml(a)suse.de - Survive DBUS restarts (Novell bug #150042) * Fri Feb 24 2006 - rml(a)suse.de ++++++ dhcdbd-less-verbose-logging-rml.patch ++++++ dbus_service.c | 5 ----- 1 file changed, 5 deletions(-) diff -urN dhcdbd-1.12/dbus_service.c dhcdbd/dbus_service.c --- dhcdbd-1.12/dbus_service.c 2006-01-17 16:23:51.000000000 -0500 +++ dhcdbd/dbus_service.c 2006-03-28 09:58:24.000000000 -0500 @@ -247,12 +247,7 @@ return r; mhpp = tfind(&mhn, &(root->tree), mh_comparator); if ( (mhpp == 0L) || ((mhp=*mhpp)==0L) ) - { - if( cs->eh != 0L ) (*(cs->eh))("message_handler: message handler not found under %s for sub-path %s", path, sub_path); - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - } } r =( (*(mhp->mh)) ( cs, type, reply, serial, dest, path, member, interface, if_suffix, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

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

28 Mar '06

Hello community, here is the log from the commit of package yast2-vm checked in at Tue Mar 28 17:08:35 CEST 2006. -------- --- /work/SRC/all/yast2-vm/yast2-vm.changes 2006-03-26 08:13:54.000000000 +0200 +++ /work/src/done/STABLE/yast2-vm/yast2-vm.changes 2006-03-28 15:54:29.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 28 15:43:10 CEST 2006 - lslezak(a)suse.cz + +- x86_64 arch: use x86_64 packages, not i386 (#161267) +- 2.13.29 + +------------------------------------------------------------------- Old: ---- yast2-vm-2.13.28.tar.bz2 New: ---- yast2-vm-2.13.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.Mt3z6c/_old 2006-03-28 17:06:39.000000000 +0200 +++ /var/tmp/diff_new_pack.Mt3z6c/_new 2006-03-28 17:06:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-vm (Version 2.13.28) +# spec file for package yast2-vm (Version 2.13.29) # # 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.28 +Version: 2.13.29 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-vm-2.13.28.tar.bz2 +Source0: yast2-vm-2.13.29.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.28 +%setup -n yast2-vm-2.13.29 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,9 @@ %doc %{prefix}/share/doc/packages/yast2-vm %changelog -n yast2-vm +* Tue Mar 28 2006 - lslezak(a)suse.cz +- x86_64 arch: use x86_64 packages, not i386 (#161267) +- 2.13.29 * Sat Mar 25 2006 - ccoffing(a)novell.com - Overhaul from Provo, to make module more feature complete. - 2.13.28 ++++++ yast2-vm-2.13.28.tar.bz2 -> yast2-vm-2.13.29.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.28/Makefile.am new/yast2-vm-2.13.29/Makefile.am --- old/yast2-vm-2.13.28/Makefile.am 2006-03-26 08:12:33.000000000 +0200 +++ new/yast2-vm-2.13.29/Makefile.am 2006-03-28 15:47:28.000000000 +0200 @@ -214,4 +214,4 @@ # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agents control doc src +SUBDIRS = agents control doc src testsuite diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.28/Makefile.in new/yast2-vm-2.13.29/Makefile.in --- old/yast2-vm-2.13.28/Makefile.in 2006-03-26 08:12:39.000000000 +0200 +++ new/yast2-vm-2.13.29/Makefile.in 2006-03-28 15:47:36.000000000 +0200 @@ -231,7 +231,7 @@ # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = agents control doc src +SUBDIRS = agents control doc src testsuite all: all-recursive .SUFFIXES: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.28/VERSION new/yast2-vm-2.13.29/VERSION --- old/yast2-vm-2.13.28/VERSION 2006-03-26 07:25:06.000000000 +0200 +++ new/yast2-vm-2.13.29/VERSION 2006-03-28 15:47:19.000000000 +0200 @@ -1 +1 @@ -2.13.28 +2.13.29 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.28/configure new/yast2-vm-2.13.29/configure --- old/yast2-vm-2.13.28/configure 2006-03-26 08:12:37.000000000 +0200 +++ new/yast2-vm-2.13.29/configure 2006-03-28 15:47:34.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-vm 2.13.28. +# Generated by GNU Autoconf 2.59 for yast2-vm 2.13.29. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-vm' PACKAGE_TARNAME='yast2-vm' -PACKAGE_VERSION='2.13.28' -PACKAGE_STRING='yast2-vm 2.13.28' +PACKAGE_VERSION='2.13.29' +PACKAGE_STRING='yast2-vm 2.13.29' 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-vm 2.13.28 to adapt to many kinds of systems. +\`configure' configures yast2-vm 2.13.29 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-vm 2.13.28:";; + short | recursive ) echo "Configuration of yast2-vm 2.13.29:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-vm configure 2.13.28 +yast2-vm configure 2.13.29 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-vm $as_me 2.13.28, which was +It was created by yast2-vm $as_me 2.13.29, 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-vm' - VERSION='2.13.28' + VERSION='2.13.29' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.28" +VERSION="2.13.29" RPMNAME="yast2-vm" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -2291,7 +2291,7 @@ ) find control -name *.glade > POTFILES - ac_config_files="$ac_config_files Makefile agents/Makefile control/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile" + ac_config_files="$ac_config_files Makefile agents/Makefile control/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -2700,7 +2700,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-vm $as_me 2.13.28, which was +This file was extended by yast2-vm $as_me 2.13.29, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2755,7 +2755,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-vm config.status 2.13.28 +yast2-vm config.status 2.13.29 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -2864,6 +2864,7 @@ "doc/autodocs/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/autodocs/Makefile" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.28/configure.in new/yast2-vm-2.13.29/configure.in --- old/yast2-vm-2.13.28/configure.in 2006-03-26 08:12:33.000000000 +0200 +++ new/yast2-vm-2.13.29/configure.in 2006-03-28 15:47:27.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-vm, 2.13.28, http://www.suse.de/feedback, yast2-vm) +AC_INIT(yast2-vm, 2.13.29, http://www.suse.de/feedback, yast2-vm) 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.28" +VERSION="2.13.29" RPMNAME="yast2-vm" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -155,7 +155,8 @@ control/Makefile doc/autodocs/Makefile doc/Makefile -src/Makefile) +src/Makefile +testsuite/Makefile) AC_OUTPUT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.28/src/VM_Common.ycp new/yast2-vm-2.13.29/src/VM_Common.ycp --- old/yast2-vm-2.13.28/src/VM_Common.ycp 2006-03-26 07:40:36.000000000 +0200 +++ new/yast2-vm-2.13.29/src/VM_Common.ycp 2006-03-28 15:55:35.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Ladislav Slezak <lslezak(a)suse.cz> * Michael G. Fritch <mgfritch(a)novell.com> * - * $Id: VM_Common.ycp 29389 2006-03-26 05:40:23Z mgfritch $ + * $Id: VM_Common.ycp 29475 2006-03-28 13:52:54Z lslezak $ */ { module "VM_Common"; @@ -590,6 +590,12 @@ { if (pk["status"]:`unknown == `available && pk["srcid"]:-1 == source_id) { + // x86_64 arch: use x86_64 packages, not i386 + if (Arch::x86_64() && pk["arch"]:"unknown" != "x86_64") + { + continue; + } + pkginfo = pk; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.28/testsuite/Makefile.am new/yast2-vm-2.13.29/testsuite/Makefile.am --- old/yast2-vm-2.13.28/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-vm-2.13.29/testsuite/Makefile.am 2005-01-21 18:45:40.000000000 +0100 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.28/testsuite/Makefile.in new/yast2-vm-2.13.29/testsuite/Makefile.in --- old/yast2-vm-2.13.28/testsuite/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-vm-2.13.29/testsuite/Makefile.in 2006-03-28 15:47:36.000000000 +0200 @@ -0,0 +1,369 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = testsuite +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DEJATOOL = $(PACKAGE) +RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +EXPECT = expect +RUNTEST = runtest +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ +CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ +CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ +CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RPMNAME = @RPMNAME@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +ac_ct_STRIP = @ac_ct_STRIP@ +agentdir = @agentdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +clientdir = @clientdir@ +datadir = @datadir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@ +ystartupdir = @ystartupdir@ +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu testsuite/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +check-DEJAGNU: site.exp + srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ + EXPECT=$(EXPECT); export EXPECT; \ + runtest=$(RUNTEST); \ + if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + l='$(DEJATOOL)'; for tool in $$l; do \ + $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + done; \ + else echo "WARNING: could not find \`runtest'" 1>&2; :;\ + fi +site.exp: Makefile + @echo 'Making a new site.exp file...' + @echo '## these variables are automatically generated by make ##' >site.tmp + @echo '# Do not edit here. If you wish to override these values' >>site.tmp + @echo '# edit the last section' >>site.tmp + @echo 'set srcdir $(srcdir)' >>site.tmp + @echo "set objdir `pwd`" >>site.tmp + @echo 'set build_alias "$(build_alias)"' >>site.tmp + @echo 'set build_triplet $(build_triplet)' >>site.tmp + @echo 'set host_alias "$(host_alias)"' >>site.tmp + @echo 'set host_triplet $(host_triplet)' >>site.tmp + @echo 'set target_alias "$(target_alias)"' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp + @-rm -f site.bak + @test ! -f site.exp || mv site.exp site.bak + @mv site.tmp site.exp + +distclean-DEJAGNU: + -rm -f site.exp site.bak + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/tests + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check-local +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-DEJAGNU distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am all-local check check-DEJAGNU check-am check-local \ + clean clean-generic clean-local distclean distclean-DEJAGNU \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-vm-2.13.28/vm.pot new/yast2-vm-2.13.29/vm.pot --- old/yast2-vm-2.13.28/vm.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-vm-2.13.29/vm.pot 2006-03-09 12:38:43.000000000 +0100 @@ -0,0 +1,267 @@ +# 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. +# +msgid "" +msgstr "" +"Project-Id-Version: yast2 9.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-03-06 14:41+0100\n" +"PO-Revision-Date: 2006-03-07 16:51+0100\n" +"Last-Translator: proofreader\n" +"Language-Team: en_US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: control/vm_install.glade:14 +msgid "Xen Virtual Machine Settings" +msgstr "" + +#. warning text in proposal dialog +#: src/VM_Common.ycp:177 +msgid "AutoYast profile for the VM cannot be configured here in full virtualization mode. Configure it inside the VM after boot." +msgstr "The AutoYaST profile for VM cannot be configured here in full virtualization mode. Configure it inside the VM after boot." + +#. error message in proposal +#: src/VM_Common.ycp:335 +msgid "OS installation source is not configured." +msgstr "OS installation source is not configured" + +#. %1 is device name (e.g. hda, sda...) +#: src/VM_XEN.ycp:347 +#, ycp-format +msgid "Disk %1 cannot be used" +msgstr "Disk <tt>%1</tt> cannot be used" + +#: src/VM_XEN.ycp:360 +msgid "Disk hdc cannot be used with CD-ROM emulation" +msgstr "Disk <tt>hdc</tt> cannot be used with CD-ROM emulation" + +#: src/VM_XEN.ycp:380 +msgid "Boot Device: " +msgstr "" + +#: src/VM_XEN.ycp:384 +msgid "CD-ROM Image: " +msgstr "" + +#: src/VM_XEN.ycp:418 src/inst_vm_network.ycp:136 +msgid "Use DHCP For Network Configuration" +msgstr "Use DHCP for Network Configuration" + +#. xen domain0 installation help text - 1/4 +#: src/dom0_setup.ycp:38 +msgid "" +"Domain0 ConfigurationConfiguration\n" +"of the management domain (domain0) has two parts.\n" +msgstr "" +"<big>Domain0 Configuration</big>Configuration\n" +"of the management domain (domain0) has two parts.\n" + +#. xen domain0 installation help text - 2/4 +#: src/dom0_setup.ycp:43 +msgid "" +"The equired packages are installed into the system at first. Then the\n" +"boot loader is switched to GRUB if it is not already used and the Xen section is\n" +"added to the boot loader menu if it is missing.\n" +msgstr "" +"The required packages are installed into the system first. Then the\n" +"boot loader is switched to GRUB if it is not already used and the Xen section is\n" +"added to the boot loader menu if it is missing.\n" + +#. xen domain0 installation help text - 3/4 +#: src/dom0_setup.ycp:49 +msgid "" +"GRUB is needed because it supports the multiboot standard required\n" +"to boot the Xen hypervisor and Linux kernel.\n" +msgstr "" + +#. popup message - ask user to reboot the machine into Xen kernel +#: src/dom0_setup.ycp:178 +msgid "" +"The machine is ready to start the Xen management domain.\n" +"\n" +"Reboot the machine and select the Xen section in the boot loader menu to start it.\n" +msgstr "" + +#. help text for autoyast settings (2/3) +#: src/inst_vm_autoyast.ycp:42 +msgid "" +"It is possible to install the virtual machine using AutoYast.\n" +"You can set all installation options in AutoYast and store them into a profile\n" +"file that can be used later for automatic installation.\n" +msgstr "" +"It is possible to install the virtual machine using AutoYaST.\n" +"You can set all installation options in AutoYaST and store them into a profile\n" +"file that can be used later for automatic installation.\n" + +#. help text for autoyast settings (3/3) +#: src/inst_vm_autoyast.ycp:47 +msgid "" +"If the profile contains configuration of a virtual machine\n" +"(CPU, memory, virtual disk configuration, etc.) it can be loaded and\n" +"used instead of the current configuration.\n" +msgstr "" +"If the profile contains configuration of a virtual machine\n" +"(CPU, memory, virtual disk configuration, etc.), it can be loaded and\n" +"used instead of the current configuration.\n" + +#: src/inst_vm_disks.ycp:32 +msgid "" +"Create Virtual Disk ImageYast will\n" +"create a new disk image of specified size." +msgstr "" +"Create Virtual Disk ImageYaST\n" +"creates a new disk image of the specified size." + +#: src/inst_vm_disks.ycp:35 src/inst_vm_disks.ycp:128 +msgid "Virtual Machine Device is the name of the virtual disk inside the virtual machine." +msgstr "" + +#: src/inst_vm_disks.ycp:41 +msgid "" +"It is possible to create sparse image\n" +"file which dynamically allocates disk space when it is needed." +msgstr "" +"It is possible to create a sparse image\n" +"file that dynamically allocates disk space when it is needed." + +#. label - disk device widget (enter /dev/hda1, /dev/sdb3...) +#: src/inst_vm_disks.ycp:58 src/inst_vm_disks.ycp:145 +msgid "&Virtual Machine Device" +msgstr "" + +#: src/inst_vm_disks.ycp:237 +msgid "Block Device: The virtual machine can use only block devices accessible from domain 0." +msgstr "" + +#: src/inst_vm_disks.ycp:239 +msgid "Virtual Machine Device is the name of the virtual device presented to the virtual machine." +msgstr "" + +#: src/inst_vm_disks.ycp:241 +msgid "" +"The block device can be configured read-only. In this case, the virtual\n" +"machine cannot modify the device in any way.\n" +msgstr "" + +#: src/inst_vm_disks.ycp:254 +msgid "Block Device (Source)" +msgstr "" + +#: src/inst_vm_disks.ycp:430 +msgid "Add Block Device..." +msgstr "" + +#. TODO: check VM_Common::root_device +#. help text +#: src/inst_vm_kickoff.ycp:129 +msgid "" +"Root device was not detected.\n" +"Enter the root device (e.g. /dev/hda1),\n" +"if it is not needed leave it empty." +msgstr "" +"Root device was not detected.\n" +"Enter the root device, such as /dev/hda1.\n" +"If it is not needed, leave it empty." + +#: src/inst_vm_options.ycp:85 +msgid "Use option 'root' (e.g. 'root=/dev/hda1') for root device configuration." +msgstr "Use the <tt>root</tt> option, as in <tt>root=/dev/hda1</tt>, for root device configuration." + +#: src/inst_vm_source.ycp:96 +msgid "&Extract Kernel and RAM Disk Image from an Installation Source" +msgstr "" + +#: src/inst_vm_source.ycp:98 +msgid "Use &Custom Kernel and RAM Disk Image Files" +msgstr "" + +#: src/inst_vm_source.ycp:182 +msgid "Select RAM Disk Image" +msgstr "" + +#. format CD device name: %1 is model name (e.g. "TOSHIBA DVD-ROM SD-M1402"), %2 is device name (e.g. /dev/hdc) +#: src/inst_vm_source.ycp:399 +#, ycp-format +msgid "%1 (%2)" +msgstr "" + +#: src/inst_vm_source.ycp:408 +msgid "Boot System From" +msgstr "" + +#: src/inst_vm_source.ycp:411 +msgid "CD-ROM Device" +msgstr "" + +#: src/inst_vm_source.ycp:418 +msgid "&ISO Image File" +msgstr "" + +#: src/inst_vm_source.ycp:430 +msgid "Virtual Hard Disk" +msgstr "" + +#. help text for OS selection in full virtualization mode (1/3) +#: src/inst_vm_source.ycp:439 +msgid "<BIG>Fully Virtualized Operating System</BIG>" +msgstr "" + +#. help text for OS selection in full virtualization mode (2/3) +#: src/inst_vm_source.ycp:441 +msgid "The new virtual machine can be booted from a CDROM or hard disk." +msgstr "The new virtual machine can be booted from a CD-ROM or hard disk." + +#. help text for OS selection in full virtualization mode (3/3) +#: src/inst_vm_source.ycp:443 +msgid "" +"It is assumed a new OS installation will occur if the VM is booted\n" +"from a CDROM. In this case, after the installation the virtual machine will be\n" +"booted from hard disk." +msgstr "" +"It is assumed that a new OS installation will occur if the VM is booted\n" +"from a CD-ROM. In this case, the virtual machine is\n" +"booted from the hard disk after installation." + +#. error - entered empty ISO image file name +#: src/inst_vm_source.ycp:485 +msgid "Select an ISO image file for CD-ROM emulation." +msgstr "" + +#: src/inst_vm_source.ycp:498 +msgid "Select ISO Image" +msgstr "" + +#. help text for virtualization mode setting (3/3) +#: src/inst_xen_mode.ycp:53 +msgid "" +"Paravirtualization requires a modified guest OS that\n" +"supports Xen virtualization.\n" +msgstr "" + +#. help text for virtualization mode setting (4/4) +#: src/inst_xen_mode.ycp:58 +msgid "" +"Full virtualization requires CPU with virtualization\n" +"support. In this case, Xen completely emulates PC hardware in a virtual machine.\n" +"It is possible to install an unmodified guest OS.\n" +msgstr "" + +#. help text for virtualization mode setting (5/5) +#: src/inst_xen_mode.ycp:64 +msgid "If the mode is changed some settings (e.g. OS kernel) will be reset to default values." +msgstr "If the mode is changed, some settings, such as the OS kernel, are reset to default values." + +#. error - xen kernel must be running to start a new Xen domain, +#. ask user to configure the first (management) Xen domain +#: src/xen.ycp:90 +msgid "" +"A Xen virtual machine can be started only\n" +"from the management domain (domain0),\n" +"which is not running now.\n" +"\n" +"Configure the management domain now?" +msgstr "" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-qt
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package yast2-qt checked in at Tue Mar 28 17:06:33 CEST 2006. -------- --- /work/SRC/all/yast2-qt/yast2-qt.changes 2006-03-27 17:08:07.000000000 +0200 +++ /work/src/done/STABLE/yast2-qt/yast2-qt.changes 2006-03-28 16:20:01.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 28 16:15:20 CEST 2006 - sh(a)suse.de + +- V 2.13.41 +- Show language specific packages in "languages" filter + +------------------------------------------------------------------- Old: ---- yast2-qt-2.13.40.tar.bz2 New: ---- yast2-qt-2.13.41.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.ay0gSx/_old 2006-03-28 17:06:17.000000000 +0200 +++ /var/tmp/diff_new_pack.ay0gSx/_new 2006-03-28 17:06:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt (Version 2.13.40) +# spec file for package yast2-qt (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-qt -Version: 2.13.40 +Version: 2.13.41 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.13.40.tar.bz2 +Source0: yast2-qt-2.13.41.tar.bz2 prefix: /usr BuildRequires: boost-devel curl-devel dbus-1-devel docbook-xsl-stylesheets doxygen hal-devel libdrm-devel libjpeg-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-core-devel yast2-devtools Summary: YaST2 - Graphical User Interface @@ -42,7 +42,7 @@ Stefan Hundhammer <sh(a)suse.de> %prep -%setup -n yast2-qt-2.13.40 +%setup -n yast2-qt-2.13.41 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,9 @@ %doc %{prefix}/share/doc/packages/yast2-qt %changelog -n yast2-qt +* Tue Mar 28 2006 - sh(a)suse.de +- V 2.13.41 +- Show language specific packages in "languages" filter * Mon Mar 27 2006 - sh(a)suse.de - V 2.13.40 - Fixed bug #156590: No way to reset ignored dependency problems ++++++ yast2-qt-2.13.40.tar.bz2 -> yast2-qt-2.13.41.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.40/VERSION new/yast2-qt-2.13.41/VERSION --- old/yast2-qt-2.13.40/VERSION 2006-03-27 15:44:03.000000000 +0200 +++ new/yast2-qt-2.13.41/VERSION 2006-03-28 16:15:14.000000000 +0200 @@ -1 +1 @@ -2.13.40 +2.13.41 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.40/src/YQPkgLangList.cc new/yast2-qt-2.13.41/src/YQPkgLangList.cc --- old/yast2-qt-2.13.40/src/YQPkgLangList.cc 2006-03-15 18:59:05.000000000 +0100 +++ new/yast2-qt-2.13.41/src/YQPkgLangList.cc 2006-03-28 16:01:22.000000000 +0200 @@ -105,10 +105,50 @@ if ( lang ) { -#ifdef FIXME_missing_in_zypp -#else - y2warning( "Missing: Get packages for a zypp::Language" ); -#endif + string currentLang = lang->name(); + + // + // Iterate over all selectables in pool + // + + for ( ZyppPoolIterator it = zyppPkgBegin(); + it != zyppPkgEnd(); + ++it ) + { + ZyppObj zyppObj = (*it)->theObj(); + + if ( zyppObj ) + { + // + // Iterate over all "freshens" dependencies of this object + // + + zypp::CapSet freshens = zyppObj->dep( zypp::Dep::FRESHENS ); + + for ( zypp::CapSet::const_iterator cap_it = freshens.begin(); + cap_it != freshens.end(); + ++cap_it ) + { + if ( (*cap_it).index() == currentLang ) // obj freshens this language + { + ZyppPkg pkg = tryCastToZyppPkg( zyppObj ); + + if ( pkg ) + { + y2debug( "Found pkg %s for lang %s", + pkg->name().c_str(), currentLang.c_str() ); + + emit filterMatch( *it, pkg ); + } + else + { + y2warning( "Found non-pkg obj %s for lang %s", + pkg->name().c_str(), currentLang.c_str() ); + } + } + } + } + } } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-network
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package yast2-network checked in at Tue Mar 28 17:06:10 CEST 2006. -------- --- /work/SRC/all/yast2-network/yast2-network.changes 2006-03-24 15:13:30.000000000 +0100 +++ /work/src/done/STABLE/yast2-network/yast2-network.changes 2006-03-28 15:57:27.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Mar 28 15:56:22 CEST 2006 - locilka(a)suse.cz + +- Every single fetching of release notes has its own log (#161251). +- 2.13.39 + +------------------------------------------------------------------- +Fri Mar 24 16:46:02 CET 2006 - locilka(a)suse.cz + +- Merged proofread texts. + +------------------------------------------------------------------- Old: ---- yast2-network-2.13.38.tar.bz2 New: ---- yast2-network-2.13.39.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.Cp1WLe/_old 2006-03-28 17:05:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Cp1WLe/_new 2006-03-28 17:05:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.13.38) +# spec file for package yast2-network (Version 2.13.39) # # 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-network -Version: 2.13.38 +Version: 2.13.39 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.13.38.tar.bz2 +Source0: yast2-network-2.13.39.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig @@ -49,7 +49,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.13.38 +%setup -n yast2-network-2.13.39 %build %{prefix}/bin/y2tool y2autoconf @@ -103,6 +103,11 @@ /usr/share/YaST2/schema/autoyast/rnc/networking.rnc %changelog -n yast2-network +* Tue Mar 28 2006 - locilka(a)suse.cz +- Every single fetching of release notes has its own log (#161251). +- 2.13.39 +* Fri Mar 24 2006 - locilka(a)suse.cz +- Merged proofread texts. * Fri Mar 24 2006 - locilka(a)suse.cz - Download all release notes for all installed products (add-ons) during the internet test (#160563). ++++++ yast2-network-2.13.38.tar.bz2 -> yast2-network-2.13.39.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.38/VERSION new/yast2-network-2.13.39/VERSION --- old/yast2-network-2.13.38/VERSION 2006-03-24 15:10:19.000000000 +0100 +++ new/yast2-network-2.13.39/VERSION 2006-03-28 15:56:16.000000000 +0200 @@ -1 +1 @@ -2.13.38 +2.13.39 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.38/configure new/yast2-network-2.13.39/configure --- old/yast2-network-2.13.38/configure 2006-03-24 15:30:01.000000000 +0100 +++ new/yast2-network-2.13.39/configure 2006-03-28 15:58:35.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-network 2.13.38. +# Generated by GNU Autoconf 2.59 for yast2-network 2.13.39. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.13.38' -PACKAGE_STRING='yast2-network 2.13.38' +PACKAGE_VERSION='2.13.39' +PACKAGE_STRING='yast2-network 2.13.39' 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-network 2.13.38 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.13.39 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-network 2.13.38:";; + short | recursive ) echo "Configuration of yast2-network 2.13.39:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.13.38 +yast2-network configure 2.13.39 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-network $as_me 2.13.38, which was +It was created by yast2-network $as_me 2.13.39, 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-network' - VERSION='2.13.38' + VERSION='2.13.39' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.38" +VERSION="2.13.39" RPMNAME="yast2-network" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-network $as_me 2.13.38, which was +This file was extended by yast2-network $as_me 2.13.39, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.13.38 +yast2-network config.status 2.13.39 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-network-2.13.38/configure.in new/yast2-network-2.13.39/configure.in --- old/yast2-network-2.13.38/configure.in 2006-03-24 15:29:55.000000000 +0100 +++ new/yast2-network-2.13.39/configure.in 2006-03-28 15:58:31.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-network, 2.13.38, http://www.suse.de/feedback, yast2-network) +AC_INIT(yast2-network, 2.13.39, http://www.suse.de/feedback, yast2-network) 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.38" +VERSION="2.13.39" RPMNAME="yast2-network" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.13.38/src/installation/inst_do_net_test.ycp new/yast2-network-2.13.39/src/installation/inst_do_net_test.ycp --- old/yast2-network-2.13.38/src/installation/inst_do_net_test.ycp 2006-03-24 15:13:49.000000000 +0100 +++ new/yast2-network-2.13.39/src/installation/inst_do_net_test.ycp 2006-03-28 15:58:13.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec(a)suse.cz> * Arvin Schnell <arvin(a)suse.de> * - * $Id: inst_do_net_test.ycp 29367 2006-03-24 14:13:42Z locilka $ + * $Id: inst_do_net_test.ycp 29477 2006-03-28 13:58:10Z locilka $ */ { @@ -308,10 +308,12 @@ relnotes_counter, substring (url, pos) ); + // Where to store the curl log + string log_filename = sformat("curl_%1.log", relnotes_counter); // .background agent is unable to use ENV variables string cmd = ". /etc/sysconfig/proxy; http_proxy=${HTTP_PROXY} /usr/bin/curl -s -S -v -f -m 300 " + url + " -o " + filename; - cmd = cmd + " > " + logdir + "/curl.log 2>&1"; + cmd = cmd + " > " + logdir + "/" + log_filename + " 2>&1"; // map env = Proxy::GetEnvironment (); // env["LANG"] = GetLanguageUTF8 (); @@ -329,7 +331,7 @@ // label of combobox where the log is selected logs = add (logs, $[ `menuname : _("Download of Release Notes"), - `filename : "curl.log" ]); + `filename : log_filename ]); }); @@ -346,8 +348,8 @@ if (!ret1) { y2error ("checksig of release notes failed"); // popup error message - Report::Error(_("Cannot install downloaded release notes, -checking the RPM signature failed.")); + Report::Error(_("Cannot install downloaded release notes. +RPM signature check failed.")); test_ret = false; // next loop return; @@ -358,9 +360,9 @@ PackageCallbacks::EnableAsterixPackage (old2); if (!ret2) { + y2error ("installation release notes failed."); // popup error message - Report::Error(_("Installing of downloaded release notes failed.")); - y2error ("installing of release notes failed"); + Report::Error(_("Installation of downloaded release notes failed.")); test_ret = false; // next loop return; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xgl
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package xgl checked in at Tue Mar 28 17:05:47 CEST 2006. -------- --- /work/SRC/all/xgl/xgl.changes 2006-03-22 17:42:19.000000000 +0100 +++ /work/src/done/STABLE/xgl/xgl.changes 2006-03-28 13:33:40.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Mar 28 13:33:04 CEST 2006 - mhopf(a)suse.de + +- Fix for #159733 from David: libglx -> libglxext. + +------------------------------------------------------------------- New: ---- xgl-libglx-to-libglxext-1.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.qlHvgO/_old 2006-03-28 17:05:19.000000000 +0200 +++ /var/tmp/diff_new_pack.qlHvgO/_new 2006-03-28 17:05:19.000000000 +0200 @@ -22,7 +22,7 @@ PreReq: %fillup_prereq Autoreqprov: on Version: cvs_060313 -Release: 7 +Release: 9 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -38,6 +38,7 @@ Patch2: xgl-schedyield.diff Patch3: xgl-security-file-dir.diff Patch4: xgl-xkb-initialization.diff +Patch5: xgl-libglx-to-libglxext-1.diff %description Xgl is an Xserver that uses OpenGL for its drawing operations. Some @@ -78,6 +79,7 @@ patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-schedyield.diff patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xkb-initialization.diff patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-security-file-dir.diff +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-libglx-to-libglxext-1.diff %build PREFIX=/usr/X11R6/lib/xgl @@ -141,6 +143,8 @@ /etc/X11/xgl-cards-white-list %changelog -n xgl +* Tue Mar 28 2006 - mhopf(a)suse.de +- Fix for #159733 from David: libglx -> libglxext. * Wed Mar 22 2006 - mhopf(a)suse.de - Fix from CVS for #152401, #154663: Fixed XKB support. - Fixed location of SecurityPolicy. ++++++ xgl-libglx-to-libglxext-1.diff ++++++ Only in .: autom4te.cache diff -ru ../xorg-server-1.0.1-orig/hw/xgl/glxext/module/Makefile.am ./hw/xgl/glxext/module/Makefile.am --- ../xorg-server-1.0.1-orig/hw/xgl/glxext/module/Makefile.am 2006-03-09 11:39:54.000000000 +0100 +++ ./hw/xgl/glxext/module/Makefile.am 2006-03-28 15:14:02.000000000 +0200 @@ -5,12 +5,12 @@ $(XGLMODULES_CFLAGS) \ -I$(top_srcdir)/hw/xgl -libglx_la_LDFLAGS = -avoid-version -libglx_la_SOURCES = glxmodule.c -libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la \ - $(top_builddir)/GL/mesa/libGLcore.la -libglx_modules = libglx.la +libglxext_la_LDFLAGS = -avoid-version +libglxext_la_SOURCES = glxmodule.c +libglxext_la_LIBADD = $(top_builddir)/GL/glx/libglx.la \ + $(top_builddir)/GL/mesa/libGLcore.la +libglxext_modules = libglxext.la moduledir = @XGL_MODULE_PATH@ -module_LTLIBRARIES = $(libglx_modules) +module_LTLIBRARIES = $(libglxext_modules) diff -ru ../xorg-server-1.0.1-orig/hw/xgl/glxext/module/Makefile.in ./hw/xgl/glxext/module/Makefile.in --- ../xorg-server-1.0.1-orig/hw/xgl/glxext/module/Makefile.in 2006-03-10 12:09:45.000000000 +0100 +++ ./hw/xgl/glxext/module/Makefile.in 2006-03-28 15:14:49.000000000 +0200 @@ -62,10 +62,10 @@ am__installdirs = "$(DESTDIR)$(moduledir)" moduleLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(module_LTLIBRARIES) -libglx_la_DEPENDENCIES = $(top_builddir)/GL/glx/libglx.la \ +libglxext_la_DEPENDENCIES = $(top_builddir)/GL/glx/libglx.la \ $(top_builddir)/GL/mesa/libGLcore.la -am_libglx_la_OBJECTS = glxmodule.lo -libglx_la_OBJECTS = $(am_libglx_la_OBJECTS) +am_libglxext_la_OBJECTS = glxmodule.lo +libglxext_la_OBJECTS = $(am_libglxext_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include -I$(top_builddir)/include depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -77,8 +77,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libglx_la_SOURCES) -DIST_SOURCES = $(libglx_la_SOURCES) +SOURCES = $(libglxext_la_SOURCES) +DIST_SOURCES = $(libglxext_la_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -528,13 +528,13 @@ $(XGLMODULES_CFLAGS) \ -I$(top_srcdir)/hw/xgl -libglx_la_LDFLAGS = -avoid-version -libglx_la_SOURCES = glxmodule.c -libglx_la_LIBADD = $(top_builddir)/GL/glx/libglx.la \ - $(top_builddir)/GL/mesa/libGLcore.la +libglxext_la_LDFLAGS = -avoid-version +libglxext_la_SOURCES = glxmodule.c +libglxext_la_LIBADD = $(top_builddir)/GL/glx/libglx.la \ + $(top_builddir)/GL/mesa/libGLcore.la -libglx_modules = libglx.la -module_LTLIBRARIES = $(libglx_modules) +libglxext_modules = libglxext.la +module_LTLIBRARIES = $(libglxext_modules) all: all-am .SUFFIXES: @@ -595,8 +595,8 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libglx.la: $(libglx_la_OBJECTS) $(libglx_la_DEPENDENCIES) - $(LINK) -rpath $(moduledir) $(libglx_la_LDFLAGS) $(libglx_la_OBJECTS) $(libglx_la_LIBADD) $(LIBS) +libglxext.la: $(libglxext_la_OBJECTS) $(libglxext_la_DEPENDENCIES) + $(LINK) -rpath $(moduledir) $(libglxext_la_LDFLAGS) $(libglxext_la_OBJECTS) $(libglxext_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) diff -ru ../xorg-server-1.0.1-orig/hw/xgl/xglglx.c ./hw/xgl/xglglx.c --- ../xorg-server-1.0.1-orig/hw/xgl/xglglx.c 2006-03-09 11:39:53.000000000 +0100 +++ ./hw/xgl/xglglx.c 2006-03-28 15:14:02.000000000 +0200 @@ -157,7 +157,7 @@ SYM (__GlxGetMesaProvider, "GlxGetMesaProvider") }; - glXHandle = xglLoadModule ("glx", RTLD_NOW | RTLD_LOCAL); + glXHandle = xglLoadModule ("glxext", RTLD_NOW | RTLD_LOCAL); if (!glXHandle) return FALSE; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xemacs
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package xemacs checked in at Tue Mar 28 17:05:14 CEST 2006. -------- --- /work/SRC/all/xemacs/xemacs.changes 2006-03-13 18:28:26.000000000 +0100 +++ /work/src/done/STABLE/xemacs/xemacs.changes 2006-03-27 19:15:06.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Mar 27 16:52:00 CEST 2006 - mfabian(a)suse.de + +- update to 21.5.25.20060327 to make xemacs build on x86_64 again, + and make xemacs-packages build again on ppc64. + +------------------------------------------------------------------- +Mon Mar 27 12:06:40 CEST 2006 - mfabian(a)suse.de + +- fix wrong use of memset. +- use "--disable-mc-alloc --disable-kkcc --disable-newgc" on + i386 architecture as well. + +------------------------------------------------------------------- Old: ---- uninitialized-variables-2.patch xemacs-21.5.25.tar.bz2 New: ---- fix-wrong-use-of-memset.patch xemacs-21.5.25.20060327.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.JhTpwh/_old 2006-03-28 17:03:57.000000000 +0200 +++ /var/tmp/diff_new_pack.JhTpwh/_new 2006-03-28 17:03:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xemacs (Version 21.5.25) +# spec file for package xemacs (Version 21.5.25.20060327) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,7 +19,7 @@ Prereq: permissions Requires: xemacs-info xemacs-packages ctags Autoreqprov: on -Version: 21.5.25 +Version: 21.5.25.20060327 Release: 1 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,7 +36,7 @@ # cd .. # Now make a tar.bz2 file from the contents of the "packages" directory: # tar jcvf xemacs-<version>.tar.bz2 xemacs-<version>/ -Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.25.tar.bz2 +Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-21.5.25.20060327.tar.bz2 Source1: xe-list.el Source2: fix-load-history.el Patch0: xemacs.patch @@ -60,8 +60,8 @@ Patch33: set-locale-to-c-when-not-supported-by-x.patch Patch34: suppress-warning-about-undefined-unicode-key-mappings.patch Patch38: unitialized-variables.patch -Patch39: uninitialized-variables-2.patch Patch40: cast-pointer-integer-different-size.patch +Patch41: fix-wrong-use-of-memset.patch %description This is the current version of XEmacs, formerly known as Lucid-Emacs. @@ -148,8 +148,8 @@ %patch33 -p1 %patch34 -p1 %patch38 -p1 -%patch39 -p1 %patch40 -p1 +%patch41 -p1 %patch0 -p1 find lisp/ etc/ -name '*.elc' | xargs -r rm -f %ifarch ia64 @@ -193,7 +193,10 @@ MOD=${ARCH}/modules STATE=/var/lib/xemacs MAN=/usr/share/man/man1 - CFLAGS="${RPM_OPT_FLAGS} -Wall -Wno-switch -pipe ${LOOP} -fno-strict-aliasing -DLDAP_DEPRECATED" + CFLAGS="${RPM_OPT_FLAGS} -Wall -Wno-switch -pipe ${LOOP} -fno-strict-aliasing -DLDAP_DEPRECATED " +%ifarch s390x + CFLAGS="$CFLAGS -O0" +%endif LDFLAGS= export CFLAGS LDFLAGS # @@ -235,7 +238,7 @@ --with-canna \ --with-tty=yes \ --with-site-lisp \ -%ifarch ia64 ppc64 s390x s390 +%ifarch ia64 ppc ppc64 s390x s390 %ix86 --disable-mc-alloc \ --disable-kkcc \ --disable-newgc \ @@ -539,6 +542,13 @@ %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog -n xemacs +* Mon Mar 27 2006 - mfabian(a)suse.de +- update to 21.5.25.20060327 to make xemacs build on x86_64 again, + and make xemacs-packages build again on ppc64. +* Mon Mar 27 2006 - mfabian(a)suse.de +- fix wrong use of memset. +- use "--disable-mc-alloc --disable-kkcc --disable-newgc" on + i386 architecture as well. * Mon Mar 06 2006 - mfabian(a)suse.de - update to 21.5.25. Fixes: + bugzilla #141126 (XEmacs 21.5.24 doesn't read localized ++++++ fix-wrong-use-of-memset.patch ++++++ --- - 2006-03-27 12:04:30.262067000 +0200 +++ xemacs-21.5.25/src/vdb-posix.c 2006-03-27 12:03:05.000000000 +0200 @@ -118,7 +118,7 @@ } #ifdef USE_SIGACTION - memset(&act, sizeof(struct sigaction), 0); + memset(&act, 0, sizeof(struct sigaction)); act.sa_sigaction = vdb_fault_handler; sigemptyset (&act.sa_mask); act.sa_flags = SA_SIGINFO; ++++++ sentinel.patch ++++++ --- /var/tmp/diff_new_pack.JhTpwh/_old 2006-03-28 17:03:57.000000000 +0200 +++ /var/tmp/diff_new_pack.JhTpwh/_new 2006-03-28 17:03:57.000000000 +0200 @@ -1,6 +1,6 @@ -diff -ru xemacs-21.5.20.orig/lwlib/xlwgauge.c xemacs-21.5.20/lwlib/xlwgauge.c ---- xemacs-21.5.20.orig/lwlib/xlwgauge.c 2004-09-20 21:19:17.000000000 +0200 -+++ xemacs-21.5.20/lwlib/xlwgauge.c 2005-05-12 14:15:05.000000000 +0200 +diff -ru xemacs-21.5.25.20060327.orig/lwlib/xlwgauge.c xemacs-21.5.25.20060327/lwlib/xlwgauge.c +--- xemacs-21.5.25.20060327.orig/lwlib/xlwgauge.c 2005-12-27 18:11:45.000000000 +0100 ++++ xemacs-21.5.25.20060327/lwlib/xlwgauge.c 2006-03-27 17:45:11.000000000 +0200 @@ -838,7 +838,7 @@ if(( gw->gauge.autoScaleUp && (int) value > gw->gauge.v1) || (gw->gauge.autoScaleDown && (int) value < gw->gauge.v1/3 )) @@ -10,10 +10,10 @@ return ; } -diff -ru xemacs-21.5.20.orig/src/frame-x.c xemacs-21.5.20/src/frame-x.c ---- xemacs-21.5.20.orig/src/frame-x.c 2005-01-25 00:33:56.000000000 +0100 -+++ xemacs-21.5.20/src/frame-x.c 2005-05-12 14:17:06.000000000 +0200 -@@ -766,12 +766,12 @@ +diff -ru xemacs-21.5.25.20060327.orig/src/frame-x.c xemacs-21.5.25.20060327/src/frame-x.c +--- xemacs-21.5.25.20060327.orig/src/frame-x.c 2005-12-27 18:12:07.000000000 +0100 ++++ xemacs-21.5.25.20060327/src/frame-x.c 2006-03-27 17:45:11.000000000 +0200 +@@ -775,12 +775,12 @@ /* !!#### Verify this + 1 and document as zero-termination */ XtRString, extval, extvallen + 1, @@ -28,7 +28,7 @@ } else if (SYMBOLP (prop)) { -@@ -870,7 +870,7 @@ +@@ -879,7 +879,7 @@ /* !!#### Verify this + 1 and document as zero-termination */ XtRString, extval, extvallen + 1, @@ -37,3 +37,4 @@ } #ifdef HAVE_SCROLLBARS + ++++++ set-locale-to-c-when-not-supported-by-x.patch ++++++ --- /var/tmp/diff_new_pack.JhTpwh/_old 2006-03-28 17:03:57.000000000 +0200 +++ /var/tmp/diff_new_pack.JhTpwh/_new 2006-03-28 17:03:57.000000000 +0200 @@ -1,7 +1,7 @@ -diff -ru xemacs-21.5.21.orig/src/intl.c xemacs-21.5.21/src/intl.c ---- xemacs-21.5.21.orig/src/intl.c 2002-05-28 10:44:55.000000000 +0200 -+++ xemacs-21.5.21/src/intl.c 2005-06-13 16:23:51.000000000 +0200 -@@ -82,8 +82,10 @@ +diff -ru xemacs-21.5.25.20060327.orig/src/intl.c xemacs-21.5.25.20060327/src/intl.c +--- xemacs-21.5.25.20060327.orig/src/intl.c 2005-12-27 18:12:09.000000000 +0100 ++++ xemacs-21.5.25.20060327/src/intl.c 2006-03-27 17:06:52.000000000 +0200 +@@ -84,8 +84,10 @@ #ifdef HAVE_X_WINDOWS if (!init_x_locale (locale)) { @@ -12,5 +12,6 @@ + "locale not supported by Xlib, setting locale to C."); + setlocale (LC_ALL, "C"); setlocale (LC_NUMERIC, "C"); + free (loc); return Qnil; - } + ++++++ unitialized-variables.patch ++++++ --- /var/tmp/diff_new_pack.JhTpwh/_old 2006-03-28 17:03:57.000000000 +0200 +++ /var/tmp/diff_new_pack.JhTpwh/_new 2006-03-28 17:03:57.000000000 +0200 @@ -1,7 +1,7 @@ -diff -ru xemacs-21.5.21.20050721.orig/src/extents.c xemacs-21.5.21.20050721/src/extents.c ---- xemacs-21.5.21.20050721.orig/src/extents.c 2005-05-10 19:21:54.000000000 +0200 -+++ xemacs-21.5.21.20050721/src/extents.c 2005-08-02 11:56:52.000000000 +0200 -@@ -2974,6 +2974,10 @@ +diff -ru xemacs-21.5.25.20060327.orig/src/extents.c xemacs-21.5.25.20060327/src/extents.c +--- xemacs-21.5.25.20060327.orig/src/extents.c 2006-03-27 13:37:34.000000000 +0200 ++++ xemacs-21.5.25.20060327/src/extents.c 2006-03-27 17:24:00.000000000 +0200 +@@ -3121,6 +3121,10 @@ gb.glyph = glyph; gb.extent = wrap_extent (e); @@ -12,7 +12,7 @@ Dynarr_add (ef->begin_glyphs, gb); } else if (EQ (glyph, last_glyph)) -@@ -2993,6 +2997,10 @@ +@@ -3140,6 +3144,10 @@ gb.glyph = glyph; gb.extent = wrap_extent (e); @@ -23,3 +23,4 @@ Dynarr_add (ef->end_glyphs, gb); } else if (EQ (glyph, last_glyph)) + ++++++ xemacs-21.5.25.tar.bz2 -> xemacs-21.5.25.20060327.tar.bz2 ++++++ /work/SRC/all/xemacs/xemacs-21.5.25.tar.bz2 /work/src/done/STABLE/xemacs/xemacs-21.5.25.20060327.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit powersave
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package powersave checked in at Tue Mar 28 17:03:24 CEST 2006. -------- --- /work/SRC/all/powersave/powersave.changes 2006-03-27 20:05:26.000000000 +0200 +++ /work/src/done/STABLE/powersave/powersave.changes 2006-03-28 16:23:39.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Mar 28 16:21:45 CEST 2006 - hmacht(a)suse.de + +- reset cpufreq governor after resume (bug 161220) +- don't try to write up_threshold when switching schemes +- r2141 + +------------------------------------------------------------------- Old: ---- powersave-0.12.8.tar.bz2 New: ---- powersave-0.12.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powersave.spec ++++++ --- /var/tmp/diff_new_pack.ngX4qo/_old 2006-03-28 17:02:54.000000000 +0200 +++ /var/tmp/diff_new_pack.ngX4qo/_new 2006-03-28 17:02:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package powersave (Version 0.12.8) +# spec file for package powersave (Version 0.12.9) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,7 +14,7 @@ BuildRequires: cpufrequtils gcc-c++ hal-devel lynx URL: http://powersave.sourceforge.net/ Summary: General Powermanagement daemon supporting APM and ACPI and CPU frequency scaling -Version: 0.12.8 +Version: 0.12.9 Release: 1 License: GPL Group: System/Daemons @@ -171,6 +171,10 @@ %_libdir/lib*.so* %changelog -n powersave +* Tue Mar 28 2006 - hmacht(a)suse.de +- reset cpufreq governor after resume (bug 161220) +- don't try to write up_threshold when switching schemes +- r2141 * Mon Mar 27 2006 - hmacht(a)suse.de - add generic hotkey handler and remove config adjustments from init script ++++++ powersave-0.12.8.tar.bz2 -> powersave-0.12.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.8/configure new/powersave-0.12.9/configure --- old/powersave-0.12.8/configure 2006-03-27 18:40:06.000000000 +0200 +++ new/powersave-0.12.9/configure 2006-03-28 16:28:32.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for powersave 0.12.8. +# Generated by GNU Autoconf 2.59 for powersave 0.12.9. # # Report bugs to <hmacht(a)suse.de>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='powersave' PACKAGE_TARNAME='powersave' -PACKAGE_VERSION='0.12.8' -PACKAGE_STRING='powersave 0.12.8' +PACKAGE_VERSION='0.12.9' +PACKAGE_STRING='powersave 0.12.9' PACKAGE_BUGREPORT='hmacht(a)suse.de' ac_unique_file="daemon/powersaved.cpp" @@ -982,7 +982,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 powersave 0.12.8 to adapt to many kinds of systems. +\`configure' configures powersave 0.12.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1048,7 +1048,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of powersave 0.12.8:";; + short | recursive ) echo "Configuration of powersave 0.12.9:";; esac cat <<\_ACEOF @@ -1209,7 +1209,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -powersave configure 0.12.8 +powersave configure 0.12.9 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1223,7 +1223,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by powersave $as_me 0.12.8, which was +It was created by powersave $as_me 0.12.9, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1866,7 +1866,7 @@ # Define the identity of the package. PACKAGE='powersave' - VERSION='0.12.8' + VERSION='0.12.9' cat >>confdefs.h <<_ACEOF @@ -24508,7 +24508,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by powersave $as_me 0.12.8, which was +This file was extended by powersave $as_me 0.12.9, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24571,7 +24571,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -powersave config.status 0.12.8 +powersave config.status 0.12.9 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/powersave-0.12.8/configure.ac new/powersave-0.12.9/configure.ac --- old/powersave-0.12.8/configure.ac 2006-03-27 18:39:07.000000000 +0200 +++ new/powersave-0.12.9/configure.ac 2006-03-28 16:26:27.000000000 +0200 @@ -3,7 +3,7 @@ AC_PREREQ(2.59) -AC_INIT(powersave, 0.12.8, hmacht(a)suse.de) +AC_INIT(powersave, 0.12.9, hmacht(a)suse.de) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([daemon/powersaved.cpp]) AM_CONFIG_HEADER(config.h) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.8/daemon/cpufreq_interface.cpp new/powersave-0.12.9/daemon/cpufreq_interface.cpp --- old/powersave-0.12.8/daemon/cpufreq_interface.cpp 2006-03-27 18:39:06.000000000 +0200 +++ new/powersave-0.12.9/daemon/cpufreq_interface.cpp 2006-03-28 16:21:29.000000000 +0200 @@ -2,7 +2,7 @@ * * * Powersave Daemon * * * - * Copyright (C) 2004,2005 SUSE Linux Products GmbH * + * Copyright (C) 2004,2005,2006 SUSE Linux Products GmbH * * * * Author(s): Holger Macht <hmacht(a)suse.de> * * * @@ -64,13 +64,19 @@ strstr << SYSFS_FILES << "cpu" << _cpu_base << "/cpufreq/scaling_available_frequencies"; AVAILABLE_FREQS_FILE = strstr.str(); strstr.str(""); - // supported speeds } CPUFreq_Interface::~CPUFreq_Interface() { } +int CPUFreq_Interface::setMode(CPUFREQ_MODE mode) +{ + _mode = mode; + adjustSpeed(); + return 0; +} + void CPUFreq_Interface::setConfigs(int max, int high_cpu, int hyster, int consider) { if (max < _cpu_hysteresis) @@ -133,13 +139,13 @@ { FILE *fp = fopen(filename, "w+"); if (!fp) { - // pDebug(DBG_ERR, "Could not open file for writing: %s; %s", filename, strerror(errno)); + pDebug(DBG_WARN, "Could not open file for writing: %s; %s", filename, strerror(errno)); return false; } va_list ap; va_start(ap, fmt); // get variable argument list passed if (vfprintf(fp, fmt, ap) < 0) { - // pDebug(DBG_ERR, "Could not write to file: %s", filename); + pDebug(DBG_WARN, "Could not write to file: %s", filename); fclose(fp); return false; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.8/daemon/cpufreq_interface.h new/powersave-0.12.9/daemon/cpufreq_interface.h --- old/powersave-0.12.8/daemon/cpufreq_interface.h 2006-03-27 18:39:06.000000000 +0200 +++ new/powersave-0.12.9/daemon/cpufreq_interface.h 2006-03-28 16:21:29.000000000 +0200 @@ -2,7 +2,7 @@ * * * Powersave Daemon * * * - * Copyright (C) 2004,2005 SUSE Linux Products GmbH * + * Copyright (C) 2004,2005,2006 SUSE Linux Products GmbH * * * * Author(s): Holger Macht <hmacht(a)suse.de> * * * @@ -57,7 +57,7 @@ * @return true on success, false on error */ virtual bool init() = 0; - + /** @brief adjusts speeds * * @return @@ -115,7 +115,7 @@ * more (in fact these calls should be just ignored, but better * be careful) */ - virtual int setMode(CPUFREQ_MODE mode) = 0; + int setMode(CPUFREQ_MODE mode); /** @brief reads out frequencies * @@ -218,7 +218,7 @@ * @return true on success, false otherwise */ bool init(); - + #ifdef CPUFREQ_MEASURE unsigned long time_spent[MAX_SPEEDS + 1]; unsigned int count; @@ -317,8 +317,6 @@ void setConfig(); - int setMode(CPUFREQ_MODE mode); - /** @brief speed file to get or set current speed */ string CURRENT_SPEED_FILE; @@ -373,7 +371,8 @@ void setConfig(); - int setMode(CPUFREQ_MODE mode); + /** @brief sets the ondemand governor configuration */ + void setOndemandConfig(); /** @brief write a value to an ondemand file * diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.8/daemon/cpufreq_kernel.cpp new/powersave-0.12.9/daemon/cpufreq_kernel.cpp --- old/powersave-0.12.8/daemon/cpufreq_kernel.cpp 2006-03-27 18:39:06.000000000 +0200 +++ new/powersave-0.12.9/daemon/cpufreq_kernel.cpp 2006-03-28 16:21:29.000000000 +0200 @@ -2,7 +2,7 @@ * * * Powersave Daemon * * * - * Copyright (C) 2004,2005 SUSE Linux Products GmbH * + * Copyright (C) 2004,2005,2006 SUSE Linux Products GmbH * * * * Author(s): Holger Macht <hmacht(a)suse.de> * * * @@ -114,7 +114,7 @@ return 0; } -void CPUFreq_Kernel::setConfig() +void CPUFreq_Kernel::setOndemandConfig() { /* probably forgot some ondemand configs ? @@ -168,16 +168,20 @@ return; } -int CPUFreq_Kernel::setMode(CPUFREQ_MODE mode) +void CPUFreq_Kernel::setConfig() +{ +} + +int CPUFreq_Kernel::adjustSpeed() { - switch (mode) { + switch (_mode) { case _DYNAMIC: if (setGovernor(ON_DEMAND_STRING) < 0) { pDebug(DBG_WARN, "Could not set ondemand governor."); return -1; } // after switching back to ondemand, the config needs to be re-set - setConfig(); + setOndemandConfig(); break; case _PERFORMANCE: if (setGovernor("performance") < 0) { @@ -196,13 +200,7 @@ pDebug(DBG_WARN, "Unknown cpufreq kernel governor requested"); return -1; } - _mode = mode; - return 0; -} -int CPUFreq_Kernel::adjustSpeed() -{ - /* dummy inplementation */ return 1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.8/daemon/cpufreq_management.cpp new/powersave-0.12.9/daemon/cpufreq_management.cpp --- old/powersave-0.12.8/daemon/cpufreq_management.cpp 2006-03-27 18:39:06.000000000 +0200 +++ new/powersave-0.12.9/daemon/cpufreq_management.cpp 2006-03-28 16:21:29.000000000 +0200 @@ -2,7 +2,7 @@ * * * Powersave Daemon * * * - * Copyright (C) 2004,2005 SUSE Linux Products GmbH * + * Copyright (C) 2004,2005,2006 SUSE Linux Products GmbH * * * * Author(s): Holger Macht <hmacht(a)suse.de> * * * @@ -227,7 +227,6 @@ config_obj->current_scheme->CPUFREQ_HYSTERESIS, config_obj->current_scheme->CONSIDER_NICE); } - } CPUFREQ_CONTROL_MODE CpufreqManagement::controlMode() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.8/daemon/cpufreq_management.h new/powersave-0.12.9/daemon/cpufreq_management.h --- old/powersave-0.12.8/daemon/cpufreq_management.h 2006-03-27 18:39:05.000000000 +0200 +++ new/powersave-0.12.9/daemon/cpufreq_management.h 2006-03-28 16:21:29.000000000 +0200 @@ -2,7 +2,7 @@ * * * Powersave Daemon * * * - * Copyright (C) 2004,2005 SUSE Linux Products GmbH * + * Copyright (C) 2004,2005,2006 SUSE Linux Products GmbH * * * * Author(s): Holger Macht <hmacht(a)suse.de> * * * @@ -167,7 +167,7 @@ * @return true if already inside core_list, false otherwise */ bool siblingExists(list< int > core_list, int core); - + /** @brief stl list holding all cpufreq objects */ std::list< CPUFreq_Interface* > _cpufreq_objects; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.8/daemon/cpufreq_userspace.cpp new/powersave-0.12.9/daemon/cpufreq_userspace.cpp --- old/powersave-0.12.8/daemon/cpufreq_userspace.cpp 2006-03-27 18:39:06.000000000 +0200 +++ new/powersave-0.12.9/daemon/cpufreq_userspace.cpp 2006-03-28 16:21:29.000000000 +0200 @@ -2,7 +2,7 @@ * * * Powersave Daemon * * * - * Copyright (C) 2004,2005 SUSE Linux Products GmbH * + * Copyright (C) 2004,2005,2006 SUSE Linux Products GmbH * * * * Author(s): Holger Macht <hmacht(a)suse.de> * * * @@ -148,18 +148,6 @@ return 1; } -int CPUFreq_Userspace::setMode(CPUFREQ_MODE mode) -{ - /* throw these two lines out to force governor to be set */ - if (_mode == mode) - return 0; - - _mode = mode; - - adjustSpeed(); - return 0; -} - int CPUFreq_Userspace::adjustSpeed() { int ret = calcCPULoad(Powersave::Globals::config_obj->current_scheme->CONSIDER_NICE); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/powersave-0.12.8/daemon/pm_interface.cpp new/powersave-0.12.9/daemon/pm_interface.cpp --- old/powersave-0.12.8/daemon/pm_interface.cpp 2006-03-27 18:39:06.000000000 +0200 +++ new/powersave-0.12.9/daemon/pm_interface.cpp 2006-03-28 16:21:29.000000000 +0200 @@ -2,7 +2,7 @@ * * * Powersave Daemon * * * - * Copyright (C) 2004,2005 SUSE Linux Products GmbH * + * Copyright (C) 2004,2005,2006 SUSE Linux Products GmbH * * * * Author(s): Holger Macht <hmacht(a)suse.de> * * * @@ -444,6 +444,11 @@ _requested_sleep_state = PSD_NO_SLEEP_REQUEST; // reset frequency which may have changed without noticing it cpufreq->reinitSpeeds(); + /* reset CPU freq mode */ + if (!cpufreq->setModes(config_obj->current_scheme->CPUFREQUENCY, _eM) < 0) { + pDebug(DBG_WARN, "Could not set CPUFreq mode"); + } + checkACStateChanges(); checkBatteryStateChanges(); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit limal
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package limal checked in at Tue Mar 28 17:02:48 CEST 2006. -------- --- /work/SRC/all/limal/limal.changes 2006-03-02 14:04:00.000000000 +0100 +++ /work/src/done/STABLE/limal/limal.changes 2006-03-28 15:42:51.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Mar 28 15:17:38 CEST 2006 - mc(a)suse.de + +- version 1.1.6 +- Fixed PathName::PathName( const PathName::List &list ); and + PathName::List toList() const; to implement a consistent behaviour + concerning a drive prefix.[#161329] +- Documentation added. +- Test case and out file adapted. + +------------------------------------------------------------------- Old: ---- limal-1.1.5.tar.bz2 New: ---- limal-1.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ limal.spec ++++++ --- /var/tmp/diff_new_pack.Euw2Nb/_old 2006-03-28 17:01:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Euw2Nb/_new 2006-03-28 17:01:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package limal (Version 1.1.5) +# spec file for package limal (Version 1.1.6) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: limal URL: http://forge.novell.com/modules/xfmod/project/?limal -Version: 1.1.5 +Version: 1.1.6 Release: 1 License: GPL Group: Development/Languages/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: limal-1.1.5.tar.bz2 +Source0: limal-1.1.6.tar.bz2 prefix: /usr %define swiglibdir %(swig -swiglib) #!BuildIgnore: limal limal-devel limal-perl @@ -52,7 +52,7 @@ %prep -%setup -n limal-1.1.5 +%setup -n limal-1.1.6 %build %{prefix}/bin/limaltool limalautoconf @@ -103,6 +103,13 @@ %{perl_vendorarch}/*.pm %changelog -n limal +* Tue Mar 28 2006 - mc(a)suse.de +- version 1.1.6 +- Fixed PathName::PathName( const PathName::List &list ); and + PathName::List toList() const; to implement a consistent behaviour + concerning a drive prefix.[#161329] +- Documentation added. +- Test case and out file adapted. * Thu Mar 02 2006 - mc(a)suse.de - version 1.1.5 - move INIParser to limal-ca-mgm (privat) ++++++ limal-1.1.5.tar.bz2 -> limal-1.1.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.1.5/VERSION new/limal-1.1.6/VERSION --- old/limal-1.1.5/VERSION 2006-03-02 13:02:53.000000000 +0100 +++ new/limal-1.1.6/VERSION 2006-03-28 15:18:02.000000000 +0200 @@ -1 +1 @@ -1.1.5 +1.1.6 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.1.5/configure new/limal-1.1.6/configure --- old/limal-1.1.5/configure 2006-03-02 13:09:33.000000000 +0100 +++ new/limal-1.1.6/configure 2006-03-28 15:19:09.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for limal 1.1.5. +# Generated by GNU Autoconf 2.59 for limal 1.1.6. # # Report bugs to <http://www.suse.de/feedback>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='limal' PACKAGE_TARNAME='limal' -PACKAGE_VERSION='1.1.5' -PACKAGE_STRING='limal 1.1.5' +PACKAGE_VERSION='1.1.6' +PACKAGE_STRING='limal 1.1.6' PACKAGE_BUGREPORT='http://www.suse.de/feedback' ac_unique_file="RPMNAME" @@ -971,7 +971,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 limal 1.1.5 to adapt to many kinds of systems. +\`configure' configures limal 1.1.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1038,7 +1038,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of limal 1.1.5:";; + short | recursive ) echo "Configuration of limal 1.1.6:";; esac cat <<\_ACEOF @@ -1184,7 +1184,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -limal configure 1.1.5 +limal configure 1.1.6 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1198,7 +1198,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by limal $as_me 1.1.5, which was +It was created by limal $as_me 1.1.6, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1928,7 +1928,7 @@ # Define the identity of the package. PACKAGE='limal' - VERSION='1.1.5' + VERSION='1.1.6' cat >>confdefs.h <<_ACEOF @@ -2139,7 +2139,7 @@ -VERSION="1.1.5" +VERSION="1.1.6" RPMNAME="limal" RPMARCH="" RPMLIB="limal" @@ -21760,7 +21760,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by limal $as_me 1.1.5, which was +This file was extended by limal $as_me 1.1.6, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21823,7 +21823,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -limal config.status 1.1.5 +limal config.status 1.1.6 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/limal-1.1.5/configure.in new/limal-1.1.6/configure.in --- old/limal-1.1.5/configure.in 2006-03-02 13:09:20.000000000 +0100 +++ new/limal-1.1.6/configure.in 2006-03-28 15:18:57.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by limalautoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(limal, 1.1.5, http://www.suse.de/feedback, limal) +AC_INIT(limal, 1.1.6, http://www.suse.de/feedback, limal) 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 LiMaL variables -VERSION="1.1.5" +VERSION="1.1.6" RPMNAME="limal" RPMARCH="" RPMLIB="limal" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.1.5/src/PathName.cpp new/limal-1.1.6/src/PathName.cpp --- old/limal-1.1.5/src/PathName.cpp 2006-02-03 13:25:28.000000000 +0100 +++ new/limal-1.1.6/src/PathName.cpp 2006-03-28 15:11:35.000000000 +0200 @@ -340,8 +340,15 @@ "invalid drive letter prefix in pathname list"); } drive = *item; - item++; } + else + if( !item->empty() ) + { + BLOCXX_THROW( limal::ValueException, + "first component has to be empty or contain a drive letter prefix" + ); + } + item++; DirStack stack; try @@ -408,13 +415,18 @@ PathName::List PathName::toList() const { + PathName::List list; if( m_name.empty()) - return PathName::List(); + return list; + list.push_back( prefix() ); + DirStack stack; + stack.split(m_name.c_str() + m_prefix); - - return stack.getPathList(); + PathName::List temp( stack.getPathList() ); + list.insert( list.end(), temp.begin(), temp.end() ); + return list; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.1.5/src/limal/PathName.hpp new/limal-1.1.6/src/limal/PathName.hpp --- old/limal-1.1.5/src/limal/PathName.hpp 2006-03-02 10:42:01.000000000 +0100 +++ new/limal-1.1.6/src/limal/PathName.hpp 2006-03-28 15:11:35.000000000 +0200 @@ -36,7 +36,6 @@ /** * @file PathName.hpp * @brief LiMaL path name manipulation utilities. - * @todo Review and document this file/classes. */ #ifndef LIMAL_PATH_PATHNAME_HPP #define LIMAL_PATH_PATHNAME_HPP @@ -68,6 +67,7 @@ /** * @brief Create an empty PathName object. + * */ PathName(); @@ -80,7 +80,8 @@ /** * @brief Create a new PathName object from a PathName::List. * @param list The PathName::List from which the new PathName - * object shall be created. + * object shall be created. The first element of this List has + * to be a prefix, or if there is no prefix an empty string. * @throws limal::ValueException */ PathName(const PathName::List &list); @@ -105,7 +106,7 @@ */ virtual ~PathName(); - /** + /** * @brief Assigns path to this PathName object and returns a * reference to it. * @@ -113,16 +114,17 @@ * @return A reference to this PathName object. */ PathName & operator= (const PathName &path); - + /** * @brief Appends path to this PathName object and * a reference to it. * * @param path The PathName object that is to be appended. + * * @return A reference to this PathName object. - */ + */ PathName & operator+=(const PathName &path); - + /** * @brief Returns the complete path this PathName object holds. * @@ -131,11 +133,13 @@ blocxx::String toString() const; /** - * @brief Returns the complete path this PathName object holds, as - * a PathName::List + * @brief Returns the path this PathName object holds, as + * a PathName::List. The first element of that list is + * either the prefix, or, if there is no drive prefix it's an + * empty string. * * @return The complete path this PathName object holds, as - * a PathName::List + * a PathName::List. * * @throws limal::ValueException */ @@ -304,7 +308,7 @@ PathName cat(const PathName &add) const; /** - * @brief Create a new PathName object by concatenating to existing + * @brief Create a new PathName object by concatenating two existing * ones. * * Static function for concatenating two PathName objects. @@ -323,8 +327,27 @@ */ static PathName cat(const PathName &path, const PathName &add); - + /** + * @brief Create a new PathName object by extending this PathName + * object by ext. + * + * Use this function to create a new PathName object that consists of + * this PathName object extended by the string ext. Basically it just + * glues the two strings together and calls PathName( const blocxx::String ) + * For Example: + * + * @code + * PathName p1("/foo"); + * blocxx::String strExt(".old"); + * std::cout << p1.extend( strExt ); // == "/foo.old" + * @endcode + * + * @param ext Reference to a blocxx::String containing the extension. + * @return A new PathName object that consists of path extended by + * ext. + */ PathName extend(const blocxx::String &ext) const; + /** * @brief Create a new PathName object by extending path by * ext. @@ -336,8 +359,8 @@ * * @code * PathName p1("/foo"); - * blocxx::String strExt("/bar/some_file"); - * std::cout << PathName::extend(p1, strExt ); // == "/foo/bar/some_file" + * blocxx::String strExt(".old"); + * std::cout << PathName::extend(p1, strExt ); // == "/foo.old" * @endcode * * @param path Reference to a PathName object that is to be extended. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.1.5/testsuite/pathname_test.cc new/limal-1.1.6/testsuite/pathname_test.cc --- old/limal-1.1.5/testsuite/pathname_test.cc 2006-02-07 17:00:29.000000000 +0100 +++ new/limal-1.1.6/testsuite/pathname_test.cc 2006-03-28 15:11:35.000000000 +0200 @@ -115,6 +115,28 @@ cout << tstPath <<" -> /foo/some_file" << endl; } + cout << "Testing for correct prefix handling...\n"; + PathName::List p1List; + p1List.push_back( String( "foo" ) ); + p1List.push_back( String( "bar" ) ); + try{ + PathName pTmp( p1List ); + } + catch( ... ){ + cout << "Ok, caught exception when trying to construct a PathName" + << "from list not starting with prefix\n"; + } + + p1List = PathName( String( "c:/foo/bar" ) ).toList(); + try{ + PathName pTmp( p1List ); + } + catch( ... ){ + cout << "Error caught when trying to construct a PathName " + << "from list _starting_ with prefix\n"; + } + + cout << "=================" << endl; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/limal-1.1.5/testsuite/single.out/pathname_test.out new/limal-1.1.6/testsuite/single.out/pathname_test.out --- old/limal-1.1.5/testsuite/single.out/pathname_test.out 2006-02-03 13:25:28.000000000 +0100 +++ new/limal-1.1.6/testsuite/single.out/pathname_test.out 2006-03-28 15:11:35.000000000 +0200 @@ -11,5 +11,7 @@ ================= Testing for correct path cleansing...succeeded /./foo/bar/../some_file -> /foo/some_file +Testing for correct prefix handling... +Ok, caught exception when trying to construct a PathNamefrom list not starting with prefix ================= DONE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kdelibs3
by root＠suse.de 28 Mar '06

28 Mar '06

Hello community, here is the log from the commit of package kdelibs3 checked in at Tue Mar 28 17:01:12 CEST 2006. -------- --- /work/SRC/all/KDE/kdelibs3/kdelibs3.changes 2006-03-28 10:37:20.000000000 +0200 +++ /work/src/done/STABLE/kdelibs3/kdelibs3.changes 2006-03-28 16:49:30.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Mar 28 16:49:08 CEST 2006 - dmueller(a)suse.de + +- fix xauth being garbled during hostname changes (#147691) +- fix tar extraction error for certain archives (#161312) + +------------------------------------------------------------------- +Tue Mar 28 16:44:52 CEST 2006 - ro(a)suse.de + +- kdelibs3-devel req: replace mDNSResponder by mDNSResponder-devel + +------------------------------------------------------------------- New: ---- 3_5_BRANCH-r521012.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.91uQ8s/_old 2006-03-28 17:00:10.000000000 +0200 +++ /var/tmp/diff_new_pack.91uQ8s/_new 2006-03-28 17:00:10.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.1 -Release: 35 +Release: 36 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.91uQ8s/_old 2006-03-28 17:00:10.000000000 +0200 +++ /var/tmp/diff_new_pack.91uQ8s/_new 2006-03-28 17:00:10.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.1 -Release: 35 +Release: 36 %define kdelibs_patch_level a Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons @@ -96,6 +96,7 @@ Patch99: 3_5_BRANCH-r523122.diff Patch100: kmessagebox-with-kinstance.diff Patch101: kdesu-lc_all.diff +Patch102: 3_5_BRANCH-r521012.diff %description This package contains kdelibs, one of the basic packages of the K @@ -159,7 +160,7 @@ %endif Requires: libattr-devel libacl-devel %if %suse_version > 920 -Requires: mDNSResponder +Requires: mDNSResponder-devel %endif %if %suse_version > 930 Requires: kdelibs3-arts @@ -258,6 +259,7 @@ %patch99 %patch100 %patch101 +%patch102 # # define KDE version exactly # @@ -737,6 +739,11 @@ /opt/kde3/%_lib/libkwalletclient.so %changelog -n kdelibs3 +* Tue Mar 28 2006 - dmueller(a)suse.de +- fix xauth being garbled during hostname changes (#147691) +- fix tar extraction error for certain archives (#161312) +* Tue Mar 28 2006 - ro(a)suse.de +- kdelibs3-devel req: replace mDNSResponder by mDNSResponder-devel * Tue Mar 28 2006 - stbinner(a)suse.de - fix kdesu maybe not working with non-C locale (#152077) * Tue Mar 28 2006 - ro(a)suse.de ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.91uQ8s/_old 2006-03-28 17:00:10.000000000 +0200 +++ /var/tmp/diff_new_pack.91uQ8s/_new 2006-03-28 17:00:10.000000000 +0200 @@ -16,7 +16,7 @@ License: Other License(s), see package, BSD Group: System/GUI/KDE Version: 3.5.1 -Release: 35 +Release: 36 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 ++++++ 3_5_BRANCH-r521012.diff ++++++ ------------------------------------------------------------------------ r521012 | pley | 2006-03-21 15:11:33 +0100 (Tue, 21 Mar 2006) | 3 lines When compressed file had size % 8192 == 0, fillTempFile returned an error. ------------------------------------------------------------------------ Index: kio/kio/ktar.cpp =================================================================== --- kio/kio/ktar.cpp (revision 521011) +++ kio/kio/ktar.cpp (revision 521012) @@ -301,10 +301,10 @@ bool KTar::KTarPrivate::fillTempFile( co delete filterDev; return false; } - Q_LONG len; - while ( !filterDev->atEnd() ) { + Q_LONG len = -1; + while ( !filterDev->atEnd() && len != 0) { len = filterDev->readBlock(buffer.data(),buffer.size()); - if ( len <= 0 ) { // corrupted archive + if ( len < 0 ) { // corrupted archive delete filterDev; return false; } ++++++ use-xauthlocalhostname.diff ++++++ --- /var/tmp/diff_new_pack.91uQ8s/_old 2006-03-28 17:00:12.000000000 +0200 +++ /var/tmp/diff_new_pack.91uQ8s/_new 2006-03-28 17:00:12.000000000 +0200 @@ -133,3 +133,92 @@ { fName += "localhost"; } +Index: dcop/KDE-ICE/Xtranssock.c +=================================================================== +--- dcop/KDE-ICE/Xtranssock.c (revision 523215) ++++ dcop/KDE-ICE/Xtranssock.c (working copy) +@@ -1444,6 +1444,7 @@ UnixHostReallyLocal (char *host) + + { + char hostnamebuf[256]; ++ char* xauthlocalname = getenv("XAUTHLOCALHOSTNAME"); + + TRANS(GetHostname) (hostnamebuf, sizeof (hostnamebuf)); + +@@ -1451,6 +1452,10 @@ UnixHostReallyLocal (char *host) + { + return (1); + } ++ else if(xauthlocalname && strcmp (xauthlocalname, host) == 0) ++ { ++ return (1); ++ } + else + { + /* +--- kded/khostname.cpp (revision 523215) ++++ kded/khostname.cpp (working copy) +@@ -111,7 +111,8 @@ static QCStringList split(const QCString + + void KHostName::changeX() + { +- QString cmd = "xauth list"; ++ const char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME"); ++ QString cmd = "xauth -n list"; + FILE *xFile = popen(QFile::encodeName(cmd), "r"); + if (!xFile) + { +@@ -123,6 +124,7 @@ void KHostName::changeX() + char buf[1024+1]; + while (!feof(xFile)) + { ++ buf[1024]='\0'; + QCString line = fgets(buf, 1024, xFile); + if (line.length()) + line.truncate(line.length()-1); // Strip LF. +@@ -155,10 +157,19 @@ void KHostName::changeX() + continue; + + QCString newNetId = newName+netId.mid(i); ++ QCString oldNetId = netId.left(i); + +- cmd = "xauth remove "+KProcess::quote(netId); +- system(QFile::encodeName(cmd)); +- cmd = "xauth add "; ++ if(oldNetId != oldName ++ && (!xauthlocalhostname || strcmp(xauthlocalhostname, oldNetId.data()) != 0)) ++ continue; ++ ++ // don't nuke the xauth when XAUTHLOCALHOSTNAME points to it ++ if (!xauthlocalhostname || oldNetId != xauthlocalhostname) ++ { ++ cmd = "xauth -n remove "+KProcess::quote(netId); ++ system(QFile::encodeName(cmd)); ++ } ++ cmd = "xauth -n add "; + cmd += KProcess::quote(newNetId); + cmd += " "; + cmd += KProcess::quote(authName); +@@ -272,7 +283,10 @@ void KHostName::changeDcop() + } + } + +- // Remove old entries ++ // Remove old entries, but only if XAUTHLOCALHOSTNAME doesn't point ++ // to it ++ char* xauthlocalhostname = getenv("XAUTHLOCALHOSTNAME"); ++ if (!xauthlocalhostname || !oldNetId.contains(xauthlocalhostname)) + { + QString cmd = "iceauth remove "+KProcess::quote("netid="+oldNetId); + system(QFile::encodeName(cmd)); +@@ -364,9 +378,7 @@ int main(int argc, char **argv) + + KHostName hn; + +- if(!getenv("XAUTHLOCALHOSTNAME")) +- hn.changeX(); +- ++ hn.changeX(); + hn.changeDcop(); + hn.changeStdDirs("socket"); + hn.changeStdDirs("tmp"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

Welcome!
by Henne Vogelsang 28 Mar '06

28 Mar '06

Hi, welcome to the opensuse-commit list! Henne -- Henne Vogelsang, Core Services "Rules change. The Game remains the same." - Omar (The Wire)

1 0