- openSUSE Commits

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