May 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-qt
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package yast2-qt checked in at Thu May 1 14:51:39 CEST 2008. -------- --- yast2-qt/yast2-qt.changes 2008-04-29 17:07:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2008-04-30 17:44:26.121458000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 30 17:43:03 CEST 2008 - sh(a)suse.de + +- Fixed bnc #379904: More than one radio button checked +- V 2.16.45 + +------------------------------------------------------------------- Old: ---- yast2-qt-2.16.44.tar.bz2 New: ---- yast2-qt-2.16.45.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.bR4924/_old 2008-05-01 14:50:50.000000000 +0200 +++ /var/tmp/diff_new_pack.bR4924/_new 2008-05-01 14:50:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt (Version 2.16.44) +# spec file for package yast2-qt (Version 2.16.45) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ Name: yast2-qt -Version: 2.16.44 +Version: 2.16.45 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.16.44.tar.bz2 +Source0: yast2-qt-2.16.45.tar.bz2 BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libdrm-devel @@ -112,6 +112,9 @@ %_includedir/* %changelog +* Wed Apr 30 2008 sh(a)suse.de +- Fixed bnc #379904: More than one radio button checked +- V 2.16.45 * Tue Apr 29 2008 sh(a)suse.de - Fixed bnc #383672 - Busy cursor in file dialogs - V 2.16.44 ++++++ yast2-qt-2.16.44.tar.bz2 -> yast2-qt-2.16.45.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.44/package/yast2-qt.changes new/yast2-qt-2.16.45/package/yast2-qt.changes --- old/yast2-qt-2.16.44/package/yast2-qt.changes 2008-04-29 17:06:29.000000000 +0200 +++ new/yast2-qt-2.16.45/package/yast2-qt.changes 2008-04-30 17:44:10.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 30 17:43:03 CEST 2008 - sh(a)suse.de + +- Fixed bnc #379904: More than one radio button checked +- V 2.16.45 + +------------------------------------------------------------------- Tue Apr 29 17:05:40 CEST 2008 - sh(a)suse.de - Fixed bnc #383672 - Busy cursor in file dialogs diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.44/src/YQRadioButton.cc new/yast2-qt-2.16.45/src/YQRadioButton.cc --- old/yast2-qt-2.16.44/src/YQRadioButton.cc 2008-04-29 17:06:29.000000000 +0200 +++ new/yast2-qt-2.16.45/src/YQRadioButton.cc 2008-04-30 17:44:10.000000000 +0200 @@ -50,6 +50,12 @@ { setWidgetRep( this ); + // QRadioButton uses its own logic by default to make sure that only one + // button of a radio box is checked at any time, but this interferes with + // YRadioButtonGroup. Let YRadioButtonGroup and YQRadioButton::changed() + // handle this. + setAutoExclusive( false ); + setChecked( checked ); installEventFilter(this); @@ -98,6 +104,7 @@ { YQSignalBlocker sigBlocker( this ); + // yuiDebug() << "Setting " << this << (newValue ? " on" : " off") << endl; setChecked( newValue ); if ( newValue ) @@ -132,12 +139,19 @@ } -// slots - void YQRadioButton::changed( bool newState ) { - if ( notify() && newState ) - YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); + if ( newState ) + { + yuiDebug() << "User set " << this << ( newState ? " on" : " off" ) << endl; + YRadioButtonGroup * group = buttonGroup(); + + if ( group ) + group->uncheckOtherButtons( this ); + + if ( notify() ) + YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.44/src/YQRadioButton.cc.bak new/yast2-qt-2.16.45/src/YQRadioButton.cc.bak --- old/yast2-qt-2.16.44/src/YQRadioButton.cc.bak 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-qt-2.16.45/src/YQRadioButton.cc.bak 2008-04-30 17:44:10.000000000 +0200 @@ -0,0 +1,161 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YQRadioButton.cc + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#include <qradiobutton.h> +#include <QMouseEvent> +#include <QBoxLayout> + +#define YUILogComponent "qt-ui" +#include "YUILog.h" + +#include "utf8.h" +#include "YQUI.h" +#include "YQApplication.h" +#include "YEvent.h" +#include "YQRadioButton.h" +#include "YRadioButtonGroup.h" +#include "YQSignalBlocker.h" + +using std::string; + +#define SPACING 8 + +// +----+----------------------------------+----+ +// | |(o) RadioButtonlabel | | +// +----+----------------------------------+----+ +// <----> SPACING <----> + + + +YQRadioButton::YQRadioButton( YWidget * parent, + const string & label, + bool checked ) + : QRadioButton( fromUTF8( label ), ( QWidget *) (parent->widgetRep() ) ) + , YRadioButton( parent, label ) +{ + setWidgetRep( this ); + + setChecked( checked ); + + installEventFilter(this); + + connect ( this, SIGNAL( toggled ( bool ) ), + this, SLOT ( changed ( bool ) ) ); +} + + +void +YQRadioButton::setUseBoldFont( bool useBold ) +{ + setFont( useBold ? + YQUI::yqApp()->boldFont() : + YQUI::yqApp()->currentFont() ); + + YRadioButton::setUseBoldFont( useBold ); +} + + +int YQRadioButton::preferredWidth() +{ + return sizeHint().width(); +} + + +int YQRadioButton::preferredHeight() +{ + return sizeHint().height(); +} + + +void YQRadioButton::setSize( int newWidth, int newHeight ) +{ + resize( newWidth, newHeight ); +} + + +bool YQRadioButton::value() +{ + return isChecked(); +} + + +void YQRadioButton::setValue( bool newValue ) +{ + YQSignalBlocker sigBlocker( this ); + + setChecked( newValue ); + + if ( newValue ) + { + YRadioButtonGroup * group = buttonGroup(); + + if ( group ) + group->uncheckOtherButtons( this ); + } +} + + +void YQRadioButton::setLabel( const string & label ) +{ + setText( fromUTF8( label ) ); + YRadioButton::setLabel( label ); +} + + +void YQRadioButton::setEnabled( bool enabled ) +{ + QRadioButton::setEnabled( enabled ); + YWidget::setEnabled( enabled ); +} + + +bool YQRadioButton::setKeyboardFocus() +{ + setFocus(); + + return true; +} + + +// slots + +void YQRadioButton::changed( bool newState ) +{ + if ( notify() && newState ) + YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::ValueChanged ) ); +} + + +bool YQRadioButton::eventFilter( QObject * obj, QEvent * event ) +{ + if ( event && event->type() == QEvent::MouseButtonRelease ) + { + QMouseEvent * mouseEvent = dynamic_cast<QMouseEvent *> (event); + + if ( mouseEvent && mouseEvent->button() == Qt::RightButton ) + { + yuiMilestone() << "Right click on button detected" << endl; + YQUI::yqApp()->maybeLeftHandedUser(); + } + } + + return QObject::eventFilter( obj, event ); +} + + +#include "YQRadioButton.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.44/src/YQRadioButtonGroup.cc new/yast2-qt-2.16.45/src/YQRadioButtonGroup.cc --- old/yast2-qt-2.16.44/src/YQRadioButtonGroup.cc 2008-04-29 17:06:29.000000000 +0200 +++ new/yast2-qt-2.16.45/src/YQRadioButtonGroup.cc 2008-04-30 17:44:10.000000000 +0200 @@ -23,12 +23,12 @@ #include "YQRadioButtonGroup.h" #include "YQRadioButton.h" +#include "qstring.h" YQRadioButtonGroup::YQRadioButtonGroup( YWidget * parent ) : QWidget( (QWidget *) parent->widgetRep() ) , YRadioButtonGroup( parent ) - , _recursive( false ) { setWidgetRep( this ); } @@ -47,13 +47,8 @@ if ( button->value() ) // if this new button is active { - uncheckOtherButtons( button ); // make it the only active + uncheckOtherButtons( button ); // make it the only active one } - - QRadioButton * radio_button = dynamic_cast<YQRadioButton *>( button ); - - connect ( radio_button, SIGNAL ( toggled ( bool ) ), - this, SLOT ( radioButtonClicked( bool ) ) ); } @@ -73,47 +68,4 @@ } -void -YQRadioButtonGroup::radioButtonClicked( bool newState ) -{ - // Prevent infinite recursion: YQRadioButton::setValue() might cause Qt - // signals that would cause recursion to this place. - - if ( _recursive ) - return; - - _recursive = true; - - QRadioButton * senderButton = (QRadioButton *) sender(); - - // Implement radio box behaviour: Uncheck all other radio buttons - - for ( YRadioButtonListConstIterator it = radioButtonsBegin(); - it != radioButtonsEnd(); - ++it ) - { - YQRadioButton * radioButton = dynamic_cast<YQRadioButton *> (*it); - - if ( radioButton ) - { - if ( radioButton == senderButton ) - { - // If this button has been clicked, it is to be the RadioBox's - // active button - regardless of newState. This is to avoid - // RadioBoxes where no single button is active; otherwise the - // second click would deactivate the only active button. - - radioButton->setValue( true ); - } - else - { - radioButton->setValue( false ); - } - } - } - - _recursive = false; -} - - #include "YQRadioButtonGroup.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.44/src/YQRadioButtonGroup.cc.bak new/yast2-qt-2.16.45/src/YQRadioButtonGroup.cc.bak --- old/yast2-qt-2.16.44/src/YQRadioButtonGroup.cc.bak 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-qt-2.16.45/src/YQRadioButtonGroup.cc.bak 2008-04-30 17:44:10.000000000 +0200 @@ -0,0 +1,119 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YQRadioButtonGroup.cc + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + + +#include <QRadioButton> +#define YUILogComponent "qt-ui" +#include "YUILog.h" + +#include "YQRadioButtonGroup.h" +#include "YQRadioButton.h" + + +YQRadioButtonGroup::YQRadioButtonGroup( YWidget * parent ) + : QWidget( (QWidget *) parent->widgetRep() ) + , YRadioButtonGroup( parent ) + , _recursive( false ) +{ + setWidgetRep( this ); +} + + +YQRadioButtonGroup::~YQRadioButtonGroup() +{ + // NOP +} + + +void +YQRadioButtonGroup::addRadioButton( YRadioButton * button ) +{ + YRadioButtonGroup::addRadioButton( button ); + + if ( button->value() ) // if this new button is active + { + uncheckOtherButtons( button ); // make it the only active + } + + QRadioButton * radio_button = dynamic_cast<YQRadioButton *>( button ); + + connect ( radio_button, SIGNAL ( toggled ( bool ) ), + this, SLOT ( radioButtonClicked( bool ) ) ); +} + + +void +YQRadioButtonGroup::setEnabled( bool enabled ) +{ + QWidget::setEnabled( enabled ); + YWidget::setEnabled( enabled ); +} + + +void +YQRadioButtonGroup::setSize( int newWidth, int newHeight ) +{ + resize( newWidth, newHeight ); + YRadioButtonGroup::setSize( newWidth, newHeight ); +} + + +void +YQRadioButtonGroup::radioButtonClicked( bool newState ) +{ + // Prevent infinite recursion: YQRadioButton::setValue() might cause Qt + // signals that would cause recursion to this place. + + if ( _recursive ) + return; + + _recursive = true; + + QRadioButton * senderButton = (QRadioButton *) sender(); + + // Implement radio box behaviour: Uncheck all other radio buttons + + for ( YRadioButtonListConstIterator it = radioButtonsBegin(); + it != radioButtonsEnd(); + ++it ) + { + YQRadioButton * radioButton = dynamic_cast<YQRadioButton *> (*it); + + if ( radioButton ) + { + if ( radioButton == senderButton ) + { + // If this button has been clicked, it is to be the RadioBox's + // active button - regardless of newState. This is to avoid + // RadioBoxes where no single button is active; otherwise the + // second click would deactivate the only active button. + + radioButton->setValue( true ); + } + else + { + radioButton->setValue( false ); + } + } + } + + _recursive = false; +} + + +#include "YQRadioButtonGroup.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.44/src/YQRadioButtonGroup.h new/yast2-qt-2.16.45/src/YQRadioButtonGroup.h --- old/yast2-qt-2.16.44/src/YQRadioButtonGroup.h 2008-04-29 17:06:29.000000000 +0200 +++ new/yast2-qt-2.16.45/src/YQRadioButtonGroup.h 2008-04-30 17:44:10.000000000 +0200 @@ -58,24 +58,6 @@ * Reimplemented from YWidget. **/ virtual void setSize( int newWidth, int newHeight ); - - -private slots: - - /** - * Triggered when one of the radio buttons changed state. - * This implements the radio box behaviour, i.e. unselects all but the last - * selected radio button. - **/ - void radioButtonClicked( bool newState ); - - -private: - - /** - * Used to prevent infinite recursion due to signal race conditions. - **/ - bool _recursive; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.44/src/YQRadioButtonGroup.h.bak new/yast2-qt-2.16.45/src/YQRadioButtonGroup.h.bak --- old/yast2-qt-2.16.44/src/YQRadioButtonGroup.h.bak 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-qt-2.16.45/src/YQRadioButtonGroup.h.bak 2008-04-30 17:44:10.000000000 +0200 @@ -0,0 +1,82 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YQRadioButtonGroup.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YQRadioButtonGroup_h +#define YQRadioButtonGroup_h + +#include <QWidget> +#include "YRadioButtonGroup.h" + + +class YQRadioButtonGroup : public QWidget, public YRadioButtonGroup +{ + Q_OBJECT + +public: + /** + * Constructor. + **/ + YQRadioButtonGroup( YWidget * parent ); + + /** + * Destructor. + **/ + virtual ~YQRadioButtonGroup(); + + /** + * Add a RadioButton. + * + * Reimplemented from YRadioButtonGroup. + **/ + virtual void addRadioButton( YRadioButton * button ); + + /** + * Set enabled/disabled state. + * + * Reimplemented from YWidget. + **/ + virtual void setEnabled( bool enabled ); + + /** + * Set the new size of the widget. + * + * Reimplemented from YWidget. + **/ + virtual void setSize( int newWidth, int newHeight ); + + +private slots: + + /** + * Triggered when one of the radio buttons changed state. + * This implements the radio box behaviour, i.e. unselects all but the last + * selected radio button. + **/ + void radioButtonClicked( bool newState ); + + +private: + + /** + * Used to prevent infinite recursion due to signal race conditions. + **/ + bool _recursive; +}; + + +#endif // YQRadioButtonGroup_h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.44/VERSION.cmake new/yast2-qt-2.16.45/VERSION.cmake --- old/yast2-qt-2.16.44/VERSION.cmake 2008-04-29 17:06:29.000000000 +0200 +++ new/yast2-qt-2.16.45/VERSION.cmake 2008-04-30 17:44:10.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "44") +SET(VERSION_PATCH "45") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-packager
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package yast2-packager checked in at Thu May 1 14:50:33 CEST 2008. -------- --- yast2-packager/yast2-packager.changes 2008-04-29 09:23:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2008-04-30 12:05:12.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 29 17:00:06 CEST 2008 - locilka(a)suse.cz + +- Calling inst_extrasources in pkg_finish to get default + repositories added in case of upgrade (bnc #384827, bnc #381360). +- 2.16.42 + +------------------------------------------------------------------- +Tue Apr 29 10:25:08 CEST 2008 - lslezak(a)suse.cz + +- repository manager - remember the URL when switching from "parts" + view to "full" view (bnc#383984) + +------------------------------------------------------------------- Old: ---- yast2-packager-2.16.41.tar.bz2 New: ---- yast2-packager-2.16.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.u31991/_old 2008-05-01 14:49:00.000000000 +0200 +++ /var/tmp/diff_new_pack.u31991/_new 2008-05-01 14:49:00.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.16.41) +# spec file for package yast2-packager (Version 2.16.42) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-packager -Version: 2.16.41 +Version: 2.16.42 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.16.41.tar.bz2 +Source0: yast2-packager-2.16.42.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer update-desktop-files yast2-country-data yast2-devtools yast2-slp yast2-testsuite yast2-xml # empty package callbacks @@ -72,7 +72,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.16.41 +%setup -n yast2-packager-2.16.42 %build %{prefix}/bin/y2tool y2autoconf @@ -108,6 +108,13 @@ %{prefix}/lib/YaST2/servers_non_y2/ag_* %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Tue Apr 29 2008 locilka(a)suse.cz +- Calling inst_extrasources in pkg_finish to get default + repositories added in case of upgrade (bnc #384827, bnc #381360). +- 2.16.42 +* Tue Apr 29 2008 lslezak(a)suse.cz +- repository manager - remember the URL when switching from "parts" + view to "full" view (bnc#383984) * Tue Apr 29 2008 lslezak(a)suse.cz - use sizes in kB in the total progressbar in slideshow (progress bar widget uses 32 bit integers only), fixes "tick" progress ++++++ yast2-packager-2.16.41.tar.bz2 -> yast2-packager-2.16.42.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/aclocal.m4 new/yast2-packager-2.16.42/aclocal.m4 --- old/yast2-packager-2.16.41/aclocal.m4 2008-04-29 09:22:22.000000000 +0200 +++ new/yast2-packager-2.16.42/aclocal.m4 2008-04-25 18:20:31.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,12 +11,15 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_if(m4_PACKAGE_VERSION, [2.61],, -[m4_fatal([this file was generated for autoconf 2.61. -You have another version of autoconf. If you want to use that, -you should regenerate the build system entirely.], [63])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.61],, +[m4_warning([this file was generated for autoconf 2.61. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,7 +34,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10], [], +m4_if([$1], [1.10.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -47,8 +50,10 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10])dnl -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -141,13 +146,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Free Software Foundation, Inc. +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -252,16 +257,17 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -498,7 +504,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/agents/Makefile.in new/yast2-packager-2.16.42/agents/Makefile.in --- old/yast2-packager-2.16.41/agents/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/agents/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/config.guess new/yast2-packager-2.16.42/config.guess --- old/yast2-packager-2.16.41/config.guess 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/config.guess 2008-04-25 18:20:34.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-07-02' +timestamp='2008-01-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -171,6 +171,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -339,7 +340,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -541,7 +542,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -790,7 +791,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -800,12 +801,18 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -839,10 +846,17 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + else + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu @@ -960,6 +974,9 @@ x86_64:Linux:*:*) echo x86_64-${VENDOR}-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1218,6 +1235,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/config.sub new/yast2-packager-2.16.42/config.sub --- old/yast2-packager-2.16.41/config.sub 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/config.sub 2008-04-25 18:20:34.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2006-09-20' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -369,10 +369,14 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -443,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -475,8 +487,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -668,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -683,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -809,6 +833,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -925,6 +957,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1014,6 +1049,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1219,7 +1258,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1414,6 +1453,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/configure new/yast2-packager-2.16.42/configure --- old/yast2-packager-2.16.41/configure 2008-04-29 09:22:24.000000000 +0200 +++ new/yast2-packager-2.16.42/configure 2008-04-25 18:20:33.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.41. +# Generated by GNU Autoconf 2.61 for yast2-packager 2.16.39. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.16.41' -PACKAGE_STRING='yast2-packager 2.16.41' +PACKAGE_VERSION='2.16.39' +PACKAGE_STRING='yast2-packager 2.16.39' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.16.41 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.16.39 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.16.41:";; + short | recursive ) echo "Configuration of yast2-packager 2.16.39:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.16.41 +yast2-packager configure 2.16.39 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.16.41, which was +It was created by yast2-packager $as_me 2.16.39, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.16.41' + VERSION='2.16.39' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.41" +VERSION="2.16.39" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.16.41, which was +This file was extended by yast2-packager $as_me 2.16.39, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-packager config.status 2.16.41 +yast2-packager config.status 2.16.39 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/configure.in new/yast2-packager-2.16.42/configure.in --- old/yast2-packager-2.16.41/configure.in 2008-04-29 09:22:19.000000000 +0200 +++ new/yast2-packager-2.16.42/configure.in 2008-04-25 18:20:28.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.16.41, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.16.39, http://bugs.opensuse.org/, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.41" +VERSION="2.16.39" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/doc/autodocs/Makefile.in new/yast2-packager-2.16.42/doc/autodocs/Makefile.in --- old/yast2-packager-2.16.41/doc/autodocs/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/doc/autodocs/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/doc/Makefile.in new/yast2-packager-2.16.42/doc/Makefile.in --- old/yast2-packager-2.16.41/doc/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/doc/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -314,8 +314,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -340,8 +340,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -351,13 +351,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/install-sh new/yast2-packager-2.16.42/install-sh --- old/yast2-packager-2.16.41/install-sh 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/install-sh 2008-04-25 18:20:34.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else @@ -58,34 +58,49 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd= -chgrpcmd= -stripcmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -95,65 +110,55 @@ In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; + + -C) copy_on_change=true;; - -d) dir_arg=true - shift - continue;; + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - shift - shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - continue;; + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; + shift;; + + -s) stripcmd=$stripprog;; + + -t) dst_arg=$2 + shift;; + + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +170,22 @@ *) break;; esac + shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dstarg"; then + if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" + set fnord "$@" "$dst_arg" shift # fnord fi shift # arg - dstarg=$arg + dst_arg=$arg done fi @@ -224,7 +230,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then @@ -242,22 +248,22 @@ exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -378,26 +384,19 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix=/ ;; - -*) prefix=./ ;; - *) prefix= ;; + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; esac - case $posix_glob in - '') - if (set -f) 2>/dev/null; then - posix_glob=true - else - posix_glob=false - fi ;; - esac + eval "$initialize_posix_glob" oIFS=$IFS IFS=/ - $posix_glob && set -f + $posix_glob set -f set fnord $dstdir shift - $posix_glob && set +f + $posix_glob set +f IFS=$oIFS prefixes= @@ -459,41 +458,54 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dst"; then - $doit $rmcmd -f "$dst" 2>/dev/null \ - || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ - && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ - || { - echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - } || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 trap '' 0 fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/Makefile.in new/yast2-packager-2.16.42/Makefile.in --- old/yast2-packager-2.16.41/Makefile.in 2008-04-29 09:22:26.000000000 +0200 +++ new/yast2-packager-2.16.42/Makefile.in 2008-04-25 18:20:35.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -389,8 +389,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -415,8 +415,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -426,13 +426,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -505,6 +504,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -531,6 +534,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -687,10 +692,10 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ + dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ install-data-local install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/src/clients/Makefile.in new/yast2-packager-2.16.42/src/clients/Makefile.in --- old/yast2-packager-2.16.41/src/clients/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/src/clients/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/src/clients/pkg_finish.ycp new/yast2-packager-2.16.42/src/clients/pkg_finish.ycp --- old/yast2-packager-2.16.41/src/clients/pkg_finish.ycp 2008-04-25 08:03:09.000000000 +0200 +++ new/yast2-packager-2.16.42/src/clients/pkg_finish.ycp 2008-04-29 18:31:06.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: pkg_finish.ycp 41242 2007-10-03 15:47:40Z locilka $ + * $Id: pkg_finish.ycp 47180 2008-04-29 16:31:05Z locilka $ * */ @@ -104,6 +104,12 @@ } else if (func == "Write") { + // See bnc #384827, #381360 + if (Mode::update()) { + y2milestone ("Adding default repositories"); + WFM::call ("inst_extrasources"); + } + Pkg::SourceCacheCopyTo (Installation::destdir); // Remove (backup) all sources not used during the update diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/src/config/Makefile.in new/yast2-packager-2.16.42/src/config/Makefile.in --- old/yast2-packager-2.16.41/src/config/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/src/config/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/src/include/checkmedia/Makefile.in new/yast2-packager-2.16.42/src/include/checkmedia/Makefile.in --- old/yast2-packager-2.16.41/src/include/checkmedia/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/src/include/checkmedia/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/src/include/Makefile.in new/yast2-packager-2.16.42/src/include/Makefile.in --- old/yast2-packager-2.16.41/src/include/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/src/include/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -317,8 +317,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -343,8 +343,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -354,13 +354,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/src/Makefile.in new/yast2-packager-2.16.42/src/Makefile.in --- old/yast2-packager-2.16.41/src/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/src/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -283,8 +283,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -309,8 +309,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -320,13 +320,12 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/src/modules/Makefile.in new/yast2-packager-2.16.42/src/modules/Makefile.in --- old/yast2-packager-2.16.41/src/modules/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/src/modules/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/src/modules/SourceDialogs.ycp new/yast2-packager-2.16.42/src/modules/SourceDialogs.ycp --- old/yast2-packager-2.16.41/src/modules/SourceDialogs.ycp 2008-04-25 08:03:10.000000000 +0200 +++ new/yast2-packager-2.16.42/src/modules/SourceDialogs.ycp 2008-04-29 11:40:53.000000000 +0200 @@ -1352,6 +1352,7 @@ return nil; } + if (event["ID"]:nil == `anonymous && current_type == `edit_url_parts) { boolean anonymous = (boolean)UI::QueryWidget (`id (`anonymous), @@ -1366,6 +1367,16 @@ { y2milestone("Changing dialog type"); + // store the current values (note: the radio button just has been switched, compare to the opposite value!) + if (id == `edit_url_parts) + { + ServerStoreComplete(); + } + else + { + ServerStoreParts(); + } + // reinitialize the dialog (set the current values) ServerInit(nil); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/testsuite/Makefile.in new/yast2-packager-2.16.42/testsuite/Makefile.in --- old/yast2-packager-2.16.41/testsuite/Makefile.in 2008-04-29 09:22:25.000000000 +0200 +++ new/yast2-packager-2.16.42/testsuite/Makefile.in 2008-04-25 18:20:34.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.16.41/VERSION new/yast2-packager-2.16.42/VERSION --- old/yast2-packager-2.16.41/VERSION 2008-04-29 09:17:14.000000000 +0200 +++ new/yast2-packager-2.16.42/VERSION 2008-04-30 12:05:18.000000000 +0200 @@ -1 +1 @@ -2.16.41 +2.16.42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-libyui
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package yast2-libyui checked in at Thu May 1 14:48:51 CEST 2008. -------- --- yast2-libyui/yast2-libyui.changes 2008-04-23 16:13:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-libyui/yast2-libyui.changes 2008-04-30 15:16:39.017465000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 30 14:50:36 CEST 2008 - lslezak(a)suse.cz + +- added repoMgrEnabled() method to YPackageSelector widget + (repository management is now optional) (bnc#381956) +- V 2.16.47 + +------------------------------------------------------------------- Old: ---- yast2-libyui-2.16.46.tar.bz2 New: ---- yast2-libyui-2.16.47.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-libyui.spec ++++++ --- /var/tmp/diff_new_pack.A30545/_old 2008-05-01 14:48:25.000000000 +0200 +++ /var/tmp/diff_new_pack.A30545/_new 2008-05-01 14:48:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-libyui (Version 2.16.46) +# spec file for package yast2-libyui (Version 2.16.47) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-libyui -Version: 2.16.46 +Version: 2.16.47 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-libyui-2.16.46.tar.bz2 +Source0: yast2-libyui-2.16.47.tar.bz2 Prefix: /usr Source1: yast2-libyui-rpmlintrc BuildRequires: gcc-c++ @@ -70,7 +70,7 @@ Stefan Hundhammer <sh(a)suse.de> %prep -%setup -n yast2-libyui-2.16.46 +%setup -n yast2-libyui-2.16.47 %build %{prefix}/bin/y2tool y2autoconf @@ -116,6 +116,10 @@ %{_datadir}/cmake/Modules/* %doc %{prefix}/share/doc/packages/yast2-libyui %changelog +* Wed Apr 30 2008 lslezak(a)suse.cz +- added repoMgrEnabled() method to YPackageSelector widget + (repository management is now optional) (bnc#381956) +- V 2.16.47 * Wed Apr 23 2008 sh(a)suse.de - Fixed segfault when discarding events from foreign dialogs (bnc #382771) ++++++ yast2-libyui-2.16.46.tar.bz2 -> yast2-libyui-2.16.47.tar.bz2 ++++++ ++++ 9800 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.46/configure.in new/yast2-libyui-2.16.47/configure.in --- old/yast2-libyui-2.16.46/configure.in 2008-04-16 15:18:58.000000000 +0200 +++ new/yast2-libyui-2.16.47/configure.in 2008-04-30 15:15:54.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-libyui, 2.16.45, http://bugs.opensuse.org/, yast2-libyui) +AC_INIT(yast2-libyui, 2.16.47, http://bugs.opensuse.org/, yast2-libyui) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.45" +VERSION="2.16.47" RPMNAME="yast2-libyui" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.46/missing new/yast2-libyui-2.16.47/missing --- old/yast2-libyui-2.16.46/missing 2008-04-16 15:19:15.000000000 +0200 +++ new/yast2-libyui-2.16.47/missing 2008-04-30 15:16:07.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.46/src/YPackageSelector.h new/yast2-libyui-2.16.47/src/YPackageSelector.h --- old/yast2-libyui-2.16.46/src/YPackageSelector.h 2008-02-21 13:58:30.000000000 +0100 +++ new/yast2-libyui-2.16.47/src/YPackageSelector.h 2008-04-30 13:11:24.000000000 +0200 @@ -28,6 +28,8 @@ #define YPkg_SummaryMode 1 << 4 #define YPkg_RepoMode 1 << 5 +#define YPkg_RepoMgr 1 << 15 + class YPackageSelector : public YWidget { @@ -57,6 +59,8 @@ bool summaryMode() const { return _modeFlags & YPkg_SummaryMode; } bool repoMode() const { return _modeFlags & YPkg_RepoMode; } + bool repoMgrEnabled() const { return _modeFlags & YPkg_RepoMgr; } + protected: long _modeFlags; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.46/src/YUISymbols.h new/yast2-libyui-2.16.47/src/YUISymbols.h --- old/yast2-libyui-2.16.46/src/YUISymbols.h 2008-04-14 14:58:00.000000000 +0200 +++ new/yast2-libyui-2.16.47/src/YUISymbols.h 2008-04-30 13:04:37.000000000 +0200 @@ -210,6 +210,7 @@ #define YUIOpt_outputField "outputField" #define YUIOpt_plainText "plainText" #define YUIOpt_repoMode "repoMode" +#define YUIOpt_repoMgr "repoMgr" #define YUIOpt_scaleToFit "scaleToFit" #define YUIOpt_searchMode "searchMode" #define YUIOpt_shrinkable "shrinkable" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.46/VERSION new/yast2-libyui-2.16.47/VERSION --- old/yast2-libyui-2.16.46/VERSION 2008-04-23 15:57:08.000000000 +0200 +++ new/yast2-libyui-2.16.47/VERSION 2008-04-30 14:54:25.000000000 +0200 @@ -1 +1 @@ -2.16.46 +2.16.47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nautilus
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package nautilus checked in at Thu May 1 14:48:15 CEST 2008. -------- --- GNOME/nautilus/nautilus.changes 2008-04-28 18:07:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2008-05-01 10:36:39.705703000 +0200 @@ -1,0 +2,10 @@ +Thu May 1 10:36:36 CEST 2008 - hpj(a)suse.de + +- Removed previously disabled patches that were made obsolete by + upstream changes: + * nautilus-default-thumbnail-size.diff + * nautilus-6014-network-servers-in-places-sidebar.diff +- Added nautilus-bnc376070-null-exifdata-crash, which fixes + crashes when showing the properties of a picture (bnc#376070). + +------------------------------------------------------------------- Old: ---- nautilus-6014-network-servers-in-places-sidebar.diff nautilus-default-thumbnail-size.diff New: ---- nautilus-bnc376070-null-exifdata-crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.d29007/_old 2008-05-01 14:47:39.000000000 +0200 +++ /var/tmp/diff_new_pack.d29007/_new 2008-05-01 14:47:39.000000000 +0200 @@ -16,7 +16,7 @@ License: GPL v2 or later Group: Productivity/File utilities Version: 2.22.2 -Release: 11 +Release: 14 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.… Url: http://www.gnome.org @@ -31,8 +31,6 @@ Patch6: nautilus-genericname.patch # PATCH-FIX-OPENSUSE nautilus-disable-zoom-control-and-view-as-option-menu.patch Patch7: nautilus-disable-zoom-control-and-view-as-option-menu.patch -# PATCH-NEEDS-REBASE nautilus-default-thumbnail-size.diff bgo350972 -Patch8: nautilus-default-thumbnail-size.diff # PATCH-FIX-UPSTREAM nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico(a)novell.com Patch9: nautilus-146947-rename-bad-parameters-message.diff # PATCH-NEEDS-REBASE nautilus-mime.patch @@ -41,8 +39,6 @@ Patch11: nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff # PATCH-FIX-UPSTREAM nautilus-212649-search-bar-visibility.patch bgo368424 federico(a)novell.com Patch12: nautilus-212649-search-bar-visibility.patch -# PATCH-NEEDS-REBASE nautilus-6014-network-servers-in-places-sidebar.diff bgo350974 bnc6014 federico(a)novell.com -Patch13: nautilus-6014-network-servers-in-places-sidebar.diff # PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bgo335411 federico(a)novell.com Patch15: nautilus-drives-and-volumes-on-desktop.diff Patch17: nautilus-181941-i18n.patch @@ -54,6 +50,8 @@ Patch20: nautilus-bnc363122-lockdown-context-menus.diff # PATCH-FEATURE-UPSTREAM nautilus-bnc368446-network-in-places.patch bnc368446 bgo350974 vuntz(a)novell.com -- Add network:// in the places sidebar Patch21: nautilus-bnc368446-network-in-places.patch +# PATCH-FIX-UPSTREAM nautilus-bnc-376070-null-exifdata-crash.patch bnc376070 hpj(a)novell.com +Patch22: nautilus-bnc376070-null-exifdata-crash.patch Requires: gnome-icon-theme Requires: %{name}-lang = %{version} Requires: gvfs @@ -93,18 +91,17 @@ %patch5 -p1 %patch6 -p0 %patch7 -### %patch8 -p1 %patch9 -p0 ### %patch10 %patch11 -p1 %patch12 -### %patch13 -p1 ### %patch15 -p1 %patch17 -p1 ### %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 +%patch22 -p1 gnome-patch-translation-update %build @@ -188,6 +185,13 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu May 01 2008 hpj(a)suse.de +- Removed previously disabled patches that were made obsolete by + upstream changes: + * nautilus-default-thumbnail-size.diff + * nautilus-6014-network-servers-in-places-sidebar.diff +- Added nautilus-bnc376070-null-exifdata-crash, which fixes + crashes when showing the properties of a picture (bnc#376070). * Mon Apr 28 2008 federico(a)novell.com - Rebased these patches: nautilus-bgo364843-name-copy-dont-overflow-max-path-len.diff ++++++ nautilus-bnc376070-null-exifdata-crash.patch ++++++ diff -upr nautilus-2.22.2-pre/src/nautilus-image-properties-page.c nautilus-2.22.2-post/src/nautilus-image-properties-page.c --- nautilus-2.22.2-pre/src/nautilus-image-properties-page.c 2008-03-29 03:40:25.000000000 -0600 +++ nautilus-2.22.2-post/src/nautilus-image-properties-page.c 2008-05-01 01:17:45.000000000 -0500 @@ -228,7 +228,7 @@ append_tag_value_pair (GString *string, static void append_exifdata_string (ExifData *exifdata, GString *string) { - if (exifdata->ifd[0] && exifdata->ifd[0]->count) { + if (exifdata && exifdata->ifd[0] && exifdata->ifd[0]->count) { append_tag_value_pair (string, exifdata, EXIF_TAG_MAKE, _("Camera Brand")); append_tag_value_pair (string, exifdata, EXIF_TAG_MODEL, _("Camera Model")); Only in nautilus-2.22.2-post/src: nautilus-image-properties-page.c~ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mdadm
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package mdadm checked in at Thu May 1 14:47:13 CEST 2008. -------- --- mdadm/mdadm.changes 2008-02-04 19:26:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/mdadm/mdadm.changes 2008-04-30 15:58:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 30 15:57:14 CEST 2008 - mmarek(a)suse.cz + +- added some fixes from Neil's git repo, fixing bnc#368704 among + others + +------------------------------------------------------------------- New: ---- mdadm-2.6.4-519561f7.patch mdadm-2.6.4-6fb79233.patch mdadm-2.6.4-7a3be72f.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.W19550/_old 2008-05-01 14:24:10.000000000 +0200 +++ /var/tmp/diff_new_pack.W19550/_new 2008-05-01 14:24:10.000000000 +0200 @@ -10,9 +10,10 @@ # norootforbuild + Name: mdadm Version: 2.6.4 -Release: 23 +Release: 37 BuildRequires: sgmltool PreReq: %fillup_prereq %insserv_prereq Obsoletes: raidtools @@ -27,6 +28,9 @@ Source2: sysconfig.mdadm Source3: mdadmd Source4: boot.md +Patch1: mdadm-2.6.4-7a3be72f.patch +Patch2: mdadm-2.6.4-6fb79233.patch +Patch3: mdadm-2.6.4-519561f7.patch %description Mdadm is a program that can be used to control Linux md devices. It is @@ -41,6 +45,9 @@ %prep %setup -q -a1 +%patch1 +%patch2 +%patch3 %build %{suse_update_config -f} @@ -115,6 +122,9 @@ %{_var}/adm/fillup-templates/sysconfig.mdadm %changelog +* Wed Apr 30 2008 mmarek(a)suse.cz +- added some fixes from Neil's git repo, fixing bnc#368704 among + others * Mon Feb 04 2008 mmarek(a)suse.cz - correctly display rc_status in boot.md * Wed Jan 23 2008 mmarek(a)suse.cz ++++++ mdadm-2.6.4-519561f7.patch ++++++ based on commit 519561f73f7ba987affde8b174d2691bb098439d Author: Neil Brown <neilb(a)suse.de> Date: Tue Apr 29 17:13:53 2008 +1000 Fix possible bug with bitmap space allocation with v1.0 metadata When adding a device to an array, make sure we don't reserve so much space for the bitmap that there isn't room for the data. (minus the roff comments change) --- super1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- super1.c.orig +++ super1.c @@ -903,7 +903,7 @@ static int write_init_super1(struct supe * for a bitmap. */ array_size = __le64_to_cpu(sb->size); - /* work out how much space we left of a bitmap */ + /* work out how much space we left for a bitmap */ bm_space = choose_bm_space(array_size); switch(st->minor_version) { @@ -913,6 +913,8 @@ static int write_init_super1(struct supe sb_offset &= ~(4*2-1); sb->super_offset = __cpu_to_le64(sb_offset); sb->data_offset = __cpu_to_le64(0); + if (sb_offset - bm_space < array_size) + bm_space = sb_offset - array_size; sb->data_size = __cpu_to_le64(sb_offset - bm_space); break; case 1: ++++++ mdadm-2.6.4-6fb79233.patch ++++++ based on commit 6fb79233b050b4a3575f0e466ab04b5d301ac1de Author: Neil Brown <neilb(a)suse.de> Date: Mon Apr 28 16:30:09 2008 +1000 Allow creation of a RAID6 with a single missing device. This did not work before as we couldn't mark it clean as there would be some parity blocks out of sync, and raid6 will not assemble a dirty degraded array. So make such arrays doubly degraded (the last device becomes a spare) and clean. --- Create.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) --- Create.c.orig +++ Create.c @@ -63,6 +63,7 @@ int Create(struct supertype *st, char *m int fail=0, warn=0; struct stat stb; int first_missing = subdevs * 2; + int second_missing = subdevs * 2; int missing_disks = 0; int insert_point = subdevs * 2; /* where to insert a missing drive */ void *super; @@ -203,6 +204,8 @@ int Create(struct supertype *st, char *m if (strcasecmp(dname, "missing")==0) { if (first_missing > dnum) first_missing = dnum; + if (second_missing > dnum && dnum > first_missing) + second_missing = dnum; missing_disks ++; continue; } @@ -341,6 +344,18 @@ int Create(struct supertype *st, char *m break; } } + /* For raid6, if creating with 1 missing drive, make a good drive + * into a spare, else the create will fail + */ + if (assume_clean == 0 && force == 0 && first_missing < raiddisks && + second_missing >= raiddisks && level == 6) { + insert_point = raiddisks - 1; + if (insert_point == first_missing) + insert_point--; + sparedisks ++; + array.active_disks--; + missing_disks++; + } if (level <= 0 && first_missing != subdevs * 2) { fprintf(stderr, @@ -360,11 +375,12 @@ int Create(struct supertype *st, char *m if (fstat(mdfd, &stb)==0) array.md_minor = minor(stb.st_rdev); array.not_persistent = 0; - /*** FIX: Need to do something about RAID-6 here ***/ + if ( ( (level == 4 || level == 5) && (insert_point < raiddisks || first_missing < raiddisks) ) || - ( level == 6 && missing_disks == 2) + ( level == 6 && (insert_point < raiddisks + || second_missing < raiddisks)) || assume_clean ) ++++++ mdadm-2.6.4-7a3be72f.patch ++++++ Based on commit 7a3be72fc621b4a7589e923cf0652c51493f831a Author: Neil Brown <neilb(a)suse.de> Date: Mon Apr 28 16:29:37 2008 +1000 Fix problems with array.size overflowing on large arrays. array.size is 32bits and counts K. So for arrays with more than 4Terrabytes, it can overflow. The correct number can be read from sysfs, but there are still a few places that use array.size and risk truncation. What is worse. they compare a number of kilobytes with a number of sectors !! So use get_component_size() to read the sysfs information, and be more consistent about units. --- Detail.c | 2 +- Manage.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) --- Detail.c.orig +++ Detail.c @@ -174,7 +174,7 @@ int Detail(char *dev, int brief, int exp if (dsize > 0) printf(" Used Dev Size : %llu%s\n", dsize, - human_size((long long)array.size<<10)); + human_size((long long)dsize<<10)); else printf(" Used Dev Size : unknown\n"); } else --- Manage.c.orig +++ Manage.c @@ -188,6 +188,7 @@ int Manage_subdevs(char *devname, int fd */ mdu_array_info_t array; mdu_disk_info_t disc; + unsigned long long array_size; mddev_dev_t dv, next = NULL; struct stat stb; int j, jnext = 0; @@ -203,6 +204,15 @@ int Manage_subdevs(char *devname, int fd devname); return 1; } + + /* array.size is only 32 bit and may be truncated. + * So read from sysfs if possible, and record number of sectors + */ + + array_size = get_component_size(fd); + if (array_size <= 0) + array_size = array.size * 2; + for (dv = devlist, j=0 ; dv; dv = next, j = jnext) { unsigned long long ldsize; char dvname[20]; @@ -335,7 +345,7 @@ int Manage_subdevs(char *devname, int fd /* Make sure device is large enough */ if (st->ss->avail_size(st, ldsize/512) < - array.size) { + array_size) { fprintf(stderr, Name ": %s not large enough to join array\n", dv->devname); return 1; @@ -409,7 +419,7 @@ int Manage_subdevs(char *devname, int fd /* non-persistent. Must ensure that new drive * is at least array.size big. */ - if (ldsize/512 < array.size) { + if (ldsize/512 < array_size) { fprintf(stderr, Name ": %s not large enough to join array\n", dv->devname); return 1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-security
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package yast2-security checked in at Thu May 1 14:24:01 CEST 2008. -------- --- yast2-security/yast2-security.changes 2008-04-14 10:22:45.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-security/yast2-security.changes 2008-04-30 13:59:43.804926000 +0200 @@ -1,0 +2,10 @@ +Wed Apr 30 13:07:33 CEST 2008 - jsuchome(a)suse.cz + +- new defaults in security levels (bnc#385159): + CWD_IN_ROOT_PATH, CWD_IN_USER_PATH always "no", + ENABLE_SYSRQ "yes" for Home Workstation + RUN_UPDATEDB_AS always "nobody" + OBSCURE_CHECKS_ENAB, PASSWD_USE_CRACKLIB always "yes" +- 2.16.1 + +------------------------------------------------------------------- Old: ---- yast2-security-2.16.0.tar.bz2 New: ---- yast2-security-2.16.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-security.spec ++++++ --- /var/tmp/diff_new_pack.j18225/_old 2008-05-01 14:23:36.000000000 +0200 +++ /var/tmp/diff_new_pack.j18225/_new 2008-05-01 14:23:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-security (Version 2.16.0) +# spec file for package yast2-security (Version 2.16.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-security -Version: 2.16.0 +Version: 2.16.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-security-2.16.0.tar.bz2 +Source0: yast2-security-2.16.1.tar.bz2 Prefix: /usr BuildRequires: doxygen perl-XML-Writer pkg-config update-desktop-files yast2-devtools yast2-pam yast2-testsuite # new Pam.ycp API @@ -40,7 +40,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-security-2.16.0 +%setup -n yast2-security-2.16.1 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,13 @@ /usr/share/YaST2/schema/autoyast/rnc/security.rnc %doc %{prefix}/share/doc/packages/yast2-security %changelog +* Wed Apr 30 2008 jsuchome(a)suse.cz +- new defaults in security levels (bnc#385159): + CWD_IN_ROOT_PATH, CWD_IN_USER_PATH always "no", + ENABLE_SYSRQ "yes" for Home Workstation + RUN_UPDATEDB_AS always "nobody" + OBSCURE_CHECKS_ENAB, PASSWD_USE_CRACKLIB always "yes" +- 2.16.1 * Mon Apr 14 2008 jsuchome(a)suse.cz - 2.16.0 * Mon Mar 17 2008 jsrain(a)suse.cz ++++++ yast2-security-2.16.0.tar.bz2 -> yast2-security-2.16.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.16.0/src/levels.ycp new/yast2-security-2.16.1/src/levels.ycp --- old/yast2-security-2.16.0/src/levels.ycp 2006-06-13 09:16:45.000000000 +0200 +++ new/yast2-security-2.16.1/src/levels.ycp 2008-04-30 13:58:33.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Security settings definitions * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: levels.ycp 31463 2006-06-13 07:16:36Z jsuchome $ + * $Id: levels.ycp 47218 2008-04-30 11:58:33Z jsuchome $ * * This file contains definitions of all security settings. * They are in one huge list. @@ -56,25 +56,25 @@ "Level1" : $[ "CONSOLE_SHUTDOWN" : "reboot", - "CWD_IN_ROOT_PATH" : "yes", - "CWD_IN_USER_PATH" : "yes", + "CWD_IN_ROOT_PATH" : "no", + "CWD_IN_USER_PATH" : "no", "DISPLAYMANAGER_REMOTE_ACCESS" : "no", - "ENABLE_SYSRQ" : "no", + "ENABLE_SYSRQ" : "yes", "FAIL_DELAY" : "1", "GID_MAX" : "60000", "GID_MIN" : "1000", "GROUP_ENCRYPTION" : "des", "DISPLAYMANAGER_SHUTDOWN" : "all", "LASTLOG_ENAB" : "yes", - "OBSCURE_CHECKS_ENAB" : "no", + "OBSCURE_CHECKS_ENAB" : "yes", "PASSWD_ENCRYPTION" : "blowfish", - "PASSWD_USE_CRACKLIB" : "no", + "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "0", "PASS_MIN_LEN" : "5", "PASS_WARN_AGE" : "7", "PERMISSION_SECURITY" : "easy", - "RUN_UPDATEDB_AS" : "root", + "RUN_UPDATEDB_AS" : "nobody", "UID_MAX" : "60000", "UID_MIN" : "1000", "SYSTEM_UID_MAX" : "499", @@ -100,7 +100,7 @@ "GROUP_ENCRYPTION" : "des", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "OBSCURE_CHECKS_ENAB" : "no", + "OBSCURE_CHECKS_ENAB" : "yes", "PASSWD_ENCRYPTION" : "blowfish", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", @@ -134,7 +134,7 @@ "GROUP_ENCRYPTION" : "des", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "OBSCURE_CHECKS_ENAB" : "no", + "OBSCURE_CHECKS_ENAB" : "yes", "PASSWD_ENCRYPTION" : "blowfish", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.16.0/testsuite/tests/Level1.out new/yast2-security-2.16.1/testsuite/tests/Level1.out --- old/yast2-security-2.16.0/testsuite/tests/Level1.out 2006-09-21 12:54:00.000000000 +0200 +++ new/yast2-security-2.16.1/testsuite/tests/Level1.out 2008-04-30 13:40:58.000000000 +0200 @@ -35,15 +35,15 @@ Read .sysconfig.displaymanager.DISPLAYMANAGER_SHUTDOWN nil Write .sysconfig.displaymanager.DISPLAYMANAGER_SHUTDOWN "all" true Read .sysconfig.locate.RUN_UPDATEDB_AS nil -Write .sysconfig.locate.RUN_UPDATEDB_AS "root" true +Write .sysconfig.locate.RUN_UPDATEDB_AS "nobody" true Read .sysconfig.security.PERMISSION_SECURITY nil Write .sysconfig.security.PERMISSION_SECURITY "easy local" true Read .sysconfig.suseconfig.CWD_IN_ROOT_PATH nil -Write .sysconfig.suseconfig.CWD_IN_ROOT_PATH "yes" true +Write .sysconfig.suseconfig.CWD_IN_ROOT_PATH "no" true Read .sysconfig.suseconfig.CWD_IN_USER_PATH nil -Write .sysconfig.suseconfig.CWD_IN_USER_PATH "yes" true +Write .sysconfig.suseconfig.CWD_IN_USER_PATH "no" true Read .sysconfig.sysctl.ENABLE_SYSRQ nil -Write .sysconfig.sysctl.ENABLE_SYSRQ "no" true +Write .sysconfig.sysctl.ENABLE_SYSRQ "yes" true Write .etc.login_defs nil true Write .sysconfig.displaymanager nil true Write .sysconfig.locate nil true @@ -55,12 +55,12 @@ Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true -Execute .target.bash_output "pam-config -d --pwcheck-cracklib" $[] -Execute .target.bash_output "pam-config -a --pwcheck-no_obscure_checks" $[] +Execute .target.bash_output "pam-config -a --pwcheck-cracklib" $[] +Execute .target.bash_output "pam-config -d --pwcheck-no_obscure_checks" $[] Execute .target.bash_output "pam-config -d --pwcheck-minlen=" $[] Execute .target.bash_output "pam-config -d --pwcheck-remember=" $[] Write .etc.default.passwd nil true -Execute .target.bash "echo 0 > /proc/sys/kernel/sysrq" 0 +Execute .target.bash "echo 1 > /proc/sys/kernel/sysrq" 0 Read .sysconfig.displaymanager.DISPLAYMANAGER "" Execute .target.bash "/sbin/SuSEconfig --module kde3" 0 Execute .target.bash "/sbin/SuSEconfig --module kdm3" 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.16.0/testsuite/tests/Level2.out new/yast2-security-2.16.1/testsuite/tests/Level2.out --- old/yast2-security-2.16.0/testsuite/tests/Level2.out 2006-09-21 12:54:00.000000000 +0200 +++ new/yast2-security-2.16.1/testsuite/tests/Level2.out 2008-04-30 13:28:36.000000000 +0200 @@ -56,7 +56,7 @@ Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true Execute .target.bash_output "pam-config -a --pwcheck-cracklib" $[] -Execute .target.bash_output "pam-config -a --pwcheck-no_obscure_checks" $[] +Execute .target.bash_output "pam-config -d --pwcheck-no_obscure_checks" $[] Execute .target.bash_output "pam-config -d --pwcheck-minlen=" $[] Execute .target.bash_output "pam-config -d --pwcheck-remember=" $[] Write .etc.default.passwd nil true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.16.0/testsuite/tests/Level3.out new/yast2-security-2.16.1/testsuite/tests/Level3.out --- old/yast2-security-2.16.0/testsuite/tests/Level3.out 2006-09-21 12:54:00.000000000 +0200 +++ new/yast2-security-2.16.1/testsuite/tests/Level3.out 2008-04-30 13:28:47.000000000 +0200 @@ -56,7 +56,7 @@ Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true Execute .target.bash_output "pam-config -a --pwcheck-cracklib" $[] -Execute .target.bash_output "pam-config -a --pwcheck-no_obscure_checks" $[] +Execute .target.bash_output "pam-config -d --pwcheck-no_obscure_checks" $[] Execute .target.bash_output "pam-config -a --pwcheck-minlen=6" $[] Execute .target.bash_output "pam-config -d --pwcheck-remember=" $[] Write .etc.default.passwd nil true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-security-2.16.0/VERSION new/yast2-security-2.16.1/VERSION --- old/yast2-security-2.16.0/VERSION 2008-03-19 08:54:03.000000000 +0100 +++ new/yast2-security-2.16.1/VERSION 2008-04-30 13:09:58.000000000 +0200 @@ -1 +1 @@ -2.16.0 +2.16.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 linuxrc
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package linuxrc checked in at Thu May 1 14:23:42 CEST 2008. -------- --- linuxrc/linuxrc.changes 2008-04-24 16:23:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2008-04-30 15:14:02.131608000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 30 15:11:20 CEST 2008 - snwint(a)suse.de + +- dhcpcd even changed /var/lib/dhcpcd/dhcpcd-*.info format (bnc #383737) + +------------------------------------------------------------------- Old: ---- linuxrc-3.1.20.tar.bz2 New: ---- linuxrc-3.1.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.R17673/_old 2008-05-01 14:23:26.000000000 +0200 +++ /var/tmp/diff_new_pack.R17673/_new 2008-05-01 14:23:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.1.20) +# spec file for package linuxrc (Version 3.1.21) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,9 +17,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.1.20 +Version: 3.1.21 Release: 1 -Source: linuxrc-3.1.20.tar.bz2 +Source: linuxrc-3.1.21.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +54,8 @@ %doc linuxrc.html %changelog +* Wed Apr 30 2008 snwint(a)suse.de +- dhcpcd even changed /var/lib/dhcpcd/dhcpcd-*.info format (bnc #383737) * Thu Apr 24 2008 snwint(a)suse.de - try wired network cards first (bnc #381283) - adapt to new dhcpcd ++++++ linuxrc-3.1.20.tar.bz2 -> linuxrc-3.1.21.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.20/Changelog new/linuxrc-3.1.21/Changelog --- old/linuxrc-3.1.20/Changelog 2008-04-24 16:22:56.000000000 +0200 +++ new/linuxrc-3.1.21/Changelog 2008-04-30 14:55:07.000000000 +0200 @@ -1,3 +1,6 @@ +30/4/2008: v3.1.21 + - dhcpcd even changed /var/lib/dhcpcd/dhcpcd-*.info format + 24/4/2008: v3.1.20 - try wired network cards first (bnc #381283) - adapt to new dhcpcd diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.20/file.c new/linuxrc-3.1.21/file.c --- old/linuxrc-3.1.20/file.c 2008-04-24 16:06:42.000000000 +0200 +++ new/linuxrc-3.1.21/file.c 2008-04-30 15:04:07.000000000 +0200 @@ -83,6 +83,7 @@ { key_ip, "IP", kf_none }, { key_netmask, "Netmask", kf_cfg + kf_cmd + kf_dhcp }, { key_gateway, "Gateway", kf_cfg + kf_cmd + kf_dhcp }, + { key_gateway, "Gateways", kf_cfg + kf_cmd + kf_dhcp }, { key_server, "Server", kf_cfg + kf_cmd }, { key_nameserver, "Nameserver", kf_cfg + kf_cmd }, { key_broadcast, "Broadcast", kf_cfg + kf_cmd + kf_dhcp }, @@ -102,6 +103,7 @@ { key_console, "Console", kf_none }, { key_ptphost, "Pointopoint", kf_cfg + kf_cmd }, { key_domain, "Domain", kf_cfg + kf_cmd + kf_dhcp }, + { key_domain, "DNSDOMAIN", kf_cfg + kf_cmd + kf_dhcp }, { key_manual, "Manual", kf_cfg + kf_cmd + kf_cmd_early }, { key_reboot, "Reboot", kf_none }, /* drop it? */ { key_floppydisk, "Floppydisk", kf_none }, /* ??? */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.20/net.c new/linuxrc-3.1.21/net.c --- old/linuxrc-3.1.20/net.c 2008-04-21 15:18:50.000000000 +0200 +++ new/linuxrc-3.1.21/net.c 2008-04-30 15:03:42.000000000 +0200 @@ -1710,7 +1710,7 @@ break; case key_gateway: - if((s = strchr(f->value, ','))) *s = 0; + if((s = strchr(f->value, ' '))) *s = 0; name2inet(&config.net.gateway, f->value); net_check_address2(&config.net.gateway, 0); break; @@ -1733,7 +1733,7 @@ #endif case key_dns: - for(config.net.nameservers = 0, sl = sl0 = slist_split(',', f->value); sl; sl = sl->next) { + for(config.net.nameservers = 0, sl = sl0 = slist_split(' ', f->value); sl; sl = sl->next) { name2inet(&config.net.nameserver[config.net.nameservers], sl->key); net_check_address2(&config.net.nameserver[config.net.nameservers], 0); if(++config.net.nameservers >= sizeof config.net.nameserver / sizeof *config.net.nameserver) break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.1.20/VERSION new/linuxrc-3.1.21/VERSION --- old/linuxrc-3.1.20/VERSION 2008-04-23 17:18:16.000000000 +0200 +++ new/linuxrc-3.1.21/VERSION 2008-04-30 14:54:19.000000000 +0200 @@ -1 +1 @@ -3.1.20 +3.1.21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-repair
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package yast2-repair checked in at Thu May 1 14:23:28 CEST 2008. -------- --- yast2-repair/yast2-repair.changes 2008-04-14 14:18:07.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-repair/yast2-repair.changes 2008-04-30 15:58:47.179548000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 22 11:58:58 CEST 2008 - jsuchome(a)suse.cz + +- extended help text if no partition was found (bnc#366856) +- initialize target before source to get correct name of kernel +- patterns now only recommend packages +- handle encrypted partitions separately during fstab check +- 2.16.9 + +------------------------------------------------------------------- Old: ---- yast2-repair-2.16.8.tar.bz2 New: ---- yast2-repair-2.16.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-repair.spec ++++++ --- /var/tmp/diff_new_pack.o15277/_old 2008-05-01 14:22:27.000000000 +0200 +++ /var/tmp/diff_new_pack.o15277/_new 2008-05-01 14:22:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-repair (Version 2.16.8) +# spec file for package yast2-repair (Version 2.16.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-repair -Version: 2.16.8 +Version: 2.16.9 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-repair-2.16.8.tar.bz2 +Source0: yast2-repair-2.16.9.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-storage yast2-testsuite Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage @@ -35,7 +35,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-repair-2.16.8 +%setup -n yast2-repair-2.16.9 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,12 @@ /usr/share/YaST2/include/repair/* %doc %{prefix}/share/doc/packages/yast2-repair %changelog +* Tue Apr 22 2008 jsuchome(a)suse.cz +- extended help text if no partition was found (bnc#366856) +- initialize target before source to get correct name of kernel +- patterns now only recommend packages +- handle encrypted partitions separately during fstab check +- 2.16.9 * Mon Apr 14 2008 jsuchome(a)suse.cz - solver needs to be run before reading product info (bnc#368104) - 2.16.8 ++++++ yast2-repair-2.16.8.tar.bz2 -> yast2-repair-2.16.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.8/src/OSRFstab.ycp new/yast2-repair-2.16.9/src/OSRFstab.ycp --- old/yast2-repair-2.16.8/src/OSRFstab.ycp 2008-04-02 13:49:59.000000000 +0200 +++ new/yast2-repair-2.16.9/src/OSRFstab.ycp 2008-04-30 15:57:48.000000000 +0200 @@ -25,7 +25,7 @@ * OSRFstab::Repair(); * * - * $Id: OSRFstab.ycp 45959 2008-04-02 11:49:58Z jsuchome $ + * $Id: OSRFstab.ycp 47234 2008-04-30 13:57:48Z jsuchome $ */ { module "OSRFstab"; @@ -117,6 +117,11 @@ list<string> checked_partitions = []; /** + * Encrypted partitions (actually not checked) + */ + list<string> encrypted_partitions = []; + + /** @example of map describing /etc/fstab: $[ @@ -302,6 +307,7 @@ integer i = 0; foreach (string partition_item, linux_partition_list, ``{ +y2internal ("partition to check: %1", partition_item); if ((boolean) WFM::Execute (.local.mount, [ partition_item, m_point, OSRExecute::OutputFile() ])) { @@ -573,6 +579,8 @@ */ define map devname2part(string dev_name)``{ + y2milestone ("device name %1", dev_name); + if (substring (dev_name, 0,1) != "/") return $[]; map ret = StorageDevices::GetCdromEntry( dev_name); @@ -622,6 +630,13 @@ if (ret == $[] || ret == nil) { ret = Storage::GetPartition( Storage::GetTargetMap(), dev_name ); + if (ret == $[] && substring (dev_name, 0, 15) == "/dev/mapper/cr_") + { + // encrypted partition does not show the real device name + dev_name = "/dev/" + substring (dev_name, 15); + y2milestone ("transforming device name to %1", dev_name); + ret = Storage::GetPartition (Storage::GetTargetMap(), dev_name); + } if (ret != $[] && ret != nil) { /* dev name might be: /dev/disk/by-id/scsi-SATA_ST340016A_3HS8YAL0-part6 @@ -661,6 +676,7 @@ define boolean check_dev_entry(string p)``{ map part = devname2part(p); +y2internal ("part map for device %1: %2", p, part); map lines = filter (integer lnr, map line, fstab["l"]:$[], ``( (line["fields",0]:"!" == p) || @@ -867,6 +883,8 @@ { list<string> special_freq = []; list<string> special_passno = []; + string dev_name = part["dev_name"]:""; + string device = part["device"]:""; // cdrom floppy zip if (part["found"]:"" == "floppy" || @@ -880,8 +898,10 @@ fs_mntops = check_fs_mntops( line); } else if ((part["found"]:"" == "dev") && - (contains (checked_partitions, part["dev_name"]:"") || - contains (checked_partitions, part["device"]:"")) + (contains (checked_partitions, dev_name) || + contains (checked_partitions, device) || + contains (encrypted_partitions, dev_name) || + contains (encrypted_partitions, device)) ) { // check root first with CheckRootEntry!! @@ -899,8 +919,8 @@ part["mount"] = line[1]:""; Storage::ChangeVolumeProperties(part); } - else if ((contains (swapable_partition_list, part["dev_name"]:"") || - contains (swapable_partition_list, part["device"]:"")) && + else if ((contains (swapable_partition_list, dev_name) || + contains (swapable_partition_list, device)) && part["found"]:"" == "swap") { type = "swap"; @@ -1007,16 +1027,18 @@ * Check if all entries in the fstab are valid and * if all found devices have an entry in the fstab. */ - global define boolean Check(list<string> tswapable_partition_list, - list<string> tchecked_partitions) ``{ - - ResetSettings(); - swapable_partition_list = tswapable_partition_list; - checked_partitions = tchecked_partitions; + global define boolean Check (list<string> tswapable_partition_list, + list<string> tchecked_partitions, + list<string> tencrypted_partitions) + { + ResetSettings(); + swapable_partition_list = tswapable_partition_list; + checked_partitions = tchecked_partitions; + encrypted_partitions = tencrypted_partitions; map fstab2part = $[]; - // check all lines in existing fstab file + // check all lines in existing fstab file foreach (integer lnr, map line, fstab["l"]:$[], ``{ y2milestone("----check fstab line %1 ", lnr); if (! contains (valid_lines, lnr)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.8/src/osr_module_partition.ycp new/yast2-repair-2.16.9/src/osr_module_partition.ycp --- old/yast2-repair-2.16.8/src/osr_module_partition.ycp 2008-04-08 13:14:08.000000000 +0200 +++ new/yast2-repair-2.16.9/src/osr_module_partition.ycp 2008-04-30 15:57:48.000000000 +0200 @@ -11,7 +11,7 @@ * Author: * Johannes Buchhold <jbuch(a)suse.de> * - * $Id: osr_module_partition.ycp 46224 2008-04-08 11:14:07Z jsuchome $ + * $Id: osr_module_partition.ycp 47234 2008-04-30 13:57:48Z jsuchome $ */ { @@ -53,11 +53,7 @@ */ define boolean OSRPartitionCheckDiskCount()``{ - ///////////////////////////////////////////////////////////////////////// - // // Check all disks for entries in their map - // - ///////////////////////////////////////////////////////////////////////// Storage::ReReadTargetMap(); // get the names of detected harddisks and put them in the list -> ["/dev/hda", "/dev/sda"] @@ -105,12 +101,7 @@ */ define boolean OSRPartitionCheckDisks() ``{ - ///////////////////////////////////////////////////////////////////////// - // // Iterate all harddisks, check for partitions - // - ///////////////////////////////////////////////////////////////////////// - map target_map = Storage::GetTargetMap(); list<string> valid_target_list = []; @@ -125,12 +116,8 @@ // summary text sformat(_("No partition table was found for hard disk %1"),target)); - ///////////////////////////////////////////////////////////////////// - // // Repair partition table with backup from floppy or with proposal // from gpart - // - ///////////////////////////////////////////////////////////////////// OSRSummary::SetRepairSummary( OSRPtbl::MainPtblRepairDialog(target), // summary header sformat(_("Repairing partition table of hard disk %1"), target), @@ -148,11 +135,7 @@ } }); - ///////////////////////////////////////////////////////////////////////// - // // Check if at least one harddisk with a valid partition table exists - // - ///////////////////////////////////////////////////////////////////////// if (size(valid_target_list) == 0) { @@ -194,14 +177,10 @@ }; /** - * + * search for valid swap partitions */ define boolean OSRPartitionCheckSwap()``{ - ///////////////////////////////////////////////////////////////// - // - // search for valid swap partitions - // - ///////////////////////////////////////////////////////////////// + list<string> swap_partition_list = OSRSwap::Partitions(); if ( size( swap_partition_list ) <= 0 ) { @@ -220,13 +199,11 @@ } + /** + * search for "swap-able" partitions + */ define boolean OSRPartitionCheckSwapAble()``{ - ///////////////////////////////////////////////////////////////// - // - // search for "swap-able" partitions - // - ///////////////////////////////////////////////////////////////// list<string> swap_partition_list = (list<string>) OSRCommon::RequireList("swap_partition_list"); // ["/dev/hda1", "/dev/hdb2"] list<string> swapable_partition_list = OSRSwap::ValidPartitions(swap_partition_list); // ["/dev/hdb2"] @@ -247,11 +224,7 @@ OSRCommon::ProvideList("swapable_partitions", swapable_partition_list); - ///////////////////////////////////////////////////////////////// - // // include all swap partitions - // - ///////////////////////////////////////////////////////////////// foreach(string swap, swapable_partition_list, ``{ // Check if the specified swap-partition is already "swapped", if true don't swapon. @@ -331,11 +304,7 @@ */ define boolean OSRPartitionLoadAllFsModules()``{ - ///////////////////////////////////////////////////////// - // // install available kernel modules for the filesystems - // - ///////////////////////////////////////////////////////// if (! OSRFsck::LoadAllFsModules()) { OSRSummary::DetectProblem("", @@ -355,17 +324,12 @@ } /** - * + * Umount all partitions from "/mnt" or from deeper directories + * (e.g. "/mnt/usr", "/mnt/usr/local", ...) + * before mounting anything to "/mnt". */ define boolean OSRPartitionCurrentlyMountedPartitions()``{ - ///////////////////////////////////////////////////////// - // - // Umount all partitions from "/mnt" or from deeper directories - // (e.g. "/mnt/usr", "/mnt/usr/local", ...) - // before mounting anything to "/mnt". - // - ///////////////////////////////////////////////////////// //string root_mountpoint = OSRCommon::RequireString("root_mountpoint"); OSRSystem::SetOrgRoot(); OSRCommon::ProvideList("just_umounted", OSRFstab::UmountAllFrom( OSRSystem::TargetRoot())); @@ -375,11 +339,7 @@ mounted_partitions = filter(map p, mounted_partitions, ``(p["file"]:"" != "swap" && findfirstof( p["spec"]:"", "/") == 0 )); - ///////////////////////////////////////////////////////// - // // search for currently mounted partitions - // - ///////////////////////////////////////////////////////// if ( size( mounted_partitions) <= 0) { // no mounted partitions: not implicitly an error! @@ -405,16 +365,10 @@ } /** - * + * search for fsck possible partitions */ define boolean OSRPartition2CheckPartitions()``{ - ///////////////////////////////////////////////////////// - // - // search for fsck possible partitions - // - ///////////////////////////////////////////////////////// - list<map> fs_check_parts = OSRFsck::PossiblePartitions(); if( size( fs_check_parts ) == 0 || fs_check_parts == nil) { @@ -439,10 +393,11 @@ OSRCommon::RequireList("fsck_partitions"); list<map> mounted_partitions = (list<map>) OSRCommon::RequireList("mounted_partitions"); - list<string> checked_partitions = []; + list<string> checked_partitions = []; + list<string> encrypted_partitions = []; foreach(map p, fsck_partitions, { - +y2internal ("partition to check %1", p); string dev_name = p["device"]:""; // summary header string summary_header = sformat(_("Executing file system check for partition %1..."), dev_name ); @@ -458,6 +413,7 @@ OSRSummary::DetectOmit (summary_header, // summary text _("Partition is encrypted: check not supported")); + encrypted_partitions = add (encrypted_partitions, dev_name); } else { @@ -504,13 +460,12 @@ } }); OSRCommon::ProvideList( "checked_partitions", checked_partitions ); + OSRCommon::ProvideList( "encrypted_partitions", encrypted_partitions ); return true; } /** - * ////////////////////////////////////////////////// - * // search for valid Linux partitions - * ////////////////////////////////////////////////// + * search for valid Linux partitions */ define boolean OSRPartitionLinuxPartitions()``{ @@ -567,15 +522,10 @@ /** - * + * search for mountable partitions */ define boolean OSRPartitionMountableLinuxPartitions()``{ - ///////////////////////////////////////////////////////// - // - // search for mountable partitions - // - ///////////////////////////////////////////////////////// list<string> linux_partition_list = (list<string>) OSRCommon::RequireList("linux_partition_list"); list<string> mount_possible_list = OSRFstab::MountablePartitions(linux_partition_list, OSRSystem::TargetRoot()); @@ -645,11 +595,7 @@ */ define boolean OSRPartitionFindRootPartitions() ``{ - ///////////////////////////////////////////////////////////////// - // // search for valid root partitions with a filesystem table - // - ///////////////////////////////////////////////////////////////// list<map> valid_root_partition_list = OSRFstab::ValidRootPartitions ( (list<string>) OSRCommon::RequireList("mount_possible_list"), @@ -733,13 +679,11 @@ + /** + * mount the root partition to /mnt + */ define boolean OSRPartitionMountRoot()``{ - ///////////////////////////////////////////////////////////////////////// - // - // mount the root partition to /mnt - // - ///////////////////////////////////////////////////////////////////////// string root_partition = OSRCommon::RequireString ("root_partition"); list<map> just_mounted = []; @@ -828,11 +772,7 @@ */ define boolean OSRPartitionReadFstab() ``{ - ///////////////////////////////////////////////////////////////////////// - // // get the fstab - // - ///////////////////////////////////////////////////////////////////////// // summary header string summary_header = sformat(_("Reading fstab of root partition %1..."), OSRCommon::RequireString("root_partition")); @@ -912,9 +852,11 @@ string root_partition = OSRCommon::RequireString("root_partition"); - if ( OSRFstab::Check ( + if (OSRFstab::Check ( (list<string>)OSRCommon::RequireList("swapable_partitions"), - (list<string>)OSRCommon::RequireList("checked_partitions"))) + (list<string>)OSRCommon::RequireList("checked_partitions"), + (list<string>)OSRCommon::RequireList("encrypted_partitions")) + ) { // summary text OSRSummary::DetectOK("", _("fstab entries valid")); @@ -1352,7 +1294,6 @@ * @return map The map that contains all information about the module * osr_module_partition. */ - define map OSRPartitionInit() ``{ return $[ // has to be the name of the file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.8/src/OSRPkgVerify.ycp new/yast2-repair-2.16.9/src/OSRPkgVerify.ycp --- old/yast2-repair-2.16.8/src/OSRPkgVerify.ycp 2006-09-26 14:43:06.000000000 +0200 +++ new/yast2-repair-2.16.9/src/OSRPkgVerify.ycp 2008-04-30 15:57:48.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Packages check * Authors: Johannes Buchhold <jbuch(a)suse.de> * - * $Id: OSRPkgVerify.ycp 20504 2004-12-06 14:55:51Z jsuchome $ + * $Id: OSRPkgVerify.ycp 47234 2008-04-30 13:57:48Z jsuchome $ * * Provide osr mode information. */ @@ -14,7 +14,6 @@ textdomain "repair"; - import "Kernel"; import "OSRExecute"; import "OSRLogFile"; import "OSRMode"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.8/src/OSRPkg.ycp new/yast2-repair-2.16.9/src/OSRPkg.ycp --- old/yast2-repair-2.16.8/src/OSRPkg.ycp 2008-04-14 14:08:12.000000000 +0200 +++ new/yast2-repair-2.16.9/src/OSRPkg.ycp 2008-04-30 15:57:48.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Packages check * Authors: Johannes Buchhold <jbuch(a)suse.de> * - * $Id: OSRPkg.ycp 45581 2008-03-19 07:21:07Z jsuchome $ + * $Id: OSRPkg.ycp 47234 2008-04-30 13:57:48Z jsuchome $ * * Provide osr mode information. */ @@ -15,7 +15,6 @@ textdomain "repair"; import "DefaultDesktop"; - import "Kernel"; import "Mode"; import "Report"; import "Wizard"; @@ -207,8 +206,8 @@ list<map> descrs = Pkg::ResolvableDependencies (p,`pattern, ""); foreach (map descr, descrs, { foreach (map dep, (list<map>)descr["dependencies"]:[], { - if (dep["res_kind"]:"" == "package" && - dep["dep_kind"]:"" == "requires") + if (dep["res_kind"]:"" == "package" && contains ( + ["requires", "recommends"], dep["dep_kind"]:"")) { minimal_selection = add (minimal_selection, dep["name"]:""); @@ -232,6 +231,18 @@ y2milestone("Open pkg database with target system -%1-", root ); if (root != "" && root != nil ) root_mountpoint = root; + // open target system for Pkg access + if (!target_initialized) + { + if (first_time_openpkg) + { + y2milestone ("first time initializig -> finish target before"); + Pkg::TargetFinish (); + first_time_openpkg = false; + } + target_initialized = Pkg::TargetInit ( root, false); + } + // open the package source if (! Stage::initial () ) { @@ -260,19 +271,6 @@ } } - // open target system for Pkg access - if (!target_initialized) - { - if (first_time_openpkg) - { - y2milestone ("first time initializig -> finish target before"); - Pkg::TargetFinish (); - first_time_openpkg = false; - } - target_initialized = Pkg::TargetInit ( root, false); - get_minimal_selection (); - } - // something failed if (! target_initialized || ! source_initialized ) { @@ -706,10 +704,7 @@ else if (what == "base") { list<string> minimal = get_minimal_selection (); - list<string> special = []; - - minimal = filter (string p, minimal, ``( Pkg::IsAvailable(p))); - ret = (list<string>) union (minimal, special) ; + ret = filter (string p, minimal, ``( Pkg::IsAvailable(p))); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.8/src/OSRPtbl.ycp new/yast2-repair-2.16.9/src/OSRPtbl.ycp --- old/yast2-repair-2.16.8/src/OSRPtbl.ycp 2008-01-07 15:38:28.000000000 +0100 +++ new/yast2-repair-2.16.9/src/OSRPtbl.ycp 2008-04-30 15:57:48.000000000 +0200 @@ -11,7 +11,7 @@ * Author: * Johannes Buchhold <jbuch(a)suse.de> * - * $Id: OSRPtbl.ycp 43308 2008-01-07 14:38:27Z jsuchome $ + * $Id: OSRPtbl.ycp 47234 2008-04-30 13:57:48Z jsuchome $ */ { module "OSRPtbl"; @@ -1336,13 +1336,16 @@ r_button = add( r_button, rd["default"]:false ); r_options = add( r_options , `Left( r_button )); }); - //%1 is device label, such as /dev/hda + // %1 is device label, such as /dev/hda + // sometimes it is not a problem (see bug 366856) => calm user with the + // last sentence string error_text = sformat(_(" No partition table was found for hard disk %1. If at least one partition should exist for %1, select one of the following repair methods. If no partition ever existed on this hard disk, skip the repair. +If in doubt, skip the repair. "), target); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.8/VERSION new/yast2-repair-2.16.9/VERSION --- old/yast2-repair-2.16.8/VERSION 2008-04-14 13:44:37.000000000 +0200 +++ new/yast2-repair-2.16.9/VERSION 2008-04-30 15:48:13.000000000 +0200 @@ -1 +1 @@ -2.16.8 +2.16.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libqt4
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package libqt4 checked in at Thu May 1 14:23:11 CEST 2008. -------- --- libqt4/libqt4.changes 2008-04-22 12:42:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-04-30 02:08:48.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Apr 30 01:35:54 CEST 2008 - dmueller(a)suse.de + +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change New: ---- 0223-fix-qpixmap-hasalpha.diff 0225-invalidate-tabbar-geometry-on-refresh.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.B14645/_old 2008-05-01 14:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.B14645/_new 2008-05-01 14:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.3.95+20080424) +# spec file for package libqt4-devel-doc-data (Version 4.3.95+20080429) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -27,7 +27,7 @@ %requires_eq libqt4 # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080424 +Version: 4.3.95+20080429 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -62,6 +62,8 @@ Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff Patch68: xim-callback-crash.diff +Patch69: 0223-fix-qpixmap-hasalpha.diff +Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -109,6 +111,8 @@ %patch66 %patch67 %patch68 +%patch69 +%patch70 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -167,6 +171,10 @@ /usr/share/doc/packages/%base_name/src %changelog +* Wed Apr 30 2008 dmueller(a)suse.de +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update * Tue Apr 22 2008 dmueller(a)suse.de - fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller(a)suse.de ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.B14645/_old 2008-05-01 14:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.B14645/_new 2008-05-01 14:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.3.95+20080424) +# spec file for package libqt4 (Version 4.3.95+20080429) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -33,7 +33,7 @@ Provides: libqt4-dbus-1 <= 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Version: 4.3.95+20080424 +Version: 4.3.95+20080429 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -68,6 +68,8 @@ Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff Patch68: xim-callback-crash.diff +Patch69: 0223-fix-qpixmap-hasalpha.diff +Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -116,6 +118,8 @@ %patch66 %patch67 %patch68 +%patch69 +%patch70 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -293,7 +297,9 @@ %defattr(-,root,root,755) %dir %_libdir/qt4 %dir %plugindir +%if %suse_version > 910 %dir %plugindir/script +%endif %dir %plugindir/codecs %dir %plugindir/iconengines %dir %plugindir/imageformats @@ -339,7 +345,9 @@ %plugindir/accessible/* /usr/share/qt4/translations /usr/share/qt4/phrasebooks +%if %suse_version > 910 %plugindir/script/libqtscriptdbus.so +%endif %files qt3support %defattr(-,root,root,755) @@ -409,6 +417,10 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Wed Apr 30 2008 dmueller(a)suse.de +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update * Tue Apr 22 2008 dmueller(a)suse.de - fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller(a)suse.de ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.B14645/_old 2008-05-01 14:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.B14645/_new 2008-05-01 14:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.3.95+20080424) +# spec file for package libqt4-sql-plugins (Version 4.3.95+20080429) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -26,7 +26,7 @@ Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080424 +Version: 4.3.95+20080429 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -61,6 +61,8 @@ Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff Patch68: xim-callback-crash.diff +Patch69: 0223-fix-qpixmap-hasalpha.diff +Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -107,6 +109,8 @@ %patch66 %patch67 %patch68 +%patch69 +%patch70 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -225,6 +229,10 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Wed Apr 30 2008 dmueller(a)suse.de +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update * Tue Apr 22 2008 dmueller(a)suse.de - fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller(a)suse.de ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.B14645/_old 2008-05-01 14:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.B14645/_new 2008-05-01 14:22:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libQtWebKit-devel (Version 4.3.95+20080424) +# spec file for package libQtWebKit-devel (Version 4.3.95+20080429) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -30,7 +30,7 @@ %requires_eq libqt4-devel # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080424 +Version: 4.3.95+20080429 Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- @@ -65,6 +65,8 @@ Patch66: statusbar-recursion.diff Patch67: revert-psql-detection.diff Patch68: xim-callback-crash.diff +Patch69: 0223-fix-qpixmap-hasalpha.diff +Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -113,6 +115,8 @@ %patch66 %patch67 %patch68 +%patch69 +%patch70 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -278,6 +282,10 @@ /usr/bin/svgviewer %changelog +* Wed Apr 30 2008 dmueller(a)suse.de +- fix QTabBar layout being wrongly cached (kde#159014) +- fix major performance regression in QPixmap::hasAlpha() +- fix wrongly diffed snapshot update * Tue Apr 22 2008 dmueller(a)suse.de - fix crash in xim destroy callback (bnc#382254) * Mon Apr 21 2008 dmueller(a)suse.de ++++++ 0223-fix-qpixmap-hasalpha.diff ++++++ qt-bugs@ issue : N206173 Trolltech task ID : 206174 bugs.kde.org number : none applied: yes author: Fredrik Höglund <fredrik(a)kde.org> Calling data->mask() in a pixmap that has an alpha channel causes the mask to be generated from the alpha channel. This is a very expensive operation, and completely unecessary in this case since the generated bitmap is immediately discarded. Fix the issue by reversing the order of the tests in the return statement, so the function returns true if the pixmap has an alpha channel, without generating the mask. Index: src/gui/image/qpixmap.cpp =================================================================== --- src/gui/image/qpixmap.cpp (revision 798574) +++ src/gui/image/qpixmap.cpp (working copy) @@ -1661,7 +1661,7 @@ */ bool QPixmap::hasAlpha() const { - return (!data->mask().isNull() || data->hasAlphaChannel()); + return (data->hasAlphaChannel() || !data->mask().isNull()); } /*! ++++++ 0225-invalidate-tabbar-geometry-on-refresh.patch ++++++ qt-bugs@ issue : None Trolltech task ID : None bugs.kde.org number : 159014 applied: no author: Robert Knight <robertknight(a)gmail.com> When tabs are inserted or removed in a QTabBar, QTabBarPrivate::refresh() is called to update the layout. If the tabbar widget is hidden, this just sets a boolean variable (layoutDirty) and returns, so the parent widget's layout is not notified about the possible geometry change. Prior to Qt 4.4 this was not a problem because the geometry was recalculated in QTabBar::sizeHint() if the layoutDirty variable was set. In Qt 4.4 however the layout caches size hint information in QWidgetItemV2. Since the cache information is not invalidated, the layout may end up using out-of-date size hint information to compute the widget size. If the QTabBar is empty when QTabBar::sizeHint() is called, it will return a size with a height of 0, which will be kept in the cache and so the tab bar will never be shown. This patch fixes the problem by calling updateGeometry() whenever the tab bar's layout is refreshed. Index: src/gui/widgets/qtabbar.cpp =================================================================== --- src/gui/widgets/qtabbar.cpp (revision 796858) +++ src/gui/widgets/qtabbar.cpp (working copy) @@ -533,8 +533,8 @@ layoutTabs(); makeVisible(currentIndex); q->update(); - q->updateGeometry(); } + q->updateGeometry(); } /*! ++++++ qt-4.4-update.diff ++++++ ++++ 20242 lines (skipped) ++++ between libqt4/qt-4.4-update.diff ++++ and /mounts/work_src_done/STABLE/libqt4/qt-4.4-update.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-online-update
by root＠Hilbert.suse.de 01 May '08

01 May '08

Hello community, here is the log from the commit of package yast2-online-update checked in at Thu May 1 14:22:12 CEST 2008. -------- --- yast2-online-update/yast2-online-update.changes 2008-04-24 13:16:49.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-online-update/yast2-online-update.changes 2008-04-30 09:32:48.101206000 +0200 @@ -1,0 +2,7 @@ +Thu Apr 24 13:44:10 CEST 2008 - jsuchome(a)suse.cz + +- Patch CD: ensure first CD is in drive before synchronization with + ZMD (bnc#381594) +- 2.16.13 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.16.12.tar.bz2 New: ---- yast2-online-update-2.16.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.W12562/_old 2008-05-01 14:22:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W12562/_new 2008-05-01 14:22:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.16.12) +# spec file for package yast2-online-update (Version 2.16.13) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-online-update -Version: 2.16.12 +Version: 2.16.13 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.16.12.tar.bz2 +Source0: yast2-online-update-2.16.13.tar.bz2 Prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -50,7 +50,7 @@ gs(a)suse.de %prep -%setup -n yast2-online-update-2.16.12 +%setup -n yast2-online-update-2.16.13 %build %{prefix}/bin/y2tool y2autoconf @@ -152,8 +152,13 @@ %{prefix}/share/applications/YaST2/online_update.desktop /var/lib/YaST2/cd_update.desktop %ghost %{prefix}/share/applications/YaST2/cd_update.desktop + %changelog * Thu Apr 24 2008 jsuchome(a)suse.cz +- Patch CD: ensure first CD is in drive before synchronization with + ZMD (bnc#381594) +- 2.16.13 +* Thu Apr 24 2008 jsuchome(a)suse.cz - warn user if there are selected patches not for package management, do not run solver silently (bnc#367057) - 2.16.12 ++++++ yast2-online-update-2.16.12.tar.bz2 -> yast2-online-update-2.16.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.16.12/src/online_update.ycp new/yast2-online-update-2.16.13/src/online_update.ycp --- old/yast2-online-update-2.16.12/src/online_update.ycp 2008-04-21 15:28:34.000000000 +0200 +++ new/yast2-online-update-2.16.13/src/online_update.ycp 2008-04-24 13:20:34.000000000 +0200 @@ -21,6 +21,7 @@ import "Popup"; import "Progress"; import "SourceManager"; + import "URL"; import "Wizard"; import "GetInstArgs"; @@ -186,6 +187,18 @@ break; } }); + if (add_new_source) + { + // now, ensure there's first CD in the drive (bnc#381594) + map parsed = URL::Parse (new_source["url"]:""); + if (parsed["scheme"]:"" == "cd") + { + // SourceProvideFile should use a callback to ask user for 1st media + if (Pkg::SourceProvideFile ( + OnlineUpdate::cd_source, 1, "/media.1/media") == nil) + add_new_source = false; + } + } if (add_new_source) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.16.12/VERSION new/yast2-online-update-2.16.13/VERSION --- old/yast2-online-update-2.16.12/VERSION 2008-04-24 13:07:59.000000000 +0200 +++ new/yast2-online-update-2.16.13/VERSION 2008-04-30 09:21:59.000000000 +0200 @@ -1 +1 @@ -2.16.12 +2.16.13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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