December 2007 - openSUSE Commits - openSUSE Mailing Lists

commit kdebase4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdebase4 checked in at Sun Dec 2 14:51:57 CET 2007. -------- --- KDE/kdebase4/kdebase4.changes 2007-11-21 18:54:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2007-11-28 11:20:06.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:20:06 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- Old: ---- kdebase-3.96.1.tar.bz2 New: ---- kdebase-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.Z25077/_old 2007-12-02 14:50:49.000000000 +0100 +++ /var/tmp/diff_new_pack.Z25077/_new 2007-12-02 14:50:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4 (Version 3.96.1) +# spec file for package kdebase4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,15 +21,15 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 3.96.1 +Version: 3.96.2 Release: 1 -%define rversion 3.96.1 +%define rversion 3.96.2 Source0: kdebase-%rversion.tar.bz2 Source1: _upstream Source2: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch4: no-kappfinder.diff -Requires: kdebase4-runtime >= %version +%kde4_runtime_requires Conflicts: yast2-theme-NLD Suggests: kde4-konsole Suggests: kde4-dolphin @@ -109,7 +109,7 @@ %package -n kde4-konsole Group: System/X11/Terminals Summary: KDE Terminal -Requires: kdebase4-runtime +%kde4_runtime_requires %description -n kde4-konsole Konsole is a terminal emulator for the K Desktop Environment. @@ -193,7 +193,6 @@ %config %_kde_config_dir/konqsidebartng.rc # installed from apps/lib/konq/ and hence in kdebase4-libkonq %exclude /usr/share/kde4/apps/konqueror/pics/arrow_bottomright.png -%exclude /usr/share/kde4/apps/konqueror/pics/thumbnailfont_7x4.png %exclude /usr/share/kde4/apps/konqueror/pics/arrow_bottomleft.png %exclude /usr/share/kde4/apps/konqueror/pics/arrow_topright.png %exclude /usr/share/kde4/apps/konqueror/pics/arrow_topleft.png @@ -201,7 +200,7 @@ %package -n kde4-kwrite Group: Productivity/Editors/Other Summary: KDE Text Editor -Requires: kdebase4-runtime +%kde4_runtime_requires %description -n kde4-kwrite KWrite is the default text editor of the K desktop environment. @@ -415,7 +414,7 @@ %package -n kde4-kdepasswd Group: System/GUI/KDE Summary: KDE Password Changer -Requires: kdebase4-runtime +%kde4_runtime_requires %description -n kde4-kdepasswd This application allows you to change your UNIX password. @@ -441,6 +440,8 @@ %doc COPYING COPYING-DOCS README %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdebase-3.96.1.tar.bz2 -> kdebase-3.96.2.tar.bz2 ++++++ ++++ 6333 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeartwork4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdeartwork4 checked in at Sun Dec 2 14:50:35 CET 2007. -------- --- KDE/kdeartwork4/kdeartwork4.changes 2007-11-21 18:53:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeartwork4/kdeartwork4.changes 2007-11-28 11:19:13.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:19:13 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- kdeartwork4-noarch.changes: same change Old: ---- kdeartwork-3.96.1.tar.bz2 New: ---- kdeartwork-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeartwork4-noarch.spec ++++++ --- /var/tmp/diff_new_pack.M24091/_old 2007-12-02 14:50:12.000000000 +0100 +++ /var/tmp/diff_new_pack.M24091/_new 2007-12-02 14:50:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeartwork4-noarch (Version 3.96.1) +# spec file for package kdeartwork4-noarch (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ Group: System/GUI/KDE Summary: kdeartwork base package Url: http://www.kde.org -Version: 3.96.1 +Version: 3.96.2 Release: 1 Source0: kdeartwork-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -521,6 +521,8 @@ /usr/share/wallpapers %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdeartwork4.spec ++++++ --- /var/tmp/diff_new_pack.M24091/_old 2007-12-02 14:50:12.000000000 +0100 +++ /var/tmp/diff_new_pack.M24091/_new 2007-12-02 14:50:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeartwork4 (Version 3.96.1) +# spec file for package kdeartwork4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,9 +15,9 @@ Group: System/GUI/KDE Summary: kdeartwork base package Url: http://www.kde.org -Version: 3.96.1 +Version: 3.96.2 Release: 1 -%define rversion 3.96.1 +%define rversion 3.96.2 Source0: kdeartwork-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -131,6 +131,8 @@ /usr/share/kde4/apps/kstyle/themes/phase.themerc %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdeartwork-3.96.1.tar.bz2 -> kdeartwork-3.96.2.tar.bz2 ++++++ KDE/kdeartwork4/kdeartwork-3.96.1.tar.bz2 /mounts/work_src_done/STABLE/kdeartwork4/kdeartwork-3.96.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeadmin4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdeadmin4 checked in at Sun Dec 2 14:50:05 CET 2007. -------- --- KDE/kdeadmin4/kdeadmin4.changes 2007-11-21 18:53:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeadmin4/kdeadmin4.changes 2007-11-28 11:18:57.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:18:57 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- Old: ---- kdeadmin-3.96.1.tar.bz2 New: ---- kdeadmin-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeadmin4.spec ++++++ --- /var/tmp/diff_new_pack.i22700/_old 2007-12-02 14:49:43.000000000 +0100 +++ /var/tmp/diff_new_pack.i22700/_new 2007-12-02 14:49:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeadmin4 (Version 3.96.1) +# spec file for package kdeadmin4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,9 +15,9 @@ Group: System/GUI/KDE Summary: kdeadmin base package Url: http://www.kde.org -Version: 3.96.1 +Version: 3.96.2 Release: 1 -%define rversion 3.96.1 +%define rversion 3.96.2 Source0: kdeadmin-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -195,6 +195,8 @@ %doc COPYING COPYING-DOCS README %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdeadmin-3.96.1.tar.bz2 -> kdeadmin-3.96.2.tar.bz2 ++++++ Files old/kdeadmin-3.96.1/doc/kcron/index.cache.bz2 and new/kdeadmin-3.96.2/doc/kcron/index.cache.bz2 differ Files old/kdeadmin-3.96.1/doc/kdat/index.cache.bz2 and new/kdeadmin-3.96.2/doc/kdat/index.cache.bz2 differ Files old/kdeadmin-3.96.1/doc/knetworkconf/index.cache.bz2 and new/kdeadmin-3.96.2/doc/knetworkconf/index.cache.bz2 differ Files old/kdeadmin-3.96.1/doc/kpackage/index.cache.bz2 and new/kdeadmin-3.96.2/doc/kpackage/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.96.1/doc/kpackage/index.docbook new/kdeadmin-3.96.2/doc/kpackage/index.docbook --- old/kdeadmin-3.96.1/doc/kpackage/index.docbook 2007-11-21 15:40:11.000000000 +0100 +++ new/kdeadmin-3.96.2/doc/kpackage/index.docbook 2007-11-27 17:40:48.000000000 +0100 @@ -37,12 +37,12 @@ <legalnotice>&FDLNotice;</legalnotice> -<date>2006-12-04</date> -<releaseinfo>3.5.5</releaseinfo> +<date>2007-11-23</date> +<releaseinfo>3.96.1</releaseinfo> <abstract><para>&kpackage; is a &GUI; interface to the -<acronym>RPM</acronym>, Debian, Slackware and BSD package -managers.</para></abstract> +<acronym>RPM</acronym>, Debian and Slackware package +managers, it used the <acronym>SMART</acronym> package manager.</para></abstract> <keywordset> <keyword>kpackage</keyword> @@ -56,7 +56,7 @@ <chapter id="introduction"> <title>Introduction</title> -<para>&kpackage; is a &GUI; interface to the <acronym>SMART</acronym>, +<para>&kpackage; is a &GUI; interface to the <acronym>SMART</acronym> package manager. &kpackage; is part of the K Desktop Environment and, as a result, it is designed to integrate with the &kde; file manager. </para> @@ -96,7 +96,7 @@ <para>The left panel displays the list of packages</para> -<para>The <guilabel>Seach:</guilabel> line filters the package tree so that only those packages whose name or summary contains the search string are displayed. The columns that are searched can be changed by a menu that can be brought up by clicking the <mousebutton>right</mousebutton> mouse button on the search line. </para> +<para>The <guilabel>Search:</guilabel> line filters the package tree so that only those packages whose name or summary contains the search string are displayed. The columns that are searched can be changed by a menu that can be brought up by clicking the &RMB; on the search line. </para> <para>Next to the search line is a pull down menu that filters the displayed packages based on status:</para> <itemizedlist> @@ -121,8 +121,8 @@ <listitem><para><guilabel>Mark</guilabel> - Shows a tick if the package has been marked. Marking allows multiple packages to be installed or uninstalled at once using the buttons located below the package tree.</para></listitem> -<listitem><para><guilabel>Summary</guilabel>- A short description of the package.</para></listitem> -<listitem><para><guilabel>Size</guilabel>- The package size</para></listitem> +<listitem><para><guilabel>Summary</guilabel> - A short description of the package.</para></listitem> +<listitem><para><guilabel>Size</guilabel> - The package size</para></listitem> <listitem><para><guilabel>Version</guilabel> - The package version</para></listitem> <listitem><para><guilabel>Old Version</guilabel> - If the package updates an installed package, the version of the old package</para></listitem> @@ -473,11 +473,12 @@ <para>This describes the &kpackage; menus. </para> <sect1 id="file-menu"> -<title><guimenu>File</guimenu> menu</title> +<title><guimenu>File</guimenu> Menu</title> <para>The items in the <guimenu>File</guimenu> menu are:</para> <variablelist> + <varlistentry> <term><menuchoice><shortcut><keycombo action="simul"> &Ctrl;<keycap>O</keycap></keycombo></shortcut> @@ -494,22 +495,36 @@ </varlistentry> <varlistentry> -<term><menuchoice><shortcut><keycombo action="simul"> -&Ctrl;<keycap>F</keycap></keycombo></shortcut> -<guimenu>File</guimenu><guimenuitem>Find -Package...</guimenuitem></menuchoice></term> -<listitem><para>Search the installed package list for a package, the name -of which contains the entered string </para> </listitem> +<term><menuchoice> +<guimenu>File</guimenu> +<guimenuitem>Remote Host...</guimenuitem></menuchoice></term> +<listitem><para>Starts another copy of &kpackage; to manage another system remotely using ssh</para></listitem> </varlistentry> <varlistentry> <term><menuchoice><guimenu>File</guimenu> -<guimenuitem>Find File...</guimenuitem></menuchoice></term> -<listitem><para>Produces a list of packages that contain the entered -file name, selecting a line will display the information on that -package. It behaves slightly differently for <acronym>RPM</acronym> -(where you have to enter the exact file name) and <abbrev>DEB</abbrev> -(where you can enter a regular expression).</para></listitem> +<guisubmenu>Recent Remote Hosts...</guisubmenu></menuchoice></term> +<listitem><para>A list of the most recently accessed remote systems</para></listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice><guimenu>File</guimenu> +<guimenuitem>Update</guimenuitem></menuchoice></term> +<listitem><para>Update <command>apt</command> indexes from package +repositories.</para></listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice><guimenu>File</guimenu> +<guimenuitem>Upgrade</guimenuitem></menuchoice></term> +<listitem><para>Upgrade the Debian installation to the latest versions +of all the packages.</para></listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice><guimenu>File</guimenu> +<guimenuitem>Fixup</guimenuitem></menuchoice></term> +<listitem><para>Attempt to fixup dependency problems</para></listitem> </varlistentry> <varlistentry> @@ -527,12 +542,53 @@ <guimenuitem>Quit</guimenuitem></menuchoice></term> <listitem><para>Quit &kpackage; </para></listitem> </varlistentry> + + + +</variablelist> + +</sect1> + +<sect1 id="edit-menu"> +<title><guimenu>Edit</guimenu> Menu</title> + +<para>The items in the <guimenu>Edit</guimenu> menu are: </para> + +<variablelist> + +<varlistentry> +<term><menuchoice><shortcut><keycombo action="simul"> +&Ctrl;<keycap>F</keycap></keycombo></shortcut> +<guimenu>File</guimenu><guimenuitem>Find +Package...</guimenuitem></menuchoice></term> +<listitem><para>Search the installed package list for a package, the name +of which contains the entered string </para> </listitem> +</varlistentry> + +<varlistentry> +<term><menuchoice><guimenu>File</guimenu> +<guimenuitem>Find File...</guimenuitem></menuchoice></term> +<listitem><para>Produces a list of packages that contain the entered +file name, selecting a line will display the information on that +package. It behaves slightly differently for <acronym>RPM</acronym> +(where you have to enter the exact file name) and <abbrev>DEB</abbrev> +(where you can enter a regular expression).</para></listitem> +</varlistentry> + +<varlistentry> + <term><menuchoice><guimenu>File</guimenu> +<guimenuitem>Apt-File Update</guimenuitem></menuchoice></term> + <listitem><para>Searching for uninstall files uses the <command>apt-file</command> command, this updates the +database that <command>apt-file</command> uses.</para></listitem> +</varlistentry> + + </variablelist> </sect1> <sect1 id="packages-menu"> -<title><guimenu>Packages</guimenu> menu</title> +<title><guimenu>Packages</guimenu> Menu</title> <para>The items in the <guimenu>Packages</guimenu> menu are:</para> @@ -625,80 +681,10 @@ </sect1> -<sect1 id="cache-menu"> -<title><guimenu>Cache</guimenu> menu</title> -<para>The items in the <guimenu>Cache</guimenu> menu are: </para> -<variablelist> -<varlistentry> -<term><menuchoice><guimenu>Cache</guimenu> <guimenuitem>Clear -Package Folder Cache</guimenuitem></menuchoice></term> -<listitem><para>Delete cached copies of remote package folders and Packages -files</para> </listitem> -</varlistentry> - -<varlistentry> -<term><menuchoice> -<guimenu>Cache</guimenu><guimenuitem>Clear Package -Cache</guimenuitem> -</menuchoice></term> -<listitem><para>Delete cached copies of remote package files that have been -fetched</para> </listitem> -</varlistentry> -</variablelist> - -</sect1> - -<sect1 id="special-menu"> -<title><guimenu>Special</guimenu> menu</title> - -<para>The <guimenu>Special</guimenu> contains actions -related to specific package types:</para> - -<variablelist> -<varlistentry> -<term><menuchoice> -<guimenu>Special</guimenu><guimenuitem> -APT: Debian</guimenuitem> -</menuchoice></term> -<listitem> - -<variablelist> - -<varlistentry> -<term><guilabel>Update</guilabel></term> -<listitem><para>Update <command>apt</command> indexes from package -repositories.</para></listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Upgrade</guilabel></term> -<listitem><para>Upgrade the Debian installation to the latest versions -of all the packages.</para></listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Fixup</guilabel></term> -<listitem><para><command>apt</command> is extremely strict about -dependencies, attempt to fixup dependency problems</para></listitem> -</varlistentry> - -<varlistentry> - <term><guilabel>Apt-File Update</guilabel></term> - <listitem><para>Searching for uninstall files uses the <command>apt-file</command> command, this updates the database that <command>apt-file</command> uses.</para></listitem> -</varlistentry> - -</variablelist> - -</listitem> - -</varlistentry> -</variablelist> - -</sect1> <sect1 id="settings-menu"> -<title><guimenu>Settings</guimenu> menu</title> +<title><guimenu>Settings</guimenu> Menu</title> <para>The items in the <guimenu>Settings</guimenu> menu are:</para> @@ -740,71 +726,44 @@ <listitem> <variablelist> -<varlistentry> -<term><guilabel>Types</guilabel></term> -<listitem><para>Which package types to handle, Debian using DPKG and -Debian using APT are listed separately, it is not a good idea to -enable both at the same time. It also sets whether to access -a remote host for Debian apt.</para></listitem> -</varlistentry> <varlistentry> -<term><guilabel>Cache</guilabel></term> -<listitem><para>Controls caching of remote (&FTP;ed) folders and Package -files.</para> +<term>The configuration dialog of &kpackage; has two pages:</term> +<term><guilabel>Command</guilabel></term> +<listitem> <variablelist> <varlistentry> -<term><guilabel>Cache Remote Package Folders</guilabel></term> -<listitem><para>Whether to cache remote (&FTP;ed) folders and Package -files.</para></listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Cache Remote Package Files</guilabel></term> -<listitem><para>Whether to cache remote package files that have been fetched -</para></listitem> -</varlistentry> +<term><guilabel>How to Execute Privileged Commands</guilabel></term> +<listitem><para>Use <command>su</command>, <command>sudo</command> or +<command>ssh</command> to run privileged commands for such things as installing and uninstalling packages, The default is <command>su</command> but some systems such as &ubuntu; requires the <command>sudo</command>. For running privileged commands on remote hosts <command>ssh</command> +is always used.</para> </listitem> -<varlistentry> -<term><guilabel>Cache Folder</guilabel></term> -<listitem><para>Where to cache package files and folders -</para></listitem> </varlistentry> </variablelist> + </listitem> </varlistentry> <varlistentry> -<term><guilabel>misc</guilabel></term> +<term><guilabel>Misc</guilabel></term> <listitem> <variablelist> <varlistentry> -<term><guilabel>Execute Privileged Commands Using</guilabel></term> -<listitem><para>Use <command>su</command>, <command>sudo</command> or -<command>ssh</command> for running privileged commands. For remote Debian APT <command>ssh</command> -is always used.</para> </listitem> -</varlistentry> - -<varlistentry> -<term><guilabel>Verify file list</guilabel></term> +<term><guilabel>Verify List of Files</guilabel></term> <listitem><para>If set the list of files in the package is checked to see if they are actually installed</para> </listitem> </varlistentry> -<varlistentry> -<term><guilabel>Read information from all local package files</guilabel></term> -<listitem><para>If set all the files from a (local) package folder are read -instead of just using the files names, this is slower but shows more -information.</para></listitem> -</varlistentry> - </variablelist> </listitem> </varlistentry> + + + </variablelist> </listitem> </varlistentry> @@ -814,7 +773,7 @@ </sect1> <sect1 id="help-menu"> -<title><guimenu>Help</guimenu> menu</title> +<title><guimenu>Help</guimenu> Menu</title> <para>The items in the <guimenu>Help</guimenu> menu are: </para> @@ -833,6 +792,8 @@ <listitem><para><guiicon>Collapse Tree</guiicon></para></listitem> <listitem><para><guiicon>Find Package</guiicon></para></listitem> <listitem><para><guiicon>Find File</guiicon></para></listitem> +<listitem><para><guiicon>Update</guiicon></para></listitem> +<listitem><para><guiicon>Upgrade</guiicon></para></listitem> <listitem><para><guiicon>Reload</guiicon></para></listitem> </itemizedlist> </sect1> @@ -863,12 +824,12 @@ &install.intro.documentation; <para>For information on how to obtain and compile it see <ulink -url="http://www.kde.org/install-source.html"> -http://www.kde.org/install-source.html</ulink></para> +url="http://techbase.kde.org/Getting_Started"> +http://techbase.kde.org/Getting_Started</ulink></para> <para>There is more information on compilation at <ulink -url="http://www.kde.org/compilationfaq.html"> -http://www.kde.org/compilationfaq.html</ulink></para> +url="http://techbase.kde.org/Getting_Started/Build/FAQ"> +http://techbase.kde.org/Getting_Started/Build/FAQ</ulink></para> <para>There is a web page at <ulink url="http://www.general.uwa.edu.au/u/toivo/kpackage"> @@ -882,7 +843,8 @@ <para>For installing &kpackage; you need:</para> <itemizedlist> -<listitem><para>&Qt; 3 and &kde; 3</para></listitem> +<listitem><para>&Qt; 4 and &kde; 4</para></listitem> +<listitem><para><acronym>SMART</acronym> package manager</para></listitem> </itemizedlist> <para>For listing Debian packages no other software is needed but to Files old/kdeadmin-3.96.1/doc/ksysv/index.cache.bz2 and new/kdeadmin-3.96.2/doc/ksysv/index.cache.bz2 differ Files old/kdeadmin-3.96.1/doc/kuser/index.cache.bz2 and new/kdeadmin-3.96.2/doc/kuser/index.cache.bz2 differ Files old/kdeadmin-3.96.1/doc/lilo-config/index.cache.bz2 and new/kdeadmin-3.96.2/doc/lilo-config/index.cache.bz2 differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.96.1/kuser/ku_configdlg.cpp new/kdeadmin-3.96.2/kuser/ku_configdlg.cpp --- old/kdeadmin-3.96.1/kuser/ku_configdlg.cpp 2007-10-08 09:15:59.000000000 +0200 +++ new/kdeadmin-3.96.2/kuser/ku_configdlg.cpp 2007-11-27 17:40:48.000000000 +0100 @@ -40,7 +40,7 @@ #include "ui_ku_passwordpolicy.h" KU_ConfigDlg::KU_ConfigDlg( KConfigSkeleton *config, QWidget *parent, const char *name ) : - KConfigDialog( parent, name, config) + KConfigDialog( parent, name, config),sambaui(0) { setFaceType(List); setButtons(Default|Ok|Apply|Cancel|Help); @@ -107,6 +107,11 @@ addPage( page3, i18n("LDAP"), "", i18n("LDAP Source Settings") ); } +KU_ConfigDlg::~KU_ConfigDlg() +{ + delete sambaui; +} + void KU_ConfigDlg::slotQueryClicked() { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.96.1/kuser/ku_configdlg.h new/kdeadmin-3.96.2/kuser/ku_configdlg.h --- old/kdeadmin-3.96.1/kuser/ku_configdlg.h 2006-10-26 04:22:37.000000000 +0200 +++ new/kdeadmin-3.96.2/kuser/ku_configdlg.h 2007-11-27 17:40:48.000000000 +0100 @@ -42,6 +42,7 @@ Q_OBJECT public: KU_ConfigDlg( KConfigSkeleton *config, QWidget* parent, const char * name = 0 ); + ~KU_ConfigDlg(); private: QProgressDialog *mProg; Ui_KU_LdapSamba *sambaui; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdeadmin-3.96.1/kuser/ku_mainwidget.cpp new/kdeadmin-3.96.2/kuser/ku_mainwidget.cpp --- old/kdeadmin-3.96.1/kuser/ku_mainwidget.cpp 2007-10-08 09:15:59.000000000 +0200 +++ new/kdeadmin-3.96.2/kuser/ku_mainwidget.cpp 2007-11-27 17:40:48.000000000 +0100 @@ -74,7 +74,7 @@ KStandardAction::preferences(this, SLOT(properties()), actionCollection()); QAction *action; - action = new KAction(KIcon("add-user"), i18n("&Add..."), this); + action = new KAction(KIcon("list-add-user"), i18n("&Add..."), this); actionCollection()->addAction("add_user", action ); connect( action, SIGNAL(triggered(bool)), mv, SLOT(useradd()) ); @@ -82,7 +82,7 @@ actionCollection()->addAction("edit_user", action ); connect( action, SIGNAL(triggered(bool)), mv, SLOT(useredit()) ); - action = new KAction(KIcon("delete-user"), i18n("&Delete..."), this); + action = new KAction(KIcon("list-remove-user"), i18n("&Delete..."), this); actionCollection()->addAction("delete_user", action ); connect( action, SIGNAL(triggered(bool)), mv, SLOT(userdel()) ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeaccessibility4
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package kdeaccessibility4 checked in at Sun Dec 2 14:49:35 CET 2007. -------- --- KDE/kdeaccessibility4/kdeaccessibility4.changes 2007-11-21 18:52:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdeaccessibility4/kdeaccessibility4.changes 2007-11-28 11:18:32.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 11:18:32 CET 2007 - dmueller(a)suse.de + +- update to 3.96.2 + +------------------------------------------------------------------- kdeaccessibility4-icons.changes: same change Old: ---- kdeaccessibility-3.96.1.tar.bz2 New: ---- kdeaccessibility-3.96.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeaccessibility4-icons.spec ++++++ --- /var/tmp/diff_new_pack.hpE712/_old 2007-12-02 14:36:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hpE712/_new 2007-12-02 14:36:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeaccessibility4-icons (Version 3.96.1) +# spec file for package kdeaccessibility4-icons (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ Group: System/GUI/KDE Summary: Monochrome Icon Set for KDE Url: http://www.kde.org -Version: 3.96.1 +Version: 3.96.2 Release: 1 Source0: kdeaccessibility-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,6 +57,8 @@ /usr/share/icons/mono %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdeaccessibility4.spec ++++++ --- /var/tmp/diff_new_pack.hpE712/_old 2007-12-02 14:36:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hpE712/_new 2007-12-02 14:36:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdeaccessibility4 (Version 3.96.1) +# spec file for package kdeaccessibility4 (Version 3.96.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,9 +15,9 @@ Group: System/GUI/KDE Summary: kdeaccessibility Base Package Url: http://www.kde.org -Version: 3.96.1 +Version: 3.96.2 Release: 1 -%define rversion 3.96.1 +%define rversion 3.96.2 Source0: kdeaccessibility-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -201,6 +201,8 @@ %doc COPYING COPYING-DOCS %changelog +* Wed Nov 28 2007 - dmueller(a)suse.de +- update to 3.96.2 * Wed Nov 21 2007 - dmueller(a)suse.de - update to 3.96.1 * Wed Nov 14 2007 - dmueller(a)suse.de ++++++ kdeaccessibility-3.96.1.tar.bz2 -> kdeaccessibility-3.96.2.tar.bz2 ++++++ KDE/kdeaccessibility4/kdeaccessibility-3.96.1.tar.bz2 /mounts/work_src_done/STABLE/kdeaccessibility4/kdeaccessibility-3.96.2.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpart
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package gpart checked in at Sun Dec 2 14:25:01 CET 2007. -------- --- gpart/gpart.changes 2006-11-08 10:48:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/gpart/gpart.changes 2007-11-30 20:41:48.619838000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 30 20:21:31 CET 2007 - pcerny(a)suse.cz + +- fixed call to open for use with glibc 2.7 + +------------------------------------------------------------------- New: ---- gpart-0.1h-glibc_2.7_open.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpart.spec ++++++ --- /var/tmp/diff_new_pack.D19666/_old 2007-12-02 14:24:38.000000000 +0100 +++ /var/tmp/diff_new_pack.D19666/_new 2007-12-02 14:24:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gpart (Version 0.1h) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,19 +11,20 @@ # norootforbuild Name: gpart -License: GNU General Public License (GPL) - all versions +License: GPL v2 or later Group: System/Filesystems -Autoreqprov: on +AutoReqProv: on Version: 0.1h -Release: 509 +Release: 565 Summary: Tool That Can Guess a Lost Partition Table -URL: http://www.stud.uni-hannover.de/user/76201/gpart/ +Url: http://www.stud.uni-hannover.de/user/76201/gpart/ Source: %{name}-%{version}.tar.bz2 Patch: %{name}-%{version}.diff Patch1: %{name}-%{version}-array_overflow.diff Patch2: %{name}-%{version}-array_overflow2.diff Patch3: %{name}-%{version}-kernel_syscall.diff Patch4: %{name}-%{version}.log.patch +Patch5: %{name}-%{version}-glibc_2.7_open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,6 +48,7 @@ %patch2 %patch3 %patch4 +%patch5 %build make CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -DVERSION=\\\"%version\\\"" %{?jobs:-j%jobs} @@ -63,7 +65,9 @@ /usr/bin/gpart /usr/share/man/man8/gpart.8.gz -%changelog -n gpart +%changelog +* Fri Nov 30 2007 - pcerny(a)suse.cz +- fixed call to open for use with glibc 2.7 * Wed Nov 08 2006 - prusnak(a)suse.cz - fixed array overflow on multiple places [#159103 was reopened] * Fri Oct 20 2006 - olh(a)suse.de ++++++ gpart-0.1h-glibc_2.7_open.patch ++++++ --- src/gpart.c.orig +++ src/gpart.c @@ -1221,7 +1221,7 @@ { int fd, ret = 0; - if ((fd = open(bfile,O_WRONLY|O_CREAT)) < 0) + if ((fd = open(bfile,O_WRONLY|O_CREAT,0660)) < 0) return (ret); if (write(fd,d->d_pt.t_boot,512) == 512) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-volume-manager
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package gnome-volume-manager checked in at Sun Dec 2 14:24:31 CET 2007. -------- --- GNOME/gnome-volume-manager/gnome-volume-manager.changes 2007-10-11 16:39:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-volume-manager/gnome-volume-manager.changes 2007-11-30 17:32:41.328258000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 30 17:31:49 CET 2007 - crivera(a)suse.de + +- Add gvm-check-printer-configured-property.patch to check + for the printer.configured_existing property to avoid + prompting for a printer that is already configured. + +------------------------------------------------------------------- New: ---- gvm-check-printer-configured-property.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-volume-manager.spec ++++++ --- /var/tmp/diff_new_pack.S19030/_old 2007-12-02 14:24:17.000000000 +0100 +++ /var/tmp/diff_new_pack.S19030/_new 2007-12-02 14:24:17.000000000 +0100 @@ -13,7 +13,7 @@ Name: gnome-volume-manager BuildRequires: fdupes gnutls-devel intltool libglade2-devel libgnomeprintui-devel libnotify-devel libwnck-devel nautilus-devel perl-XML-Parser update-desktop-files Version: 2.17.0 -Release: 111 +Release: 137 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL v2 or later @@ -26,6 +26,7 @@ Patch1: suse-autorun.patch Patch2: 153241.patch Patch3: gnome-volume-manager-printer-notify.patch +Patch4: gvm-check-printer-configured-property.patch %if %suse_version > 1000 Recommends: control-center2 %else @@ -60,6 +61,7 @@ %patch1 %patch2 %patch3 -p1 +%patch4 -p1 %build autoreconf -f -i @@ -107,7 +109,12 @@ %dir %{_datadir}/gnome/autostart %files lang -f %{name}.lang + %changelog +* Fri Nov 30 2007 - crivera(a)suse.de +- Add gvm-check-printer-configured-property.patch to check + for the printer.configured_existing property to avoid + prompting for a printer that is already configured. * Thu Oct 11 2007 - sbrabec(a)suse.cz - Removed bogus dependency on mDNSResponder. * Tue Aug 07 2007 - maw(a)suse.de ++++++ gvm-check-printer-configured-property.patch ++++++ diff -ur /usr/src/packages/BUILD/gnome-volume-manager-2.17.0/src/manager.c ./src/manager.c --- /usr/src/packages/BUILD/gnome-volume-manager-2.17.0/src/manager.c 2007-11-14 14:09:07.000000000 -0500 +++ ./src/manager.c 2007-11-14 14:08:09.000000000 -0500 @@ -2524,6 +2524,9 @@ static gboolean printer_device_added (const char *udi, const char *capability __attribute__((__unused__))) { + if (libhal_device_get_property_bool (hal_ctx, udi, "printer.configured_existing", NULL)) + return TRUE; + if (libhal_device_get_property_bool (hal_ctx, udi, "printer.configured", NULL)) { char *display_name = libhal_device_get_property_string (hal_ctx, udi, "printer.display_name", NULL); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-cups-manager
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package gnome-cups-manager checked in at Sun Dec 2 14:24:10 CET 2007. -------- --- GNOME/gnome-cups-manager/gnome-cups-manager.changes 2007-11-23 17:54:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-cups-manager/gnome-cups-manager.changes 2007-11-30 18:50:33.074410000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 30 18:49:25 CET 2007 - crivera(a)suse.de + +- Remove duplicate printers from the detected list, if possible. + This fixes 215490. + +------------------------------------------------------------------- New: ---- gnome-cups-add-filter-printers.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-cups-manager.spec ++++++ --- /var/tmp/diff_new_pack.b16916/_old 2007-12-02 14:23:10.000000000 +0100 +++ /var/tmp/diff_new_pack.b16916/_new 2007-12-02 14:23:10.000000000 +0100 @@ -13,7 +13,7 @@ Name: gnome-cups-manager BuildRequires: cups cups-devel fdupes gcc-c++ gnome-common gnome-icon-theme gnutls-devel intltool krb5-devel libglade2-devel libgnomecups-devel libgnomeprintui-devel libgnomeui-devel libsmbclient libsmbclient-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files Version: 0.32 -Release: 14 +Release: 18 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL v2 only @@ -27,6 +27,7 @@ Patch4: gnome-cups-manager-root-queue.patch Patch5: gnome-cups-manager-icon-callback.patch Patch6: gnome-cups-manager-gcc4.3-fixes.patch +Patch7: gnome-cups-add-filter-printers.patch AutoReqProv: on Requires: gnome-icon-theme Requires: %{name}-lang = %{version} @@ -58,6 +59,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build sed -i "s/$ALL_LINGUAS.*$ no /\1 /" configure.in @@ -108,6 +110,9 @@ %{_includedir}/libgnomecups-1/libgnomecups/* %changelog +* Fri Nov 30 2007 - crivera(a)suse.de +- Remove duplicate printers from the detected list, if possible. + This fixes 215490. * Fri Nov 23 2007 - maw(a)suse.de - Update gnome-cups-manager-gcc4.3-fixes.patch - Build with -fno-strict-aliasing. ++++++ gnome-cups-add-filter-printers.patch ++++++ diff -ur /usr/src/packages/BUILD/gnome-cups-manager-0.32/libgnomecups/gnome-cups-ui-connection.c ./libgnomecups/gnome-cups-ui-connection.c --- /usr/src/packages/BUILD/gnome-cups-manager-0.32/libgnomecups/gnome-cups-ui-connection.c 2007-11-30 13:32:05.000000000 -0500 +++ ./libgnomecups/gnome-cups-ui-connection.c 2007-11-30 13:32:01.000000000 -0500 @@ -147,6 +147,7 @@ char *label; char *uri; char *vendor_and_model; + char *device_id; } LocalPrinter; static void @@ -155,6 +156,7 @@ g_free (printer->label); g_free (printer->uri); g_free (printer->vendor_and_model); + g_free (printer->device_id); g_free (printer); } @@ -401,6 +403,9 @@ } else if (!strcmp (attr->name, "device-info")) { g_free (desc->label); desc->label = g_strdup (attr->values[0].string.text); + } else if (!strcmp (attr->name, "device-id")) { + g_free (desc->device_id); + desc->device_id = g_strdup (attr->values[0].string.text); } else if (!strcmp (attr->name, "device-uri")) { g_free (desc->uri); desc->uri = g_strdup (attr->values[0].string.text); @@ -954,6 +959,38 @@ } } +static gboolean +usb_printer_has_specialized_match (LocalPrinter *usb_printer, GSList *list) +{ + GSList *p; + + if (strncmp ("usb:/", usb_printer->uri, 5)) + return FALSE; + + for (p = list; p; p = p->next) { + LocalPrinter *lp = p->data; + + if (!strncmp ("usb:/", lp->uri, 5)) + continue; + + if (usb_printer->device_id && lp->device_id && + !strcmp (lp->device_id, usb_printer->device_id)) + return TRUE; + + if (usb_printer->vendor_and_model && lp->vendor_and_model) { + gchar *usb_up = g_ascii_strup (usb_printer->vendor_and_model, -1); + gchar *other_up = g_ascii_strup (lp->vendor_and_model, -1); + int ret = strcmp (usb_up, other_up); + g_free (usb_up); + g_free (other_up); + if (!ret) + return TRUE; + } + } + + return FALSE; +} + static void setup_local_connections (GCupsConnectionSelector *cs) { @@ -986,6 +1023,7 @@ selection = gtk_tree_view_get_selection (tree_view); num_detected = 0; + for (ptr = devices; ptr != NULL; ptr = ptr->next) { LocalPrinter *desc = ptr->data; if (desc->vendor_and_model @@ -995,6 +1033,13 @@ && strcmp (desc->vendor_and_model, "CANON")) { GtkTreeIter iter; + /* + * If the usb backend printer has a specialized match + * then we skip it in favor of the specialized one. + */ + if (usb_printer_has_specialized_match (desc, devices)) + continue; + gtk_list_store_append (list_store, &iter); gtk_list_store_set (list_store, &iter, 0, desc->vendor_and_model, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cups-autoconfig
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package cups-autoconfig checked in at Sun Dec 2 14:23:03 CET 2007. -------- --- cups-autoconfig/cups-autoconfig.changes 2007-11-29 17:39:24.000000000 +0100 +++ /mounts/work_src_done/STABLE/cups-autoconfig/cups-autoconfig.changes 2007-11-30 17:04:58.847405000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 30 17:00:34 CET 2007 - crivera(a)suse.de + +- Disable the ability to disable printers on removal. + This fixes 334166. +- Fix the fdi path in the spec . + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-autoconfig.spec ++++++ --- /var/tmp/diff_new_pack.P16056/_old 2007-12-02 14:22:14.000000000 +0100 +++ /var/tmp/diff_new_pack.P16056/_new 2007-12-02 14:22:14.000000000 +0100 @@ -12,7 +12,7 @@ Name: cups-autoconfig Url: http://code.google.com/p/cups-autoconfig Version: 0.1.0 -Release: 48 +Release: 49 Group: System/Base License: GPL v2 only Summary: A Utility to Auto-configure Printers @@ -50,10 +50,14 @@ %{_libdir}/cups-autoconfig/cups-autoconfig %{_libdir}/hal/hal-cups-autoconfig %config %{_sysconfdir}/cups-autoconfig.conf -%{_datadir}/hal/fdi/policy/10osvendor/10-cups-autoconfig.fdi +%{_datadir}/hal/fdi/policy/20thirdparty/10-cups-autoconfig.fdi %{_datadir}/locale/en_US/LC_MESSAGES/cups-autoconfig.mo %changelog +* Fri Nov 30 2007 - crivera(a)suse.de +- Disable the ability to disable printers on removal. + This fixes 334166. +- Fix the fdi path in the spec . * Thu Nov 29 2007 - crivera(a)suse.de - HAL fdi file fixes from Danny Kukawka. - Don't set the default policy for new printers. ++++++ cups-autoconfig-0.1.0.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cups-autoconfig-0.1.0/ChangeLog new/cups-autoconfig-0.1.0/ChangeLog --- old/cups-autoconfig-0.1.0/ChangeLog 2007-11-29 18:39:52.000000000 +0100 +++ new/cups-autoconfig-0.1.0/ChangeLog 2007-11-30 17:08:12.000000000 +0100 @@ -1,3 +1,10 @@ +2007-11-30 Chris Rivera <crivera(a)novell.com> + + * src/cups-autoconfig.c: + + Disable the ability to pause printers on + removal. This is causing problems. + 2007-11-29 Chris Rivera <crivera(a)novell.com> * src/cups-autoconfig.c: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cups-autoconfig-0.1.0/src/cups-autoconfig.c new/cups-autoconfig-0.1.0/src/cups-autoconfig.c --- old/cups-autoconfig-0.1.0/src/cups-autoconfig.c 2007-11-14 20:07:52.000000000 +0100 +++ new/cups-autoconfig-0.1.0/src/cups-autoconfig.c 2007-11-30 17:08:17.000000000 +0100 @@ -105,9 +105,11 @@ config->add = value && (!strcmp (value, "yes") || !strcmp (value, "y")) ? TRUE : FALSE; g_free (value); - value = g_key_file_get_value (kf, "CUPS", "DisablePrintersOnRemoval", NULL); + /*value = g_key_file_get_value (kf, "CUPS", "DisablePrintersOnRemoval", NULL); config->remove = value && (!strcmp (value, "yes") || !strcmp (value, "y")) ? TRUE : FALSE; - g_free (value); + g_free (value);*/ + + config->remove = FALSE; value = g_key_file_get_value (kf, "CUPS", "DefaultCUPSPolicy", NULL); if (!strcmp ("", value)) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit crash
by root＠Hilbert.suse.de 02 Dec '07

02 Dec '07

Hello community, here is the log from the commit of package crash checked in at Sun Dec 2 14:22:07 CET 2007. -------- --- crash/crash.changes 2007-11-26 15:20:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/crash/crash.changes 2007-11-30 14:50:41.737379000 +0100 @@ -1,0 +2,7 @@ +Fri Nov 30 14:56:34 CET 2007 - bwalle(a)suse.de + +- fixed file.c SIAL script for linux 2.6.22 and later +- removed spu.c from SIAL package since this was not a SIAL script + but an extension module + +------------------------------------------------------------------- New: ---- crash-sial-fix-files-script ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crash.spec ++++++ --- /var/tmp/diff_new_pack.Z15265/_old 2007-12-02 14:21:36.000000000 +0100 +++ /var/tmp/diff_new_pack.Z15265/_new 2007-12-02 14:21:36.000000000 +0100 @@ -19,7 +19,7 @@ Url: http://people.redhat.com/anderson/ Summary: Crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles Version: 4.0.4.10 -Release: 1 +Release: 3 %define crash_version %(echo %{version} | cut -d . -f 1-2) %define crash_subversion %(echo %{version} | cut -d . -f 3-4) %define whitepaper_version 2003 @@ -37,6 +37,7 @@ Patch2: crash-sles9-quirk.patch Patch3: crash-search-also-in-lib-crash Patch4: crash-fixed-uninitialised +Patch5: crash-sial-fix-files-script BuildRequires: bison flex ncurses-devel zlib-devel %description @@ -98,6 +99,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +cd sial-scripts-%{scripts_version} +%patch5 +cd - cp %{S:3} . %build @@ -153,6 +157,10 @@ %endif %changelog +* Fri Nov 30 2007 - bwalle(a)suse.de +- fixed file.c SIAL script for linux 2.6.22 and later +- removed spu.c from SIAL package since this was not a SIAL script + but an extension module * Mon Nov 26 2007 - bwalle(a)suse.de - update to crash 4.0-4.10 o Fix a regression introduced in 4.0-4.9 that causes the ++++++ crash-sial-fix-files-script ++++++ --- files.c.orig 2007-11-30 14:25:05.000000000 +0100 +++ files.c 2007-11-30 14:29:39.000000000 +0100 @@ -139,7 +139,12 @@ printf("%sPID: %-5ld TASK: 0x%p CPU: %-2d COMMAND: \"%s\"\n", newline ? "\n" : "", t->pid, t, - t->thread_info->cpu, getstr(t->comm)); +#if LINUX_RELEASE >= 0x020616 + ((struct thread_info *)(t)->stack)->cpu, +#else + t->thread_info->cpu, +#endif + getstr(t->comm)); } /* Traditional mask definitions for st_mode. */ ++++++ sial-scripts-2007-10-26.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sial-scripts-2007-10-26/spu.c new/sial-scripts-2007-10-26/spu.c --- old/sial-scripts-2007-10-26/spu.c 2007-09-21 20:42:20.000000000 +0200 +++ new/sial-scripts-2007-10-26/spu.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,1011 +0,0 @@ -/* spu.c - commands for viewing Cell/B.E. SPUs data - * - * (C) Copyright 2007 IBM Corp. - * - * Author: Lucio Correia <luciojhc(a)br.ibm.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include "defs.h" - -#define NR_SPUS (16) /* Enough for current hardware */ -#define MAX_PRIO (140) -#define MAX_PROPERTY_NAME (64) -#define STR_SPU_INVALID (0x0) -#define STR_SPU_ID (0x1) -#define STR_SPU_PID (0x2) -#define STR_SPU_CTX_ADDR (0x8) - -#define SPUCTX_CMD_NAME "spuctx" -#define SPUS_CMD_NAME "spus" -#define SPURQ_CMD_NAME "spurq" - -struct cbe_size_table; -struct cbe_offset_table; -void init_cbe_size_table(void); -void init_cbe_offset_table(void); -ulong get_spu_addr(ulong spu_info); - -void cmd_spus(void); -void cmd_spurq(void); -void cmd_spuctx(void); -char *help_spus[]; -char *help_spurq[]; -void show_spu_state(ulong spu); -void dump_spu_runq(ulong k_prio_array); -char *help_spuctx[]; -void show_ctx_info(ulong ctx_addr); -void print_ctx_info(char *ctx_data, char *spu_data, int info); -void show_ctx_info_all(void); - - -static struct command_table_entry command_table[] = { - SPUCTX_CMD_NAME, cmd_spuctx, help_spuctx, 0, - SPUS_CMD_NAME, cmd_spus, help_spus, 0, - SPURQ_CMD_NAME, cmd_spurq, help_spurq, 0, - NULL -}; - -struct cbe_size_table { - long crash_spu_info; - long spu; - long spu_context; - long spu_prio_array; - long list_head; -} cbe_size_table; - -struct cbe_offset_table { - long crash_spu_info_spu; - long crash_spu_info_saved_mfc_sr1_RW; - long crash_spu_info_saved_mfc_dar; - long crash_spu_info_saved_mfc_dsisr; - long crash_spu_info_saved_spu_runcntl_RW; - long crash_spu_info_saved_spu_status_R; - long crash_spu_info_saved_spu_npc_RW; - - long spu_node; - long spu_number; - long spu_ctx; - long spu_pid; - long spu_name; - long spu_slb_replace; - long spu_mm; - long spu_timestamp; - long spu_class_0_pending; - long spu_problem; - long spu_priv2; - long spu_flags; - - long spu_context_spu; - long spu_context_state; - long spu_context_prio; - long spu_context_local_store; - long spu_context_rq; - - long spu_prio_array_runq; -} cbe_offset_table; - -#define CBE_SIZE(X) (cbe_size_table.X) -#define CBE_OFFSET(X, Y) (cbe_offset_table.X##_##Y) - -#define CBE_SIZE_INIT(X, Y) \ -do { \ - cbe_size_table.X = STRUCT_SIZE(Y); \ - if (cbe_size_table.X == -1) \ - error(FATAL, "Couldn't get %s size.\n", Y); \ -} while(0) - -#define CBE_OFFSET_INIT(X, Y, Z) \ -do { \ - cbe_offset_table.X = MEMBER_OFFSET(Y, Z); \ - if (cbe_offset_table.X == -1) \ - error(FATAL, "Couldn't get %s.%s offset.\n", Y, Z); \ -} while(0) - -ulong spu[NR_SPUS]; - -/***************************************************************************** - * INIT FUNCTIONS - */ - -/* - * Read kernel virtual addresses of crash_spu_info data stored by kdump - */ - -void init_cbe_size_table(void) -{ - CBE_SIZE_INIT(crash_spu_info, "crash_spu_info"); - CBE_SIZE_INIT(spu, "spu"); - CBE_SIZE_INIT(spu_context, "spu_context"); - CBE_SIZE_INIT(spu_prio_array, "spu_prio_array"); - CBE_SIZE_INIT(list_head, "list_head"); -} - -void init_cbe_offset_table(void) -{ - CBE_OFFSET_INIT(crash_spu_info_spu, "crash_spu_info", "spu"); - CBE_OFFSET_INIT(crash_spu_info_saved_mfc_sr1_RW, "crash_spu_info", - "saved_mfc_sr1_RW"); - CBE_OFFSET_INIT(crash_spu_info_saved_mfc_dar, "crash_spu_info", - "saved_mfc_dar"); - CBE_OFFSET_INIT(crash_spu_info_saved_mfc_dsisr, "crash_spu_info", - "saved_mfc_dsisr"); - CBE_OFFSET_INIT(crash_spu_info_saved_spu_runcntl_RW, "crash_spu_info", - "saved_spu_runcntl_RW"); - CBE_OFFSET_INIT(crash_spu_info_saved_spu_status_R, "crash_spu_info", - "saved_spu_status_R"); - CBE_OFFSET_INIT(crash_spu_info_saved_spu_npc_RW, "crash_spu_info", - "saved_spu_npc_RW"); - - CBE_OFFSET_INIT(spu_node, "spu", "node"); - CBE_OFFSET_INIT(spu_number, "spu", "number"); - CBE_OFFSET_INIT(spu_ctx, "spu", "ctx"); - CBE_OFFSET_INIT(spu_pid, "spu", "pid"); - CBE_OFFSET_INIT(spu_name, "spu", "name"); - CBE_OFFSET_INIT(spu_slb_replace, "spu", "slb_replace"); - CBE_OFFSET_INIT(spu_mm, "spu", "mm"); - CBE_OFFSET_INIT(spu_timestamp, "spu", "timestamp"); - CBE_OFFSET_INIT(spu_class_0_pending, "spu", "class_0_pending"); - CBE_OFFSET_INIT(spu_problem, "spu", "problem"); - CBE_OFFSET_INIT(spu_priv2, "spu", "priv2"); - CBE_OFFSET_INIT(spu_flags, "spu", "flags"); - - CBE_OFFSET_INIT(spu_context_spu, "spu_context", "spu"); - CBE_OFFSET_INIT(spu_context_state, "spu_context", "state"); - CBE_OFFSET_INIT(spu_context_prio, "spu_context", "prio"); - CBE_OFFSET_INIT(spu_context_local_store, "spu_context", "local_store"); - CBE_OFFSET_INIT(spu_context_rq, "spu_context", "rq"); - - CBE_OFFSET_INIT(spu_prio_array_runq, "spu_prio_array", "runq"); -} - -void get_crash_spu_info(void) -{ - int i; - ulong addr; - long struct_size; - - addr = symbol_value("crash_spu_info"); - struct_size = CBE_SIZE(crash_spu_info); - - for (i = 0; i < NR_SPUS; i++) - spu[i] = addr + (i * struct_size); -} - -_init() -{ - int i, n_registered; - struct command_table_entry *cte; - - init_cbe_size_table(); - init_cbe_offset_table(); - - for (i = 0; i < NR_SPUS; i++) - spu[i] = 0; - - register_extension(command_table); - - get_crash_spu_info(); -} - - -_fini() { } - - - -/***************************************************************************** - * BASIC FUNCTIONS - */ - - -/* - * Returns a pointer to the requested SPU field - */ -ulong get_spu_addr(ulong spu_info) -{ - ulong spu_addr; - - readmem(spu_info + CBE_OFFSET(crash_spu_info, spu), KVADDR, &spu_addr, - sizeof(spu_addr), "get_spu_addr", FAULT_ON_ERROR); - - return spu_addr; -} - - -/***************************************************************************** - * SPUCTX COMMAND - */ - -#define DUMP_WIDTH 23 -#define DUMP_SPU_NAME \ -do { \ - fprintf(fp, " %-*s = %s\n", DUMP_WIDTH, "name", name_str); \ -} while(0) - -#define DUMP_SPU_FIELD(format, field, cast) \ -do { \ - offset = CBE_OFFSET(spu, field); \ - fprintf(fp, " %-*s = "format"\n", DUMP_WIDTH, #field, \ - cast(spu_data + offset)); \ -} while(0) - -#define DUMP_CTX_FIELD(format, field, cast) \ -do { \ - offset = CBE_OFFSET(spu_context, field); \ - fprintf(fp, " %-*s = "format"\n", DUMP_WIDTH, #field, \ - cast(ctx_data + offset)); \ -} while(0) - -#define DUMP_DBG_FIELD(format, field, cast) \ -do { \ - offset = CBE_OFFSET(crash_spu_info, field); \ - fprintf(fp, " %-*s = "format"\n", DUMP_WIDTH, #field, \ - cast(debug_data + offset)); \ -} while(0) - -/* - * Print the spu and spu_context structs fields. Some SPU memory-mapped IO - * registers are taken directly from crash_spu_info. - */ -void print_ctx_info(char *ctx_data, char *spu_data, int info) -{ - long offset, size; - char *name_str, *debug_data; - - DUMP_CTX_FIELD("%d", state, *(int *)); - DUMP_CTX_FIELD("%d", prio, *(int *)); - DUMP_CTX_FIELD("%p", local_store, *(ulong *)); - DUMP_CTX_FIELD("%p", rq, *(ulong *)); - - if (spu_data) { - offset = CBE_OFFSET(spu, name); - size = MAX_PROPERTY_NAME * sizeof(char); - name_str = (char *)GETBUF(size); - readmem(*(ulong *)(spu_data + offset), KVADDR, name_str, size, - "name_str", FAULT_ON_ERROR); - DUMP_SPU_NAME; - FREEBUF(name_str); - - DUMP_SPU_FIELD("%d", node, *(int *)); - DUMP_SPU_FIELD("%d", number, *(int *)); - DUMP_SPU_FIELD("%d", pid, *(int *)); - DUMP_SPU_FIELD("0x%x", slb_replace, *(unsigned int *)); - DUMP_SPU_FIELD("%p", mm, *(ulong *)); - DUMP_SPU_FIELD("%p", timestamp, *(long long *)); - DUMP_SPU_FIELD("%d", class_0_pending, *(int *)); - DUMP_SPU_FIELD("%p", problem, *(ulong *)); - DUMP_SPU_FIELD("%p", priv2, *(ulong *)); - DUMP_SPU_FIELD("0x%lx", flags, *(ulong *)); - - size = CBE_SIZE(crash_spu_info); - debug_data = (char *)GETBUF(size); - readmem(spu[info], KVADDR, debug_data, size, "debug_data", - FAULT_ON_ERROR); - - DUMP_DBG_FIELD("0x%lx", saved_mfc_sr1_RW, *(ulong *)); - DUMP_DBG_FIELD("0x%lx", saved_mfc_dar, *(ulong *)); - DUMP_DBG_FIELD("0x%lx", saved_mfc_dsisr, *(ulong *)); - DUMP_DBG_FIELD("0x%x", saved_spu_runcntl_RW, *(uint *)); - DUMP_DBG_FIELD("0x%x", saved_spu_status_R, *(uint *)); - DUMP_DBG_FIELD("0x%x", saved_spu_npc_RW, *(uint *)); - - FREEBUF(debug_data); - } -} - - -/* - * Pass ctx and respective spu data to print_ctx_info for the contexts in - * ctx_addr list (chosen contexts). - */ -void show_ctx_info(ulong ctx_addr) -{ - int number, info, i; - char *ctx_data, *spu_data; - long size, offset; - ulong spu_addr, addr; - - spu_data = NULL; - info = 0; - - size = CBE_SIZE(spu_context); - ctx_data = GETBUF(size); - if (!ctx_data) - error(FATAL, "Couldn't allocate memory for ctx.\n"); - readmem(ctx_addr, KVADDR, ctx_data, size, "show_ctx_info ctx", - FAULT_ON_ERROR); - - spu_addr = *(ulong *)(ctx_data + CBE_OFFSET(spu_context, spu)); - - if (spu_addr) { - size = CBE_SIZE(spu); - spu_data = GETBUF(size); - if (!spu_data) - error(FATAL, "Couldn't allocate memory for spu.\n"); - readmem(spu_addr, KVADDR, spu_data, size, "show_ctx_info spu", - FAULT_ON_ERROR); - - for (i = 0; i < NR_SPUS; i++) { - readmem(spu[i], KVADDR, &addr, sizeof(addr), "spu addr", - FAULT_ON_ERROR); - if (addr == spu_addr) - info = i; - } - } - - fprintf(fp,"\nDumping context fields for spu_context %lx:\n", ctx_addr); - print_ctx_info(ctx_data, spu_data, info); - - FREEBUF(ctx_data); - if (spu_addr) - FREEBUF(spu_data); -} - -/* - * Pass ctx and respective spu data to show_ctx_info for all the contexts - * running and on the runqueue. - */ -void show_ctx_info_all(void) -{ - int i, j, cnt; - long prio_size, prio_runq_off, ctx_rq_off, jump, offset, ctxs_size; - char *u_spu_prio; - ulong spu_prio_addr, k_spu_prio, kvaddr, uvaddr, addr, ctx; - ulong *ctxs; - ulong list_head[2]; - struct list_data list_data, *ld; - - /* Walking SPUs */ - for (i = 0; i < NR_SPUS; i++) { - addr = get_spu_addr(spu[i]) + CBE_OFFSET(spu, ctx); - readmem(addr, KVADDR, &ctx, sizeof(ctx), "show_ctx_info_all", - FAULT_ON_ERROR); - show_ctx_info(ctx); - } - - /* Walking SPU runqueue */ - if (symbol_exists("spu_prio")) { - spu_prio_addr = symbol_value("spu_prio"); - readmem(spu_prio_addr, KVADDR, &k_spu_prio, sizeof(k_spu_prio), - "runq_array", FAULT_ON_ERROR); - } - else - error(FATAL, "Could not get SPU run queue data.\n"); - - jump = CBE_SIZE(list_head); - prio_runq_off = CBE_OFFSET(spu_prio_array, runq); - ctx_rq_off = CBE_OFFSET(spu_context, rq); - prio_size = CBE_SIZE(spu_prio_array); - - u_spu_prio = (char *)GETBUF(prio_size); - readmem(k_spu_prio, KVADDR, u_spu_prio, prio_size, "get_runq_ctxs", - FAULT_ON_ERROR); - - for (i = 0; i < MAX_PRIO; i++) { - offset = prio_runq_off + i * jump; - kvaddr = k_spu_prio + offset; - uvaddr = (ulong)u_spu_prio + offset; - - BCOPY((char *)uvaddr, (char *)&list_head[0], sizeof(ulong)*2); - - if ((list_head[0] == kvaddr) && (list_head[1] == kvaddr)) - continue; - - ld = &list_data; - - BZERO(ld, sizeof(struct list_data)); - ld->start = list_head[0]; - ld->list_head_offset = ctx_rq_off; - ld->flags |= RETURN_ON_LIST_ERROR; - ld->end = kvaddr; - - hq_open(); - cnt = do_list(ld); - if (cnt == -1) { - hq_close(); - FREEBUF(u_spu_prio); - error(FATAL, "Couldn't walk the list.\n"); - } - - ctxs_size = cnt * sizeof(ulong); - ctxs = (ulong *)GETBUF(ctxs_size); - - BZERO(ctxs, ctxs_size); - cnt = retrieve_list(ctxs, cnt); - hq_close(); - - for (j = 0; j < cnt; j++) - show_ctx_info(ctxs[j]); - - FREEBUF(ctxs); - } - - FREEBUF(u_spu_prio); -} - -/* - * Tries to discover the meaning of string and to find the referred context - */ -int str_to_spuctx(char *string, ulong *value, ulong *spu_ctx) -{ - char *s, *u_spu_prio; - ulong dvalue, hvalue, addr, ctx; - ulong k_spu_prio, spu_prio_addr, kvaddr, uvaddr; - int type, pid, i, j, cnt; - long prio_size, prio_runq_off, ctx_rq_off, jump, offset, ctxs_size; - ulong *ctxs; - ulong list_head[2]; - struct list_data list_data, *ld; - - if (string == NULL) { - error(INFO, "%s: received NULL string.\n", __FUNCTION__); - return STR_SPU_INVALID; - } - - s = string; - dvalue = hvalue = BADADDR; - - if (decimal(s, 0)) - dvalue = dtol(s, RETURN_ON_ERROR, NULL); - - if (hexadecimal(s, 0)) { - if (STRNEQ(s, "0x") || STRNEQ(s, "0X")) - s += 2; - if (strlen(s) <= MAX_HEXADDR_STRLEN) - hvalue = htol(s, RETURN_ON_ERROR, NULL); - } - - type = STR_SPU_INVALID; - - if (dvalue != BADADDR) { - /* Testing for SPU ID */ - if ((dvalue >= 0) && (dvalue < NR_SPUS)) { - addr = get_spu_addr(spu[dvalue]) + CBE_OFFSET(spu, ctx); - readmem(addr, KVADDR, &ctx, sizeof(ctx), - "str_to_spuctx ID", FAULT_ON_ERROR); - - type = STR_SPU_ID; - *value = dvalue; - *spu_ctx = ctx; - return type; - } - else { - /* Testing for PID */ - for (i = 0; i < NR_SPUS; i++) { - addr = get_spu_addr(spu[i]) + - CBE_OFFSET(spu, pid); - readmem(addr, KVADDR, &pid, sizeof(pid), - "str_to_spuctx PID", FAULT_ON_ERROR); - - if (dvalue == pid) { - addr = get_spu_addr(spu[i]) + - CBE_OFFSET(spu, ctx); - readmem(addr, KVADDR, &ctx, sizeof(ctx), - "str_to_spuctx PID ctx", - FAULT_ON_ERROR); - - type = STR_SPU_PID; - *value = dvalue; - *spu_ctx = ctx; - return type; - } - } - } - } - - if (hvalue != BADADDR) { - /* Testing for spuctx address on SPUs */ - for (i = 0; i < NR_SPUS; i++) { - addr = get_spu_addr(spu[i]) + CBE_OFFSET(spu, ctx); - readmem(addr, KVADDR, &ctx, sizeof(ctx), - "str_to_spuctx CTX", FAULT_ON_ERROR); - - if (hvalue == ctx) { - type = STR_SPU_CTX_ADDR; - *value = hvalue; - *spu_ctx = ctx; - return type; - } - } - - /* Testing for spuctx address on SPU runqueue */ - if (symbol_exists("spu_prio")) { - spu_prio_addr = symbol_value("spu_prio"); - readmem(spu_prio_addr, KVADDR, &k_spu_prio, - sizeof(k_spu_prio), "runq_array", FAULT_ON_ERROR); - } - else - error(FATAL, "Could not get SPU run queue data.\n"); - - jump = CBE_SIZE(list_head); - prio_runq_off = CBE_OFFSET(spu_prio_array, runq); - ctx_rq_off = CBE_OFFSET(spu_context, rq); - prio_size = CBE_SIZE(spu_prio_array); - - u_spu_prio = (char *)GETBUF(prio_size); - readmem(k_spu_prio, KVADDR, u_spu_prio, prio_size, - "get_runq_ctxs", FAULT_ON_ERROR); - - for (i = 0; i < MAX_PRIO; i++) { - offset = prio_runq_off + i * jump; - kvaddr = k_spu_prio + offset; - uvaddr = (ulong)u_spu_prio + offset; - - BCOPY((char *)uvaddr, (char *)&list_head[0], sizeof(ulong)*2); - - if ((list_head[0] == kvaddr) && (list_head[1] == kvaddr)) - continue; - - ld = &list_data; - - BZERO(ld, sizeof(struct list_data)); - ld->start = list_head[0]; - ld->list_head_offset = ctx_rq_off; - ld->flags |= RETURN_ON_LIST_ERROR; - ld->end = kvaddr; - - hq_open(); - cnt = do_list(ld); - if (cnt == -1) { - hq_close(); - FREEBUF(u_spu_prio); - error(FATAL, "Couldn't walk the list.\n"); - } - - ctxs_size = cnt * sizeof(ulong); - ctxs = (ulong *)GETBUF(ctxs_size); - - BZERO(ctxs, ctxs_size); - cnt = retrieve_list(ctxs, cnt); - hq_close(); - - for (j = 0; j < cnt; j++) - if (hvalue == ctxs[j]) { - type = STR_SPU_CTX_ADDR; - *value = hvalue; - *spu_ctx = ctxs[j]; - FREEBUF(u_spu_prio); - FREEBUF(ctxs); - return type; - } - - FREEBUF(ctxs); - } - - FREEBUF(u_spu_prio); - } - - return type; -} - -/* - * spuctx command stands for "spu context" and shows the context fields - * for the spu or respective struct address passed as an argument - */ -void cmd_spuctx() -{ - int i, c, cnt; - ulong value, ctx; - ulong *ctxlist; - - while ((c = getopt(argcnt, args, "")) != EOF) { - switch(c) - { - default: - argerrs++; - break; - } - } - - if (argerrs) - cmd_usage(pc->curcmd, SYNOPSIS); - - if (!args[optind]) { - show_ctx_info_all(); - return; - } - - cnt = 0; - ctxlist = (ulong *)GETBUF((MAXARGS+NR_CPUS)*sizeof(ctx)); - - while (args[optind]) { - if (IS_A_NUMBER(args[optind])) { - switch (str_to_spuctx(args[optind], &value, &ctx)) - { - case STR_SPU_ID: - case STR_SPU_PID: - case STR_SPU_CTX_ADDR: - ctxlist[cnt++] = ctx; - break; - - case STR_SPU_INVALID: - error(INFO, "Invalid SPU reference: %s\n", - args[optind]); - break; - } - } - else - error(INFO, "Invalid SPU reference: %s\n", - args[optind]); - optind++; - } - - if (cnt == 0) - error(INFO, "No valid ID, PID or context address.\n"); - else - for (i = 0; i < cnt; i++) - show_ctx_info(ctxlist[i]); - - FREEBUF(ctxlist); -} - - -/***************************************************************************** - * SPUS COMMAND - */ - -void print_spu_header(ulong spu_info) -{ - int id, pid, size, state; - uint status; - ulong ctx_addr, spu_addr; - char *spu_data; - const char *state_str; - - if (spu_info) { - readmem(spu_info + CBE_OFFSET(crash_spu_info, - saved_spu_status_R), KVADDR, &status, sizeof(status), - "print_spu_header: get status", FAULT_ON_ERROR); - - size = CBE_SIZE(spu); - spu_data = GETBUF(size); - spu_addr = get_spu_addr(spu_info); - readmem(spu_addr, KVADDR, spu_data, size, "SPU struct", - FAULT_ON_ERROR); - - id = *(int *)(spu_data + CBE_OFFSET(spu, number)); - ctx_addr = *(ulong *)(spu_data + CBE_OFFSET(spu, ctx)); - pid = *(int *)(spu_data + CBE_OFFSET(spu, pid)); - - readmem(ctx_addr + CBE_OFFSET(spu_context, state), KVADDR, - &state, sizeof(state), "print_spu_header get ctxstate", - FAULT_ON_ERROR); - - switch (state) { - case 0: /* SPU_STATE_RUNNABLE */ - state_str = "RUNNABLE"; - break; - - case 1: /* SPU_STATE_SAVED */ - state_str = " SAVED "; - break; - - default: - state_str = "UNKNOWN "; - } - - fprintf(fp, "%2d %16lx %s %16lx %s %5d\n", id, - spu_addr, - status % 2 ? "RUNNING" : (ctx_addr ? "STOPPED" : " IDLE "), - ctx_addr, state_str, pid); - - FREEBUF(spu_data); - } -} - -void print_node_header(int node) -{ - fprintf(fp, "\n"); - fprintf(fp, "NODE %i:\n", node); - fprintf(fp, "ID SPUADDR SPUSTATUS CTXADDR \ -CTXSTATE PID \n"); -} - -void show_spus() -{ - int i, j, nr_cpus, show_header, node; - ulong spu_addr, addr; - long offset; - - nr_cpus = kt->kernel_NR_CPUS ? kt->kernel_NR_CPUS : NR_CPUS; - - for (i = 0; i < nr_cpus; i++) { - show_header = TRUE; - - for (j = 0; j < NR_SPUS; j++) { - addr = spu[j] + CBE_OFFSET(crash_spu_info, spu); - readmem(addr, KVADDR, &spu_addr, sizeof(spu_addr), - "show_spus spu_addr", FAULT_ON_ERROR); - - offset = CBE_OFFSET(spu, node); - if (offset == -1) - error(FATAL, "Couldn't get spu.node offset.\n"); - - spu_addr += offset; - readmem(spu_addr, KVADDR, &node, sizeof(node), - "show_spus node", FAULT_ON_ERROR); - - if (node == i) { - if (show_header) { - print_node_header(node); - show_header = FALSE; - } - - print_spu_header(spu[j]); - } - } - } -} - -/* - * spus stands for "spu state" and shows what contexts are running in what - * SPU. - */ -void cmd_spus() -{ - int c; - - while ((c = getopt(argcnt, args, "")) != EOF) { - switch(c) - { - default: - argerrs++; - break; - } - } - - if (argerrs || args[optind]) - cmd_usage(pc->curcmd, SYNOPSIS); - else - show_spus(); -} - - -/***************************************************************************** - * SPURQ COMMAND - */ - -/* - * Prints the addresses of SPU contexts on the SPU runqueue. - */ -void dump_spu_runq(ulong k_spu_prio) -{ - int i, cnt; - long prio_size, prio_runq_off, ctx_rq_off, jump, offset; - char *u_spu_prio; - ulong kvaddr, uvaddr; - ulong list_head[2]; - struct list_data list_data, *ld; - - prio_runq_off = CBE_OFFSET(spu_prio_array, runq); - jump = CBE_SIZE(list_head); - ctx_rq_off = CBE_OFFSET(spu_context, rq); - prio_size = CBE_SIZE(spu_prio_array); - - u_spu_prio = (char *)GETBUF(prio_size); - readmem(k_spu_prio, KVADDR, u_spu_prio, prio_size, "get_runq_ctxs", - FAULT_ON_ERROR); - - for (i = 0; i < MAX_PRIO; i++) { - offset = prio_runq_off + (i * jump); - kvaddr = k_spu_prio + offset; - uvaddr = (ulong)u_spu_prio + offset; - - BCOPY((char *)uvaddr, (char *)&list_head[0], sizeof(ulong)*2); - - if ((list_head[0] == kvaddr) && (list_head[1] == kvaddr)) - continue; - - fprintf(fp, "PRIO[%i]:\n", i); - - ld = &list_data; - - BZERO(ld, sizeof(struct list_data)); - ld->start = list_head[0]; - ld->list_head_offset = ctx_rq_off; - ld->flags |= VERBOSE; - ld->end = kvaddr; - - hq_open(); - cnt = do_list(ld); - hq_close(); - - if (cnt == -1) { - FREEBUF(u_spu_prio); - error(FATAL, "Couldn't walk runqueue[%i].\n", i); - } - } - - FREEBUF(u_spu_prio); -} - -/* - * spurq stands for "spu run queue" and shows info about the contexts - * that are on the SPU run queue - */ -void cmd_spurq() -{ - int c; - ulong spu_prio_addr, spu_prio; - long size; - - while ((c = getopt(argcnt, args, "")) != EOF) { - switch(c) - { - default: - argerrs++; - break; - } - } - - if (argerrs || args[optind]) - cmd_usage(pc->curcmd, SYNOPSIS); - else { - if (symbol_exists("spu_prio")) { - spu_prio_addr = symbol_value("spu_prio"); - readmem(spu_prio_addr, KVADDR, &spu_prio, - sizeof(spu_prio), "runq_array", FAULT_ON_ERROR); - dump_spu_runq(spu_prio); - } else - error(FATAL, "Could not get SPU run queue data.\n"); - } -} - -/********************************************************************************** - * HELP TEXTS - */ - -char *help_spuctx[] = { - SPUCTX_CMD_NAME, - "shows complete info about a SPU context", - "[ID | PID | CTXADDR] ...", - - " This command shows the fields of spu and spu_context structs for a ", - "SPU context, including debug info specially saved by kdump after a ", - "crash.", - " By default, it shows info about all the contexts created by the ", - "system, including ones in the runqueue. To specify the contexts of ", - "interest, the PID of the controller task, ID of the SPU which the ", - "context is bound to or the address of spu_context struct can be used ", - "as parameters.", - "\nEXAMPLES", - "\n Show info about contexts bound to SPUs 0 and 7, and the one ", - "controlled by thread whose PID is 1524:", - "\n crash> spuctx 0 7 1524", - "\n Dumping context fields for spu_context c00000003dcbdd80:", - " state = 0", - " prio = 120", - " local_store = 0xc000000039055840", - " rq = 0xc00000003dcbe720", - " node = 0", - " number = 0", - " pid = 1524", - " name = spe", - " slb_replace = 0", - " mm = 0xc0000000005dd700", - " timestamp = 0x10000566f", - " class_0_pending = 0", - " problem = 0xd000080080210000", - " priv2 = 0xd000080080230000", - " flags = 0", - " saved_mfc_sr1_RW = 59", - " saved_mfc_dar = 14987979559889612800", - " saved_mfc_dsisr = 0", - " saved_spu_runcntl_RW = 1", - " saved_spu_status_R = 1", - " saved_spu_npc_RW = 0", - "\n Dumping context fields for spu_context c00000003dec4e80:", - " state = 0", - " prio = 120", - " local_store = 0xc00000003b1cea40", - " rq = 0xc00000003dec5820", - " node = 0", - " number = 7", - " pid = 1538", - " name = spe", - " slb_replace = 0", - " mm = 0xc0000000005d2b80", - " timestamp = 0x10000566f", - " class_0_pending = 0", - " problem = 0xd000080080600000", - " priv2 = 0xd000080080620000", - " flags = 0", - " saved_mfc_sr1_RW = 59", - " saved_mfc_dar = 14987979559896297472", - " saved_mfc_dsisr = 0", - " saved_spu_runcntl_RW = 1", - " saved_spu_status_R = 1", - " saved_spu_npc_RW = 0", - "\n Dumping context fields for spu_context c00000003dcbdd80:", - " state = 0", - " prio = 120", - " local_store = 0xc000000039055840", - " rq = 0xc00000003dcbe720", - " node = 0", - " number = 0", - " pid = 1524", - " name = spe", - " slb_replace = 0", - " mm = 0xc0000000005dd700", - " timestamp = 0x10000566f", - " class_0_pending = 0", - " problem = 0xd000080080210000", - " priv2 = 0xd000080080230000", - " flags = 0", - " saved_mfc_sr1_RW = 59", - " saved_mfc_dar = 14987979559889612800", - " saved_mfc_dsisr = 0", - " saved_spu_runcntl_RW = 1", - " saved_spu_status_R = 1", - " saved_spu_npc_RW = 0", - - "\n Show info about the context whose struct spu_context address is ", - "0xc00000003dcbed80:\n", - "crash> spuctx 0x00000003dcbed80", - " ...", - NULL -}; - - -char *help_spus[] = { - SPUS_CMD_NAME, - "shows how contexts are scheduled in the SPUs", - " ", - " This command shows how the contexts are scheduled in the SPUs of ", - "each node. It provides info about the spu address, SPU status, the ", - "spu_context address, context state and spu_context addresses and the ", - "PID of controller thread for each SPU.", - "\nEXAMPLE", - " Show SPU contexts:", - "\n crash> spus", - " NODE 0:", - " ID SPUADDR SPUSTATUS CTXADDR CTXSTATE PID ", - " 0 c000000001fac880 RUNNING c00000003dcbdd80 RUNNABLE 1524", - " 1 c000000001faca80 RUNNING c00000003bf34e00 RUNNABLE 1528", - " 2 c000000001facc80 RUNNING c00000003bf30e00 RUNNABLE 1525", - " 3 c000000001face80 RUNNING c000000039421d00 RUNNABLE 1533", - " 4 c00000003ee29080 RUNNING c00000003dec3e80 RUNNABLE 1534", - " 5 c00000003ee28e80 RUNNING c00000003bf32e00 RUNNABLE 1526", - " 6 c00000003ee28c80 STOPPED c000000039e5e700 SAVED 1522", - " 7 c00000003ee2e080 RUNNING c00000003dec4e80 RUNNABLE 1538", - "\n NODE 1:", - " ID SPUADDR SPUSTATUS CTXADDR CTXSTATE PID ", - " 8 c00000003ee2de80 RUNNING c00000003dcbed80 RUNNABLE 1529", - " 9 c00000003ee2dc80 RUNNING c00000003bf39e00 RUNNABLE 1535", - " 10 c00000003ee2da80 RUNNING c00000003bf3be00 RUNNABLE 1521", - " 11 c000000001fad080 RUNNING c000000039420d00 RUNNABLE 1532", - " 12 c000000001fad280 RUNNING c00000003bf3ee00 RUNNABLE 1536", - " 13 c000000001fad480 RUNNING c00000003dec2e80 RUNNABLE 1539", - " 14 c000000001fad680 RUNNING c00000003bf3ce00 RUNNABLE 1537", - " 15 c000000001fad880 RUNNING c00000003dec6e80 RUNNABLE 1540", - NULL -}; - - -char *help_spurq[] = { - SPURQ_CMD_NAME, - "shows contexts on the SPU runqueue", - " ", - " This command shows info about all contexts waiting for execution ", - "in the SPU runqueue. No parameter is needed.", - "\nEXAMPLE", - " Show SPU runqueue:", - "\n crash> spurq", - " PRIO[120]:", - " c000000000fd7380", - " c00000003bf31e00", - " PRIO[125]:", - " c000000039422d00", - " c00000000181eb80", - NULL -}; - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0