March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit libaio for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package libaio for openSUSE:Factory checked in at Tue Mar 3 23:13:42 CET 2009. -------- --- libaio/libaio.changes 2008-12-10 14:18:25.000000000 +0100 +++ libaio/libaio.changes 2009-03-03 21:53:55.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 3 21:53:44 CET 2009 - crrodriguez(a)suse.de + +- remove static libraries +- fix -devel package dependencies + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libaio.spec ++++++ --- /var/tmp/diff_new_pack.K16630/_old 2009-03-03 23:12:52.000000000 +0100 +++ /var/tmp/diff_new_pack.K16630/_new 2009-03-03 23:12:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libaio (Version 0.3.104) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ %endif # Version: 0.3.104 -Release: 140 +Release: 141 Summary: Linux-Native Asynchronous I/O Access Library Source: libaio-%{version}.tar.bz2 Patch1: libaio-%{version}.diff @@ -49,7 +49,7 @@ License: LGPL v2.1 or later Summary: Development Files for Linux-native Asynchronous I/O Access Group: Development/Libraries/C and C++ -Requires: libaio = %{version} +Requires: libaio = %{version} glibc-devel # bug437293 %ifarch ppc64 Obsoletes: libaio-devel-64bit @@ -69,14 +69,14 @@ %patch2 -p1 %build -make OPTFLAGS="$RPM_OPT_FLAGS" +%{__make} %{?jobs:-j%jobs} OPTFLAGS="$RPM_OPT_FLAGS" %install make install prefix=%{buildroot}/usr libdir=%{buildroot}/%{_lib} mkdir -p %{buildroot}%{_libdir} -mv %{buildroot}/%{_lib}/libaio.a %{buildroot}%{_libdir}/libaio.a -rm %{buildroot}/%{_lib}/libaio.so -ln -s ../../%{_lib}/libaio.so.1 %{buildroot}%{_libdir}/libaio.so +%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so +%{__rm} -v %{buildroot}/%{_lib}/%{name}.so +%{__rm} -v %{buildroot}/%{_lib}/%{name}.a %post -p /sbin/ldconfig @@ -90,10 +90,12 @@ %files devel %defattr(644,root,root,755) /usr/include/libaio.h -%_libdir/libaio.a %_libdir/libaio.so %changelog +* Tue Mar 03 2009 crrodriguez(a)suse.de +- remove static libraries +- fix -devel package dependencies * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-storage for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at Tue Mar 3 23:06:01 CET 2009. -------- --- yast2-storage/yast2-storage.changes 2009-02-19 17:26:13.000000000 +0100 +++ yast2-storage/yast2-storage.changes 2009-03-03 18:52:40.021626000 +0100 @@ -1,0 +2,17 @@ +Tue Mar 03 16:59:33 CET 2009 - aschnell(a)suse.de + +- fixed storage graph for multiple swap devices +- major code cleanup +- 2.18.8 + +------------------------------------------------------------------- +Mon Mar 2 17:11:16 CET 2009 - kmachalkova(a)suse.cz + +- Removed obsoleted warning about GPT partition table (bnc#470457) + +------------------------------------------------------------------- +Sun Mar 1 17:59:48 CET 2009 - coolo(a)suse.de + +- fix compilation with gcc 4.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.18.7.tar.bz2 New: ---- yast2-storage-2.18.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.n18037/_old 2009-03-03 22:54:21.000000000 +0100 +++ /var/tmp/diff_new_pack.n18037/_new 2009-03-03 22:54:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.18.7) +# spec file for package yast2-storage (Version 2.18.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-storage -Version: 2.18.7 +Version: 2.18.8 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.18.7.tar.bz2 +Source0: yast2-storage-2.18.8.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel @@ -60,7 +60,7 @@ Arvin Schnell <aschnell(a)suse.de> %prep -%setup -n yast2-storage-2.18.7 +%setup -n yast2-storage-2.18.8 %build %{prefix}/bin/y2tool y2autoconf @@ -185,6 +185,14 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog +* Tue Mar 03 2009 aschnell(a)suse.de +- fixed storage graph for multiple swap devices +- major code cleanup +- 2.18.8 +* Mon Mar 02 2009 kmachalkova(a)suse.cz +- Removed obsoleted warning about GPT partition table (bnc#470457) +* Sun Mar 01 2009 coolo(a)suse.de +- fix compilation with gcc 4.4 * Thu Feb 19 2009 aschnell(a)suse.de - added tooltips to nodes in graph - 2.18.7 ++++++ yast2-storage-2.18.7.tar.bz2 -> yast2-storage-2.18.8.tar.bz2 ++++++ ++++ 13530 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-printer for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package yast2-printer for openSUSE:Factory checked in at Tue Mar 3 22:54:14 CET 2009. -------- --- yast2-printer/yast2-printer.changes 2009-02-27 15:46:09.000000000 +0100 +++ yast2-printer/yast2-printer.changes 2009-03-03 15:07:33.469346000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 3 14:55:40 CET 2009 - jsmeix(a)suse.de + +- Fixed a few bugs in the "More Drivers" functionality. + In particular it works now always based on the current visible + search string and no longer on whatever obsure other stuff. +- The DriverItems function in Printer.ycp searches the model name + now also in the 1284DeviceID entry in the PPDs because this entry + should contain the exact model name how it is autodetected + while the NickName entry (which is still searched) may contain + a different model name (e.g. what is labeled on the device). +- 2.18.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-printer-2.18.8.tar.bz2 New: ---- yast2-printer-2.18.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.e14838/_old 2009-03-03 22:52:49.000000000 +0100 +++ /var/tmp/diff_new_pack.e14838/_new 2009-03-03 22:52:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.18.8) +# spec file for package yast2-printer (Version 2.18.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://en.opensuse.org/YaST/Modules/Printer Name: yast2-printer -Version: 2.18.8 +Version: 2.18.9 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.18.8.tar.bz2 +Source0: yast2-printer-2.18.9.tar.bz2 Prefix: /usr BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Recommends: netcat @@ -65,7 +65,7 @@ Michal Zugec <mzugec(a)suse.cz> %prep -%setup -n yast2-printer-2.18.8 +%setup -n yast2-printer-2.18.9 %build %{prefix}/bin/y2tool y2autoconf @@ -127,6 +127,16 @@ %exclude %{prefix}/share/doc/packages/yast2-printer/COPYING %exclude %{prefix}/share/doc/packages/yast2-printer/README %changelog +* Tue Mar 03 2009 jsmeix(a)suse.de +- Fixed a few bugs in the "More Drivers" functionality. + In particular it works now always based on the current visible + search string and no longer on whatever obsure other stuff. +- The DriverItems function in Printer.ycp searches the model name + now also in the 1284DeviceID entry in the PPDs because this entry + should contain the exact model name how it is autodetected + while the NickName entry (which is still searched) may contain + a different model name (e.g. what is labeled on the device). +- 2.18.9 * Fri Feb 27 2009 jsmeix(a)suse.de - Added the functionality to basicadd.ycp and basicmodify.ycp to set the default paper size directly when a driver is assigned ++++++ yast2-printer-2.18.8.tar.bz2 -> yast2-printer-2.18.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.8/configure new/yast2-printer-2.18.9/configure --- old/yast2-printer-2.18.8/configure 2009-02-27 15:38:44.000000000 +0100 +++ new/yast2-printer-2.18.9/configure 2009-03-03 15:06:26.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-printer 2.18.8. +# Generated by GNU Autoconf 2.63 for yast2-printer 2.18.9. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-printer' PACKAGE_TARNAME='yast2-printer' -PACKAGE_VERSION='2.18.8' -PACKAGE_STRING='yast2-printer 2.18.8' +PACKAGE_VERSION='2.18.9' +PACKAGE_STRING='yast2-printer 2.18.9' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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-printer 2.18.8 to adapt to many kinds of systems. +\`configure' configures yast2-printer 2.18.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-printer 2.18.8:";; + short | recursive ) echo "Configuration of yast2-printer 2.18.9:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-printer configure 2.18.8 +yast2-printer configure 2.18.9 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,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-printer $as_me 2.18.8, which was +It was created by yast2-printer $as_me 2.18.9, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ # Define the identity of the package. PACKAGE='yast2-printer' - VERSION='2.18.8' + VERSION='2.18.9' cat >>confdefs.h <<_ACEOF @@ -2510,7 +2510,7 @@ -VERSION="2.18.8" +VERSION="2.18.9" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" @@ -3451,7 +3451,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-printer $as_me 2.18.8, which was +This file was extended by yast2-printer $as_me 2.18.9, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3501,7 +3501,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-printer config.status 2.18.8 +yast2-printer config.status 2.18.9 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.8/configure.in new/yast2-printer-2.18.9/configure.in --- old/yast2-printer-2.18.8/configure.in 2009-02-27 15:38:40.000000000 +0100 +++ new/yast2-printer-2.18.9/configure.in 2009-03-03 15:06:22.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.18.8, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.18.9, http://bugs.opensuse.org/, yast2-printer) 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.18.8" +VERSION="2.18.9" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.8/src/basicadd.ycp new/yast2-printer-2.18.9/src/basicadd.ycp --- old/yast2-printer-2.18.8/src/basicadd.ycp 2009-02-26 15:31:28.000000000 +0100 +++ new/yast2-printer-2.18.9/src/basicadd.ycp 2009-03-03 14:40:37.000000000 +0100 @@ -478,23 +478,28 @@ { driver_filter_string = ""; boolean valid_driver_found = false; list driver_items = []; - // Use the existing value of model because for each subsequent run of this more_drivers section - // the existing value of model is shortened at the end (the last word is removed) to get - // more and mor derivers for each subsequent run of this more_drivers section. - y2milestone( "More drivers for '%1'", model ); - if( "" != model - && "unknown" != tolower( model ) + // Use the existing value of driver_filter_input_text + // which is by default set to the autodetected model name + // but it could be any string which was entered before by the user. + // The "more drivers" functionality must work based on the current search string + // and when nothing is found based on the current search string + // it falls back to show all drivers so that there is a valid result in any case. + driver_filter_input_text = (string)UI::QueryWidget( `id(`driver_filter_input), `Value ); + y2milestone( "More drivers for '%1'", driver_filter_input_text ); + if( "" != driver_filter_input_text + && "unknown" != tolower( driver_filter_input_text ) ) - { // If the model string does not contain a space, - // model_words is a singleton list which contains only model. - list <string> model_words = splitstring( model, " " ); - if( size( model_words ) >= 2 ) - { // If there are less than two words the following does not make sense. + { // If the driver_filter_input_text string does not contain a space, + // words is a singleton list which contains only one word. + list <string> words = splitstring( driver_filter_input_text, " " ); + if( size( words ) >= 1 ) + { // Even if it is only one word, the following makes sense + // because the one word could already be the model_number_word. // Try to find the word which contains a model number. // This is usually the first word which contains a number. string model_number_word = ""; foreach( string word, - model_words, + words, { if( "" != filterchars( word, Printer::number_chars ) ) { model_number_word = word; break; @@ -531,63 +536,59 @@ } } } - } - // Use the manufacturer when the existing value of model cannot be used - // or when nothing was found above: - if( ! valid_driver_found ) - { driver_filter_string = ""; - string model = Printer::connections[Printer::selected_connections_index,"model"]:""; - if( "" != model - && "unknown" != tolower( model ) - ) - { // The first word in the driver_filter_string is usually the first word of the manufacturer name. + // Try to use the manufacturer when nothing was found above: + if( ! valid_driver_found ) + { driver_filter_string = ""; + // The first word in the driver_filter_input_text is usually the first word of the manufacturer name. // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" are the same. - string manufacturer = splitstring( model, " " )[0]:""; + string manufacturer = splitstring( driver_filter_input_text, " " )[0]:""; if( "" != manufacturer ) { // Even more fuzziness for very ambiguous manufacturer names: - if( "hewlett" == substring( tolower( driver_filter_string ), 0, 7 ) ) + if( "hewlett" == substring( tolower( driver_filter_input_text ), 0, 7 ) ) { // Let "Hewlett-Packard", "Hewlett Packard", and "HP be the same: manufacturer = "HP"; } - if( "oki" == substring( tolower( driver_filter_string ), 0, 3 ) ) + if( "oki" == substring( tolower( driver_filter_input_text ), 0, 3 ) ) { // Let "Oki", "Okidata", and "Okipage" be the same: manufacturer = "Oki"; } - driver_filter_string = tolower( manufacturer ); - // Match at the beginning only if the driver_filter_string is actually a known manufacturer: - foreach( string known_manufacturer, - Printer::known_manufacturers, - { if( driver_filter_string == tolower( known_manufacturer ) ) - { driver_filter_string = "^" + driver_filter_string; - break; - } - } - ); // Provide visible feeback what is going on: UI::ReplaceWidget( `id(`driver_filter_input_replace_point), `InputField ( `id(`driver_filter_input), `opt(`hstretch), // No InputField header because there is the "Caption for a printer driver selection": - "", + "", manufacturer ) ); - driver_items = Printer::DriverItems( driver_filter_string, true ); - // Printer::DriverItems may result a driver_items list with one single element - // [ `item( `id( -1 ), _("No matching driver found.") ) ] - // to show at least a meaningful text as fallback entry to the user - // or Printer::DriverItems may result a driver_items list with the first item - // [ `item( `id( -1 ), _("Select a driver.") ), ... ] - // when Printer::DriverItems could not preselect a driver item. - // If a valid driver was found (but perhaps none was preselected), - // there would be a non-negative id value of the first or second element - // which is driver_items[0,0,0] or driver_items[1,0,0] - // (id[0] is the value of the id, see the comment in Printer::DriverItems). - if( driver_items[0,0,0]:-1 >= 0 - || driver_items[1,0,0]:-1 >= 0 - ) - { valid_driver_found = true; + driver_filter_string = filterchars( tolower( manufacturer ), Printer::lower_alnum_chars ); + if( "" != driver_filter_string ) + { // Match at the beginning only if the driver_filter_string is actually a known manufacturer: + foreach( string known_manufacturer, + Printer::known_manufacturers, + { if( driver_filter_string == tolower( known_manufacturer ) ) + { driver_filter_string = "^" + driver_filter_string; + break; + } + } + ); + driver_items = Printer::DriverItems( driver_filter_string, true ); + // Printer::DriverItems may result a driver_items list with one single element + // [ `item( `id( -1 ), _("No matching driver found.") ) ] + // to show at least a meaningful text as fallback entry to the user + // or Printer::DriverItems may result a driver_items list with the first item + // [ `item( `id( -1 ), _("Select a driver.") ), ... ] + // when Printer::DriverItems could not preselect a driver item. + // If a valid driver was found (but perhaps none was preselected), + // there would be a non-negative id value of the first or second element + // which is driver_items[0,0,0] or driver_items[1,0,0] + // (id[0] is the value of the id, see the comment in Printer::DriverItems). + if( driver_items[0,0,0]:-1 >= 0 + || driver_items[1,0,0]:-1 >= 0 + ) + { valid_driver_found = true; + } } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.8/src/basicmodify.ycp new/yast2-printer-2.18.9/src/basicmodify.ycp --- old/yast2-printer-2.18.8/src/basicmodify.ycp 2009-02-27 15:27:37.000000000 +0100 +++ new/yast2-printer-2.18.9/src/basicmodify.ycp 2009-03-03 14:40:40.000000000 +0100 @@ -920,7 +920,11 @@ boolean valid_driver_found = false; list driver_items = []; // Use the existing value of driver_filter_input_text - // which is usually set to nick_name and to model as fallback. + // which is usually set to nick_name and to model as fallback + // but it could be any string which was entered before by the user. + // The "more drivers" functionality must work based on the current search string + // and when nothing is found based on the current search string + // it falls back to show all drivers so that there is a valid result in any case. driver_filter_input_text = (string)UI::QueryWidget( `id(`driver_filter_input), `Value ); y2milestone( "More drivers for '%1'", driver_filter_input_text ); if( "" != driver_filter_input_text @@ -929,8 +933,9 @@ { // If the driver_filter_input_text string does not contain a space, // words is a singleton list which contains only one word. list <string> words = splitstring( driver_filter_input_text, " " ); - if( size( words ) >= 2 ) - { // If there are less than two words the following does not make sense. + if( size( words ) >= 1 ) + { // Even if it is only one word, the following makes sense + // because the one word could already be the model_number_word. // Try to find the word which contains a model number. // This is usually the first word which contains a number. string model_number_word = ""; @@ -972,38 +977,22 @@ } } } - } - // Use the manufacturer when the existing value of model cannot be used - // or when nothing was found above: - if( ! valid_driver_found ) - { driver_filter_string = ""; - string model = Printer::connections[Printer::selected_connections_index,"model"]:""; - if( "" != model - && "unknown" != tolower( model ) - ) - { // The first word in the driver_filter_string is usually the first word of the manufacturer name. + // Try to use the manufacturer when nothing was found above: + if( ! valid_driver_found ) + { driver_filter_string = ""; + // The first word in the driver_filter_input_text is usually the first word of the manufacturer name. // This fuzzy match is intended so that e.g. "Kyocera" and "Kyocera Mita" are the same. - string manufacturer = splitstring( model, " " )[0]:""; + string manufacturer = splitstring( driver_filter_input_text, " " )[0]:""; if( "" != manufacturer ) { // Even more fuzziness for very ambiguous manufacturer names: - if( "hewlett" == substring( tolower( driver_filter_string ), 0, 7 ) ) + if( "hewlett" == substring( tolower( driver_filter_input_text ), 0, 7 ) ) { // Let "Hewlett-Packard", "Hewlett Packard", and "HP be the same: manufacturer = "HP"; } - if( "oki" == substring( tolower( driver_filter_string ), 0, 3 ) ) + if( "oki" == substring( tolower( driver_filter_input_text ), 0, 3 ) ) { // Let "Oki", "Okidata", and "Okipage" be the same: manufacturer = "Oki"; } - driver_filter_string = tolower( manufacturer ); - // Match at the beginning only if the driver_filter_string is actually a known manufacturer: - foreach( string known_manufacturer, - Printer::known_manufacturers, - { if( driver_filter_string == tolower( known_manufacturer ) ) - { driver_filter_string = "^" + driver_filter_string; - break; - } - } - ); // Provide visible feeback what is going on: UI::ReplaceWidget( `id(`driver_filter_input_replace_point), `InputField @@ -1014,21 +1003,33 @@ manufacturer ) ); - driver_items = Printer::DriverItems( driver_filter_string, true ); - // Printer::DriverItems may result a driver_items list with one single element - // [ `item( `id( -1 ), _("No matching driver found.") ) ] - // to show at least a meaningful text as fallback entry to the user - // or Printer::DriverItems may result a driver_items list with the first item - // [ `item( `id( -1 ), _("Select a driver.") ), ... ] - // when Printer::DriverItems could not preselect a driver item. - // If a valid driver was found (but perhaps none was preselected), - // there would be a non-negative id value of the first or second element - // which is driver_items[0,0,0] or driver_items[1,0,0] - // (id[0] is the value of the id, see the comment in Printer::DriverItems). - if( driver_items[0,0,0]:-1 >= 0 - || driver_items[1,0,0]:-1 >= 0 - ) - { valid_driver_found = true; + driver_filter_string = filterchars( tolower( manufacturer ), Printer::lower_alnum_chars ); + if( "" != driver_filter_string ) + { // Match at the beginning only if the driver_filter_string is actually a known manufacturer: + foreach( string known_manufacturer, + Printer::known_manufacturers, + { if( driver_filter_string == tolower( known_manufacturer ) ) + { driver_filter_string = "^" + driver_filter_string; + break; + } + } + ); + driver_items = Printer::DriverItems( driver_filter_string, true ); + // Printer::DriverItems may result a driver_items list with one single element + // [ `item( `id( -1 ), _("No matching driver found.") ) ] + // to show at least a meaningful text as fallback entry to the user + // or Printer::DriverItems may result a driver_items list with the first item + // [ `item( `id( -1 ), _("Select a driver.") ), ... ] + // when Printer::DriverItems could not preselect a driver item. + // If a valid driver was found (but perhaps none was preselected), + // there would be a non-negative id value of the first or second element + // which is driver_items[0,0,0] or driver_items[1,0,0] + // (id[0] is the value of the id, see the comment in Printer::DriverItems). + if( driver_items[0,0,0]:-1 >= 0 + || driver_items[1,0,0]:-1 >= 0 + ) + { valid_driver_found = true; + } } } } @@ -1049,17 +1050,18 @@ driver_items = Printer::DriverItems( "", true ); } UI::ReplaceWidget( `id(`driver_selection_replace_point), - `SelectionBox( `id(`driver_selection), - // By default there is no UserInput() - // if only something was selected in the SelectionBox - // (without clicking additionally a button) - // but the notify option forces UserInput() in this case: - `opt(`notify), - "", - prepend( driver_items, - current_driver - ) - ) + `SelectionBox + ( `id(`driver_selection), + // By default there is no UserInput() + // if only something was selected in the SelectionBox + // (without clicking additionally a button) + // but the notify option forces UserInput() in this case: + `opt(`notify), + "", + prepend( driver_items, + current_driver + ) + ) ); continue; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.8/src/Printer.ycp new/yast2-printer-2.18.9/src/Printer.ycp --- old/yast2-printer-2.18.8/src/Printer.ycp 2009-02-26 15:31:28.000000000 +0100 +++ new/yast2-printer-2.18.9/src/Printer.ycp 2009-03-03 13:01:41.000000000 +0100 @@ -1283,9 +1283,17 @@ } else { // If the driver_filter_string is a non-empty string, - // test whether the nickname matches to the driver_filter_string: - string unified_nickname = filterchars( tolower( nickname ), lower_alnum_chars ); - if( regexpmatch( unified_nickname, driver_filter_string ) ) + // test whether nickname or deviceID matches to the driver_filter_string. + // Only the special character '+' is also taken into account because + // this is sometimes also a meaningful character in the model name + // for example the '+' at the end of a Kyocera model name + // indicates that this model has a built-in PostScript interpreter + // while the model without the '+' understands only PCL. + string unified_nickname = filterchars( tolower( nickname ), lower_alnum_chars + "+" ); + string unified_deviceID = filterchars( tolower( deviceID ), lower_alnum_chars + "+" ); + if( regexpmatch( unified_nickname, driver_filter_string ) + || regexpmatch( unified_deviceID, driver_filter_string ) + ) { driver_items = add( driver_items, `item( `id( ppds_index ), driver_string ) ); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.18.8/VERSION new/yast2-printer-2.18.9/VERSION --- old/yast2-printer-2.18.8/VERSION 2009-02-27 15:35:14.000000000 +0100 +++ new/yast2-printer-2.18.9/VERSION 2009-03-03 14:55:38.000000000 +0100 @@ -1 +1 @@ -2.18.8 +2.18.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 yast2-network for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at Tue Mar 3 22:50:21 CET 2009. -------- --- yast2-network/yast2-network.changes 2009-03-02 09:33:22.000000000 +0100 +++ yast2-network/yast2-network.changes 2009-03-03 14:56:32.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Mar 3 14:47:18 CET 2009 - mzugec(a)suse.cz + +- apply forwarding on both IPv4 and IPv6 (bnc#479370) +- 2.18.15 + +------------------------------------------------------------------- +Tue Mar 3 10:13:05 CET 2009 - mzugec(a)suse.cz + +- fixed networking.rnc (bnc#480466) +- 2.18.14 + +------------------------------------------------------------------- +Mon Mar 2 15:41:50 CET 2009 - mzugec(a)suse.cz + +- added help text (bnc#471253) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-network-2.18.13.tar.bz2 New: ---- yast2-network-2.18.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.Yo5875/_old 2009-03-03 22:48:07.000000000 +0100 +++ /var/tmp/diff_new_pack.Yo5875/_new 2009-03-03 22:48:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.18.13) +# spec file for package yast2-network (Version 2.18.15) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-network -Version: 2.18.13 +Version: 2.18.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.18.13.tar.bz2 +Source0: yast2-network-2.18.15.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -78,7 +78,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.18.13 +%setup -n yast2-network-2.18.15 %build %{prefix}/bin/y2tool y2autoconf @@ -142,6 +142,14 @@ %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Tue Mar 03 2009 mzugec(a)suse.cz +- apply forwarding on both IPv4 and IPv6 (bnc#479370) +- 2.18.15 +* Tue Mar 03 2009 mzugec(a)suse.cz +- fixed networking.rnc (bnc#480466) +- 2.18.14 +* Mon Mar 02 2009 mzugec(a)suse.cz +- added help text (bnc#471253) * Mon Mar 02 2009 mzugec(a)suse.cz - Added omitted handling of `hardware symbol in s390 device workflow (bnc#476490) ++++++ yast2-network-2.18.13.tar.bz2 -> yast2-network-2.18.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/configure new/yast2-network-2.18.15/configure --- old/yast2-network-2.18.13/configure 2009-03-02 09:21:56.000000000 +0100 +++ new/yast2-network-2.18.15/configure 2009-03-03 14:45:48.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-network 2.18.13. +# Generated by GNU Autoconf 2.63 for yast2-network 2.18.14. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.18.13' -PACKAGE_STRING='yast2-network 2.18.13' +PACKAGE_VERSION='2.18.14' +PACKAGE_STRING='yast2-network 2.18.14' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-network 2.18.13 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.18.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.18.13:";; + short | recursive ) echo "Configuration of yast2-network 2.18.14:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.18.13 +yast2-network configure 2.18.14 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-network $as_me 2.18.13, which was +It was created by yast2-network $as_me 2.18.14, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.18.13' + VERSION='2.18.14' cat >>confdefs.h <<_ACEOF @@ -2510,7 +2510,7 @@ -VERSION="2.18.13" +VERSION="2.18.14" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3451,7 +3451,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-network $as_me 2.18.13, which was +This file was extended by yast2-network $as_me 2.18.14, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3501,7 +3501,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-network config.status 2.18.13 +yast2-network config.status 2.18.14 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/configure.in new/yast2-network-2.18.15/configure.in --- old/yast2-network-2.18.13/configure.in 2009-03-02 09:21:50.000000000 +0100 +++ new/yast2-network-2.18.15/configure.in 2009-03-03 14:45:35.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.18.13, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.18.14, http://bugs.opensuse.org/, yast2-network) 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.18.13" +VERSION="2.18.14" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/config/networking.rnc new/yast2-network-2.18.15/src/config/networking.rnc --- old/yast2-network-2.18.13/src/config/networking.rnc 2008-12-03 10:59:07.000000000 +0100 +++ new/yast2-network-2.18.15/src/config/networking.rnc 2009-03-03 09:41:33.000000000 +0100 @@ -44,6 +44,7 @@ # address ipaddr? & + prefixlen? & remote_ipaddr? & element netmask { text }? & #overloaded element bonding_master { text }? & @@ -106,6 +107,7 @@ broadcast = element broadcast { text } dhclient_set_down_link = element dhclient_set_down_link { text } ipaddr = element ipaddr { text } +prefixlen = element prefixlen { text } usercontrol = element usercontrol { text } mtu = element mtu { text } ethtool_options = element ethtool_options { text } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/lan/complex.ycp new/yast2-network-2.18.15/src/lan/complex.ycp --- old/yast2-network-2.18.13/src/lan/complex.ycp 2009-02-16 13:12:59.000000000 +0100 +++ new/yast2-network-2.18.15/src/lan/complex.ycp 2009-03-03 14:15:14.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Summary, overview and IO dialogs for network cards config * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: complex.ycp 55530 2009-02-16 12:12:59Z mzugec $ + * $Id: complex.ycp 55882 2009-03-03 13:15:14Z mzugec $ */ { @@ -116,18 +116,6 @@ LanItems::Items[LanItems::current, "ifcfg"] = LanItems::getCurrentItem()["hwinfo", "dev_name"]:""; LanItems::Items[LanItems::current, "commited"] = false; LanItems::operation = `edit; -// LanItems::SetDefaultsForHW (); - -/* - if (NetworkModules::Alias == "") - { - if (!Popup::ContinueCancel (_("The device does not have a driver module. -The driver may be built in the kernel."))) - { - return false; - } - } -*/ string fw = ""; if (LanItems::needFirmwareCurrentItem()){ fw = LanItems::GetFirmwareForCurrentItem(); @@ -160,9 +148,6 @@ if (fw=="b43-fwcutter"){ if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For successful firmware installation the, 'install_bcm43xx_firmware' script needs to be executed. Execute it now ?"))){ map<string, any> command = (map<string, any>)SCR::Execute(.target.bash_output, "/usr/sbin/install_bcm43xx_firmware"); - //y2internal("command %1", command); -// Popup::ShowFile ("Boot Messages", "/tmp/bcm_firmware.log"); -// Popup::LongText(command["stdout"]:""); if (command["exit"]:-1!=0) Popup::ErrorDetails(_("An error occurred during firmware installation."), command["stderr"]:""); else @@ -233,10 +218,6 @@ UI::ChangeWidget (`id (b), `Enabled, false); }); } -/* - if (hasAnyValue(LanItems::getCurrentItem()["hwinfo", "dev_name"]:"") && size(LanItems::getCurrentItem()["hwinfo"]:$[])>0) UI::ChangeWidget(`id(`edit), `Enabled, true); - else UI::ChangeWidget(`id(`edit), `Enabled, false); -*/ } boolean shown = false; @@ -286,12 +267,6 @@ else // configured { LanItems::SetItem(); -/* - foreach(map<string, any> row, o_items, { - if (row["id"]:-1 == LanItems::current && row["hw_num"]:-1 != -1) LanItems::SelectHW(row["hw_num"]:-1); - }); -*/ -// Lan::SelectHW (1); if (LanItems::startmode == "managed") { // Continue-Cancel popup diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/lan/help.ycp new/yast2-network-2.18.15/src/lan/help.ycp --- old/yast2-network-2.18.13/src/lan/help.ycp 2009-01-13 08:58:37.000000000 +0100 +++ new/yast2-network-2.18.15/src/lan/help.ycp 2009-03-03 14:45:20.000000000 +0100 @@ -78,7 +78,7 @@ the device through which the traffic to the defined network will be routed, as well.\"-\" is an alias for any interface. ") + /* Routing dialog help 2/2 */ -_("Enable IP Forwarding if the system is a router."), +_("Enable IP Forwarding if the system is a router. This will apply on both IPv4 and IPv6."), "dhcp_hostname": _("If you are using DHCP to get an IP address, check whether you get @@ -232,16 +232,21 @@ "), "additional": - /* Aliases dialog help 1/3 */ + /* Aliases dialog help 1/4 */ _("<big>Additional Addresses</big> Configure additional addresses of an interface (its aliases) in this table. ") + - /* Aliases dialog help 2/3 */ + /* Aliases dialog help 2/4 */ _("Enter an Alias Name, an IP Address, and the Netmask.") + - /* Aliases dialog help 3/3, #83766 */ + /* Aliases dialog help 3/4 */ + _("Alias Name is optional and legacy.The total + length of interface name (inclusive of the colon and label) is + limited to 15 characters and the obsolete ifconfig utility truncates it after 9 characters.")+ + + /* Aliases dialog help 3/4, #83766 */ _("Do not include the interface name in the alias name. For example, enter foo instead of eth0:foo."), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/modules/LanItems.ycp new/yast2-network-2.18.15/src/modules/LanItems.ycp --- old/yast2-network-2.18.13/src/modules/LanItems.ycp 2009-02-24 17:10:27.000000000 +0100 +++ new/yast2-network-2.18.15/src/modules/LanItems.ycp 2009-03-02 14:50:33.000000000 +0100 @@ -236,7 +236,6 @@ if (size(Items[key, "udev", "net"]:[])>0) { string dev_name = Items[key, "hwinfo", "dev_name"]:""; current=key; -// net_rules = add(net_rules, sformat("SUBSYSTEM==\"net\", DRIVERS==\"?*\", %1, NAME=\"%2\"", GetItemUdev("ATTR{address}"), GetItemUdev("NAME"))); net_rules = add(net_rules, mergestring(Items[key, "udev", "net"]:[], ", ")); if (dev_name!=GetItemUdev("NAME")) { changed_devices = add(changed_devices, dev_name); @@ -503,19 +502,6 @@ } } - // build the "Bond Slaves" entry of rich box - if (type == "bond") - { -/* - string slaves = ""; - foreach (string key, any value, (map<string, any>)v, { - if ((value != nil) && (regexpmatch(key, "BONDING_SLAVE[0-9]"))) - slaves = slaves + ((slaves != "") ? ", " : "") + (string)value; - }); - if (slaves != "") - bullets = bullets + [_("Bond slaves")+ " : " + slaves]; -*/ - } if (type == "wlan" && !(NetworkInterfaces::Current["WIRELESS_AUTH_MODE"]:"" != "open") && !hasAnyValue(NetworkInterfaces::Current["WIRELESS_KEY_0"]:"")) @@ -645,14 +631,6 @@ // FIXME: devname hotplug = ""; - if(hotplug == "") { - // FIXME: MOD Module["module"] = hw["module"]:""; - // FIXME: MOD Module["options"] = hw["options"]:""; -// NetworkModules::Alias = hardware["module"]:""; -// NetworkModules::Options = hardware["options"]:""; - } - else - y2milestone("HOTPLUG(%1) -> ignoring modprobe.conf", hotplug); // Wireless Card Features wl_auth_modes = prepend(hardware["wl_auth_modes"]:nilliststring, "no-encryption"); @@ -956,91 +934,34 @@ } type = Items[current, "hwinfo", "type"]:"eth"; -// type = "eth0"; device = NetworkInterfaces::GetFreeDevice(type); - // FIXME: MOD AddModule(type); -// NetworkModules::AddM(); -// nm_name = NetworkModules::GetFreeName("static-"); // TODO: instead of udev use hwinfo dev_name NetworkInterfaces::Name = GetItemUdev("NAME"); if (size(Items)<current) Items[current] = $["ifcfg":NetworkInterfaces::Name]; else Items[current, "ifcfg"] = NetworkInterfaces::Name; -// interfacename = GetItemUdev()[1]:""; /* FIXME: alias: how to prefill new alias? */ alias = ""; -// } - /* dev!="" -> Edit */ -/* FIXME: NI: - else { - if(!CheckDevice(dev)) { - y2error("Device not found: %1", dev); - return false; - } - NetworkInterfaces::Edit(dev); - devmap = NetworkInterfaces::Current; - type = NetworkInterfaces::device_type(dev); - device = NetworkInterfaces::device_num(dev); - alias = NetworkInterfaces::alias_num(dev); - } -*/ /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); SetDeviceVars(devmap, SysconfigDefaults); hotplug = ""; - /* - if(issubstring(device, "bus-pcmcia")) - hotplug = "pcmcia"; - else if(issubstring(device, "bus-usb")) - hotplug = "usb"; - */ y2debug("type=%1", type); if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); - /* kernel options */ -// if(hotplug == "" && alias == "" && nm_name != "") { - // FIXME: MOD SelectModule(dev); -// NetworkModules::SelectM(nm_name); -// } -// else { - // FIXME: MOD SelectModule(""); -// NetworkModules::AddM(); -// } - -// qeth_options = NetworkModules::QETH_OPTIONS; -// chan_mode = NetworkModules::CCW_CHAN_MODE; -// lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; - -/* - if (NetworkModules::QETH_IPA_TAKEOVER == nil || - NetworkModules::QETH_IPA_TAKEOVER == "" || - NetworkModules::QETH_IPA_TAKEOVER == "0") - ipa_takeover = false; - else - ipa_takeover = true; - - if (NetworkModules::QETH_LAYER2_SUPPORT == nil || - NetworkModules::QETH_LAYER2_SUPPORT == "" || - NetworkModules::QETH_LAYER2_SUPPORT == "0") - qeth_layer2 = false; - else - qeth_layer2 = true; -*/ /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; } - //if(bootproto == "none") bootproto = "static"; - return true; } @@ -1086,77 +1007,6 @@ } newdev["NAME"] = description; if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type; -// if(unique != "" && unique != nil) newdev["udi"] = unique; -/* - if(hotplug == "") { - if(alias == "") { - // FIXME: MOD ChangeModule(NetworkInterfaces::device_name(type, device), operation == `add); - y2milestone("HWCFG name %1 (%2)", nm_name, nm_name_old); - if(hasAnyValue(nm_name) && operation == `edit && - hasAnyValue(nm_name_old) && nm_name != nm_name_old) { - y2milestone("HWCFG name change (%1) -> deleting old (%2)", nm_name, nm_name_old); - NetworkModules::DeleteM(nm_name_old); - nm_name_old = nil; - } - - if(Arch::s390 ()) { - string type2 = DriverType (type); - if(type2 == "iucv") { - NetworkModules::SCRIPTUP = "hwup-iucv"; - } - else { - NetworkModules::SCRIPTUP = "hwup-ccw"; - NetworkModules::SCRIPTUP_ccw = "hwup-ccw"; - NetworkModules::SCRIPTDOWN = "hwdown-ccw"; - NetworkModules::SCRIPTUP_ccwgroup = "hwup-" + type2; - } - - integer devid = 0; - string devstr = ""; - - y2milestone("nm_name=%1", nm_name); - string s390chanid = "[0-9]+\\.[0-9]+\\."; - if(regexpmatch(nm_name, s390chanid)) { - devid = tointeger("0x" + regexpsub(nm_name, s390chanid + "(.*)", "\\1")); - devstr = regexpsub(nm_name, ".*[^0-9](" + s390chanid + ").*", "\\1"); - } - - y2milestone("devid=%1(%2)", devid, devstr); - if(devid == nil) devid = 0; - string devid0 = String::PadZeros(regexpsub(tohexstring(devid), "0x(.*)", "\\1"), 4); - string devid1 = String::PadZeros(regexpsub(tohexstring(devid+1), "0x(.*)", "\\1"), 4); - string devid2 = String::PadZeros(regexpsub(tohexstring(devid+2), "0x(.*)", "\\1"), 4); - - if(type2 == "ctc" || type2 == "lcs") { - NetworkModules::CCW_CHAN_IDS = sformat("%1%2 %1%3", devstr, devid0, devid1); - NetworkModules::CCW_CHAN_MODE = chan_mode; - NetworkModules::CCW_CHAN_NUM = "2"; - NetworkModules::LCS_LANCMD_TIMEOUT = lcs_timeout; - } - else if(type2 == "qeth") { - NetworkModules::CCW_CHAN_IDS = sformat("%1%2 %1%3 %1%4", devstr, devid0, devid1, devid2); - NetworkModules::CCW_CHAN_MODE = chan_mode; - NetworkModules::CCW_CHAN_NUM = "3"; - NetworkModules::QETH_OPTIONS = qeth_options; - NetworkModules::QETH_IPA_TAKEOVER = ipa_takeover? "1": "0"; - NetworkModules::QETH_LAYER2_SUPPORT = qeth_layer2? "1": "0"; - if (qeth_layer2 && qeth_macaddress != "00:00:00:00:00:00") { - newdev["LLADDR"] = qeth_macaddress; - } - else { - // #151196: layer 3 otherwise fails - newdev["LLADDR"] = ""; - } - } - - } - - // If "", no hwcfg is created. See also #42421. - if (NetworkModules::ChangeM(nm_name)) Items[current, "hwcfg"]=nm_name; - else Items[current, "hwcfg"]=""; - } - } -*/ if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes"; @@ -1230,18 +1080,10 @@ newdev["WIRELESS_POWER"] = wl_power ? "yes" : "no"; } -// if(hasAnyValue(nm_name)) newdev["_nm_name"] = nm_name; - if(DriverType (type) == "ctc") if(NetworkConfig::Config["WAIT_FOR_INTERFACES"]:nil == nil || NetworkConfig::Config["WAIT_FOR_INTERFACES"]:0 < 40) NetworkConfig::Config["WAIT_FOR_INTERFACES"] = 40; - /* FIXME: MOD - if(DriverType (type) == "qeth") - if(NetworkConfig::Config["WAIT_FOR_INTERFACES"]:nil == nil || NetworkConfig::Config["WAIT_FOR_INTERFACES"]:0 < 15) - NetworkConfig::Config["WAIT_FOR_INTERFACES"] = 15; - */ - if(alias == "") { newdev["_aliases"] = aliases; y2milestone("aliases %1", aliases); @@ -1264,7 +1106,6 @@ y2error("Unknown operation: %1", operation); return false; } -// nm_name_old = nil; modified = true; operation = nil; return true; @@ -1404,30 +1245,6 @@ } else { // this is the first interface, match the hardware with install.inf -/* - // couldn't happen - if (size(InstallInf)>0){ - // Select the one from install.inf with the same MAC - // find H["mac"] == InstallInf["hwaddr"] - if (tosel == nil ) { - string hwaddr = InstallInf["hwaddr"]:""; - if(hwaddr != nil && hwaddr != "") { - tosel = find (map h, Hardware, ``( h["mac"]:"" == hwaddr )); - } - y2milestone("Rule: matching hwaddr in install.inf"); - } - - // Select the one from install.inf with the same module - // find H["module"] == InstallInf["module"] - if (tosel == nil) { - string infmodule = InstallInf["module"]:""; - if(infmodule != nil && infmodule != "") { - tosel = find (map h, Hardware, ``( h["module"]:"" == infmodule )); - } - y2milestone("Rule: matching module in install.inf"); - } - } else -*/ { /* No install.inf -> select the first connected */ // find H["active"] == true @@ -1496,9 +1313,6 @@ if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(getCurrentItem()["ifcfg"]:""); device = getCurrentItem()["ifcfg"]:""; alias = NetworkInterfaces::alias_num(getCurrentItem()["ifcfg"]:""); -// nm_name = Items[current, "hwcfg"]:""; -// if (nm_name=="") nm_name_old = createHwcfgName(Items[current, "hwinfo"]:$[], type); -// NetworkModules::SelectM(nm_name); /* general stuff */ description = BuildDescription (type, device, devmap, Hardware); @@ -1512,35 +1326,6 @@ if(issubstring(type, "-")) type = regexpsub(type, "([^-]+)-.*$", "\\1"); y2debug("type=%1", type); - /* kernel options */ - if(hotplug == "" && alias == "" && nm_name != "") { - // FIXME: MOD SelectModule(dev); -// NetworkModules::SelectM(nm_name); - } - else { - // FIXME: MOD SelectModule(""); -// NetworkModules::AddM(); - } - -/* - qeth_options = NetworkModules::QETH_OPTIONS; - chan_mode = NetworkModules::CCW_CHAN_MODE; - lcs_timeout = NetworkModules::LCS_LANCMD_TIMEOUT; - - if (NetworkModules::QETH_IPA_TAKEOVER == nil || - NetworkModules::QETH_IPA_TAKEOVER == "" || - NetworkModules::QETH_IPA_TAKEOVER == "0") - ipa_takeover = false; - else - ipa_takeover = true; - - if (NetworkModules::QETH_LAYER2_SUPPORT == nil || - NetworkModules::QETH_LAYER2_SUPPORT == "" || - NetworkModules::QETH_LAYER2_SUPPORT == "0") - qeth_layer2 = false; - else - qeth_layer2 = true; -*/ /* We always have to set the MAC Address for qeth Layer2 support */ if (qeth_layer2 ) { qeth_macaddress = devmap["LLADDR"]:"00:00:00:00:00:00"; @@ -1564,7 +1349,6 @@ } NetworkInterfaces::Add(); operation = `edit; -// interfacename=getCurrentItem()["hwinfo", "dev_name"]:""; Items[current, "ifcfg"]=getCurrentItem()["hwinfo", "dev_name"]:""; description = HardwareName([getCurrentItem()["hwinfo"]:$[]], getCurrentItem()["hwinfo", "dev_name"]:""); Commit (); @@ -1596,13 +1380,6 @@ case "qeth": case "hsi": string portnumber_param = (size(qeth_portnumber)>0) ? sformat("-n %1", qeth_portnumber) : ""; -/* - if (size(chan_mode)>0) - // chan_ids (read, write, control), port - command1=sformat("qeth_configure %1 -p %2 %3 %4 1", qeth_layer2?"-l":"", chan_mode, portnumber_param, qeth_chanids); - else - command1=sformat("qeth_configure %1 %2 %3 1", qeth_layer2?"-l":"", portnumber_param, qeth_chanids); -*/ string portname_param=(size(chan_mode)>0) ? sformat("-p %1", chan_mode) : ""; string options_param=(size(qeth_options)>0) ? sformat("-o %1", qeth_options) : ""; command1=sformat("qeth_configure %1 %2 %3 %4 %5 1", options_param, qeth_layer2?"-l":"", portname_param, portnumber_param, qeth_chanids); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/modules/Lan.ycp new/yast2-network-2.18.15/src/modules/Lan.ycp --- old/yast2-network-2.18.13/src/modules/Lan.ycp 2009-02-23 12:09:45.000000000 +0100 +++ new/yast2-network-2.18.15/src/modules/Lan.ycp 2009-03-02 14:58:44.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 55669 2009-02-23 11:09:44Z mzugec $ + * $Id: Lan.ycp 55847 2009-03-02 13:58:43Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -86,28 +86,6 @@ global block<boolean> AbortFunction = nil; - -/*--------------*/ -/* PRIVATE DATA */ - - - -/** - * Modules information - * @see ReadModules - */ -// FIXME: MOD map Modules = $[]; - -/** - * Deleted modules - */ -// FIXME: MOD list<string> DeletedModules = []; - - -// FIXME: used in lan/address.ycp (#17346) -> "global" - - - /*------------------*/ /* GLOBAL FUNCTIONS */ @@ -137,7 +115,6 @@ map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { -// string confname = NetworkInterfaces::device_name(devtype, devnum); string mac = ((map<string, any>)SCR::Execute(.target.bash_output, sformat("cat /sys/class/net/%1/address|tr -d '\n'", devname)))["stdout"]:""; y2milestone("confname %1", mac); if (!haskey(link_status, mac)) y2error("Mac address %1 not found in map %2!", mac, link_status); @@ -151,14 +128,6 @@ } - - -//include "network/hardware.ycp"; -//include "network/install.ycp"; -//include "network/routines.ycp"; -//include "network/runtime.ycp"; - - /** * Lan::Read (`cache) will do nothing if initialized already. */ @@ -334,7 +303,6 @@ global define boolean Write() { y2milestone("Writing configuration"); -// if(!write_only && NetHwDetection::running) NetHwDetection::Stop(); /* Stop the detection */ if(!LanItems::modified) { @@ -439,7 +407,6 @@ if(Abort()) return false; /* Progress step 9 */ ProgressNextStage(_("Activating network services...")); -// NetworkModules::HwUp (); // during installation export sysconfig settings into NetworkManager (bnc#433084) if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections")); @@ -485,7 +452,6 @@ else if(Service::Status("network")==0){ Service::Reload("network"); } else Service::Restart("network"); -// NetworkService::StartStop (); sleep(sl); } @@ -691,10 +657,8 @@ * @return true if success */ global define boolean Add() { -// LanItems::operation = nil; if(LanItems::Select("") != true) return false; NetworkInterfaces::Add(); -// LanItems::AddNew(); return true; } @@ -893,144 +857,6 @@ -// Add(); - -// map tosel = nil; - - /* Some HW found -> use it for proposal */ -// if(size(LanItems::Hardware) > 0) { -// if (Arch::s390()){ -// tosel = FindMatchingDevice( $["device":sformat("%1-id-%2",InstallInf["module"]:"", InstallInf["hwaddr"]:"")] ); -// } -// else -// tosel = LanItems::FindMatchingDevice($[]); - -// } - - -// y2debug("Hardware=%1", LanItems::Hardware); -// y2milestone ("Selected HW w/o install.inf patches: %1", tosel); - -/* - // do not select a card without a driver, #29296 - if (tosel != nil) - { - // L3 N#81533 - // Autoyast takes network config from install.inf, has - // problem with hardware that has a choice of drivers: - // Module A is used even though install.inf says module B. - // It is because we selected the _hardware_ and then took - // the first module. - // Future: select hardware+driver together - // CODE 9 fix: for the selected hardware, patch in the driver - - // We cannot simply _create_ tosel from install.inf data because - // SelectHW relies on the detected info (eg. busid) from hwinfo - // which is not in install.inf - - - if (InstallInf["module"]:"" != "") - { - y2milestone ("Using driver module from install.inf"); - tosel["module"] = InstallInf["module"]:""; - } - // L3 bug: 75720 - // Setup module options available from /etc/install.inf - string _options = InstallModuleOptions(tosel["module"]:""); - if (_options != "" && _options!=nil) { - y2milestone ("Using driver options from install.inf"); - tosel["options"] = _options; - } - - y2milestone ("Selected HW with install.inf patches: %1", tosel); - SelectHWMap(tosel); - // set layer2 status from /etc/install.inf - qeth_layer2 = (InstallInf["QETH_LAYER2_SUPPORT"]:"0"=="1")?true:false; - qeth_macaddress = InstallInf["LLADDR"]:""; - } - // Nothing detected -> use InstallInf - - else if(size(InstallInf) > 0) { - - if(!haskey(InstallInf, "module")) { - y2milestone("No hardware, no install.inf module -> no proposal."); - return false; - } - - // FIXME: MOD Module["module"] = InstallInf["module"]:""; - // FIXME: MOD Module["options"] = InstallInf["options"]:""; - - NetworkModules::Alias = InstallInf["module"]:""; - NetworkModules::Options = InstallInf["options"]:""; - - - type = InstallInf["type"]:"eth"; - device = NetworkInterfaces::GetFreeDevice(type); - } - - else { - y2milestone("No hardware, no install.inf -> no proposal."); - return false; - } -*/ - -// here we know the hardware and could fill the interface defaults for it, -// like for wifi usercontrol and for eth|wifi ifplugd. -// This is proposal. also need to do it with -// - add from ui: detected and undetected -// - autoyast -// LanItems::SetDefaultsForHW (); - - // #145041 -// ethtool_options = InstallInf["ethtool_options"]:""; - - // #176804 -/* - if (NetworkStorage::isDiskOnNetwork ( NetworkStorage::getDevice("/") )) - { - LanItems::startmode = "nfsroot"; - y2milestone ("startmode nfsroot"); - } -*/ -// ipaddr = InstallInf["ipaddr"]:""; -// bootproto = InstallInf["bootproto"]:"static"; -// y2debug("ipaddr,bootproto=%1,%2", LanItems::ipaddr, LanItems::bootproto); -// if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) { - -// y2milestone("static proposal"); - - /* propose address setup from /etc/install.inf */ -// netmask = InstallInf["netmask"]:""; -// if(LanItems::netmask == nil || LanItems::netmask == "") -// LanItems::netmask = "255.255.255.0"; -// } -// else { - /* Propose static config in case of DSL hardware is found */ -// list pppoe = (list) SCR::Read(.probe.pppoe); - // FIXME: testing pppoe = [ $["a" : "b"] ]; -// map pppoedev = pppoe[0]:$[]; -// y2milestone ("pppoe=%1", pppoe); -// if(pppoe != nil && size(pppoe) > 0) { -// y2milestone("DSL proposal"); -// LanItems::ipaddr = ""; -// LanItems::bootproto = "static"; -// } -// else { - // Open Enterprise Server does not like DHCP (#50524). - // In that case, we cannot propose. -// if (ProductFeatures::GetBooleanFeature ("network", "force_static_ip")) -// { -// y2milestone ("Static config forced but no info available -> no proposal."); -// return false; -// } -// y2milestone("DHCP proposal"); -// LanItems::ipaddr = ""; -// LanItems::bootproto = "dhcp"; -// } -// } - -// LanItems::Commit(); - y2milestone("NetworkConfig::Config=%1", NetworkConfig::Config); y2milestone("NetworkConfig::DHCP=%1", NetworkConfig::DHCP); @@ -1049,31 +875,7 @@ return false; } -/* - y2milestone ("hostname from install.inf"); - if (! DNS::ReadHostDomain (InstallInf["hostname"]:"", - InstallInf["domain"]:"")) - { - y2milestone ("hostname from dns"); - // try to get hostname from the network - string hnent = NetHwDetection::ResolveIP(ipaddr); - - //last resort - generate random hostname (#165269) - if (hnent == "") - { - y2milestone("random hostname"); - srandom (); - DNS::ReadHostDomain("linux-" + String::Random(4), "site"); - } - else - { - list hnsplit = Hostname::SplitFQ(hnent); - DNS::ReadHostDomain (hnsplit[0]:"", hnsplit[1]:""); - } - - } -*/ - return true; + return true; } /** @@ -1082,11 +884,6 @@ */ global define boolean ProposeRoutesAndResolver () { if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) { - /* propose default gateway from /etc/install.inf */ -// Routing::ReadFromGateway (InstallInf["gateway"]:""); - - /* propose DNS setup from /etc/install.inf */ -// DNS::ReadNameserver (InstallInf["nameserver"]:""); ProposeHostname (); } return true; @@ -1097,8 +894,8 @@ * @return true if something was proposed */ global define boolean Propose() { -NetworkInterfaces::CleanCacheRead(); -LanItems::Read(); + NetworkInterfaces::CleanCacheRead(); + LanItems::Read(); return ProposeInterfaces () && ProposeRoutesAndResolver (); @@ -1140,24 +937,9 @@ aymodule["module"]:"" : tosel["module"]:""; tosel["options"] = (aymodule["options"]:""!= "")? aymodule["options"]:"" : tosel["options"]:""; - - LanItems::SelectHWMap(tosel); - } - /* Nothing detected -> use InstallInf */ -/* - else if(size(InstallInf) > 0) { - if(!haskey(InstallInf, "module")) { - y2milestone("No hardware, no install.inf module -> no proposal."); - return false; - } - NetworkModules::Alias = InstallInf["module"]:""; - NetworkModules::Options = InstallInf["options"]:""; - -// type = InstallInf["type"]:"eth"; - device = NetworkInterfaces::GetFreeDevice(type); + LanItems::SelectHWMap(tosel); } -*/ else { y2milestone("No hardware, no install.inf -> no autoinstallation possible."); return false; @@ -1179,14 +961,14 @@ LanItems::SetDeviceVars(interface, defaults); y2debug("ipaddr,bootproto=%1,%2", LanItems::ipaddr, LanItems::bootproto); - if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) + if(LanItems::bootproto == "static" && LanItems::ipaddr != "" && LanItems::ipaddr != nil) { y2milestone("static configuration"); if(LanItems::netmask == nil || LanItems::netmask == "") LanItems::netmask = "255.255.255.0"; - + } LanItems::Commit(); }); @@ -1251,13 +1033,6 @@ */ global list<string> Packages () { list<string> pkgs = []; - // #299033 - don't install smpppd now, do it later (with some tests) -/* - if (NetworkInterfaces::Locate ("USERCONTROL", "yes") != []) - { - if (!PackageSystem::Installed("smpppd")) pkgs = add (pkgs, "smpppd"); - } -*/ map<string, any> required = $[ "types":$[ "wlan" : "wireless-tools", @@ -1318,13 +1093,6 @@ global define boolean HaveXenBridge () { // changed xen bridge detection (bnc#375606) boolean have_br = FileUtils::Exists("/dev/shm/sysconfig/xenbridges"); - // #2248874 - disallow error message -/* - if (PackageSystem::Installed("bridge-utils")){ - string cmd = "brctl show | grep '^xenbr'"; - have_br = SCR::Execute (.target.bash, cmd) == 0; - } -*/ y2milestone ("Have Xen bridge: %1", have_br); return have_br; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/modules/Routing.ycp new/yast2-network-2.18.15/src/modules/Routing.ycp --- old/yast2-network-2.18.13/src/modules/Routing.ycp 2009-01-13 08:58:37.000000000 +0100 +++ new/yast2-network-2.18.15/src/modules/Routing.ycp 2009-03-03 14:48:47.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Routing data (/etc/sysconfig/network/routes) * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Routing.ycp 54553 2009-01-12 15:42:35Z kmachalkova $ + * $Id: Routing.ycp 55885 2009-03-03 13:48:46Z mzugec $ * * See routes(5) * Does not work with interface-specific routes yet (ifroute-lo...) @@ -156,11 +156,15 @@ if(Forward) { SCR::Write(.sysconfig.sysctl.IP_FORWARD, "yes"); + SCR::Write(.sysconfig.sysctl.IPV6_FORWARD, "yes"); SCR::Execute(.target.bash, "echo 1 > /proc/sys/net/ipv4/ip_forward"); + SCR::Execute(.target.bash, "echo 1 > /proc/sys/net/ipv6/conf/all/forwarding"); } else { SCR::Write(.sysconfig.sysctl.IP_FORWARD, "no"); + SCR::Write(.sysconfig.sysctl.IPV6_FORWARD, "no"); SCR::Execute(.target.bash, "echo 0 > /proc/sys/net/ipv4/ip_forward"); + SCR::Execute(.target.bash, "echo 0 > /proc/sys/net/ipv6/conf/all/forwarding"); } sleep(sl); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/src/routines/summary.ycp new/yast2-network-2.18.15/src/routines/summary.ycp --- old/yast2-network-2.18.13/src/routines/summary.ycp 2008-01-24 14:41:27.000000000 +0100 +++ new/yast2-network-2.18.15/src/routines/summary.ycp 2009-03-02 14:58:44.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Summary and overview functions * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: summary.ycp 43483 2008-01-08 17:49:13Z mzugec $ + * $Id: summary.ycp 55847 2009-03-02 13:58:43Z mzugec $ * * All config settings are stored in a global variable Devices. * All hardware settings are stored in a global variable Hardware. @@ -114,48 +114,6 @@ } -/* - list overviewdev = [ - `item(`id(0), "0", "ISDN", "ippp0", "Hisax ISDN"), - ]; - list overviewif = [ - `item(`id(0), "0", "ippp", "Contactel", "1.2.3.4", "4.3.2.1"), - `item(`id(1), "1", "ippp", "Czech Online", "1.2.3.6", "6.3.2.1"), - ]; - - y2debug("overviewdev=%1", overviewdev); - y2debug("overviewif=%1", overviewif); - - import "Wizard"; - import "Label"; - Wizard::CreateDialog(); - term contents = nil; - - contents = OverviewTable( - `header(_("No."), _("Type"), _("Device"), _("Hardware")), - overviewdev - ); - - Wizard::SetContentsButtons("Network cards configuration overview", contents, "helptext", - Label::BackButton(), Label::FinishButton()); - - UI::UserInput(); - - contents = OverviewTableDouble( - "ISDN devices", - `header(_("No."), _("Type"), _("Device"), _("Hardware")), - overviewdev, - "Providers", - `header(_("No."), _("Type"), _("Connection"), _("IP"), _("Remote IP")), - overviewif - ); - - Wizard::SetContentsButtons("ISDN configuration overview", contents, "helptext", - Label::BackButton(), Label::FinishButton()); - - UI::UserInput(); - -*/ /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.18.13/VERSION new/yast2-network-2.18.15/VERSION --- old/yast2-network-2.18.13/VERSION 2009-03-02 09:19:17.000000000 +0100 +++ new/yast2-network-2.18.15/VERSION 2009-03-03 14:47:16.000000000 +0100 @@ -1 +1 @@ -2.18.13 +2.18.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-libX11 for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package xorg-x11-libX11 for openSUSE:Factory checked in at Tue Mar 3 22:47:58 CET 2009. -------- --- xorg-x11-libX11/xorg-x11-libX11.changes 2009-03-03 12:20:05.000000000 +0100 +++ xorg-x11-libX11/xorg-x11-libX11.changes 2009-03-03 18:09:46.133789461 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 18:09:23 CET 2009 - sndirsch(a)suse.de + +- fixed and reenabled scim_swallow.diff (bnc #434865) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libX11.spec ++++++ --- /var/tmp/diff_new_pack.yX3394/_old 2009-03-03 22:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.yX3394/_new 2009-03-03 22:46:23.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: coreutils Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 8 +Release: 9 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -130,7 +130,7 @@ %patch15 -p0 %patch17 -p0 %patch18 -p0 -#%patch19 -p1 +%patch19 -p1 %build autoreconf -fi @@ -203,6 +203,8 @@ %changelog * Tue Mar 03 2009 sndirsch(a)suse.de +- fixed and reenabled scim_swallow.diff (bnc #434865) +* Tue Mar 03 2009 sndirsch(a)suse.de - redone scim_swallow.diff (replaces scim_swallow1.diff/ scim_swallow2.diff); disabled for now since it breaks scim completely ++++++ scim_swallow.diff ++++++ --- /var/tmp/diff_new_pack.yX3394/_old 2009-03-03 22:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.yX3394/_new 2009-03-03 22:46:23.000000000 +0100 @@ -1,8 +1,19 @@ -diff --git a/modules/im/ximcp/imDefFlt.c b/modules/im/ximcp/imDefFlt.c -index 685d515..fb12869 100644 ---- a/modules/im/ximcp/imDefFlt.c -+++ b/modules/im/ximcp/imDefFlt.c -@@ -143,13 +143,11 @@ _XimProtoKeypressFilter( +diff -r -u libX11-1.2.orig/modules/im/ximcp/imDefFlt.c libX11-1.2/modules/im/ximcp/imDefFlt.c +--- libX11-1.2.orig/modules/im/ximcp/imDefFlt.c 2009-02-17 16:09:41.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imDefFlt.c 2009-03-03 17:38:16.000000000 +0100 +@@ -131,9 +131,9 @@ + { + Xim im = (Xim)ic->core.im; + +- if (IS_NEED_SYNC_REPLY(ic)) { ++ if (IS_NEED_SYNC_REPLY(im)) { + (void)_XimProcSyncReply(im, ic); +- UNMARK_NEED_SYNC_REPLY(ic); ++ UNMARK_NEED_SYNC_REPLY(im); + } + return; + } +@@ -143,13 +143,11 @@ Xic ic, XKeyEvent *ev) { @@ -18,7 +29,7 @@ return NOTFILTERD; } -@@ -206,13 +204,11 @@ _XimProtoKeyreleaseFilter( +@@ -206,13 +204,11 @@ Xic ic, XKeyEvent *ev) { @@ -34,11 +45,10 @@ return NOTFILTERD; } -diff --git a/modules/im/ximcp/imDefIc.c b/modules/im/ximcp/imDefIc.c -index 36ab101..dc1277f 100644 ---- a/modules/im/ximcp/imDefIc.c -+++ b/modules/im/ximcp/imDefIc.c -@@ -949,8 +949,6 @@ _XimProtoSetFocus( +diff -r -u libX11-1.2.orig/modules/im/ximcp/imDefIc.c libX11-1.2/modules/im/ximcp/imDefIc.c +--- libX11-1.2.orig/modules/im/ximcp/imDefIc.c 2009-02-17 16:09:41.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imDefIc.c 2009-03-03 15:32:40.000000000 +0100 +@@ -949,8 +949,6 @@ (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); @@ -47,7 +57,7 @@ _XimRegisterFilter(ic); return; } -@@ -996,8 +994,6 @@ _XimProtoUnsetFocus( +@@ -996,8 +994,6 @@ (void)_XimWrite(im, len, (XPointer)buf); _XimFlush(im); @@ -56,13 +66,11 @@ _XimUnregisterFilter(ic); return; } -diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c -index 7909e93..05be238 100644 -diff --git a/modules/im/ximcp/imExten.c b/modules/im/ximcp/imExten.c -index ea598e3..7eff6eb 100644 ---- a/modules/im/ximcp/imExten.c -+++ b/modules/im/ximcp/imExten.c -@@ -162,7 +162,7 @@ _XimProcExtForwardKeyEvent( +diff -r -u libX11-1.2.orig/modules/im/ximcp/imDefLkup.c libX11-1.2/modules/im/ximcp/imDefLkup.c +diff -r -u libX11-1.2.orig/modules/im/ximcp/imExten.c libX11-1.2/modules/im/ximcp/imExten.c +--- libX11-1.2.orig/modules/im/ximcp/imExten.c 2009-02-17 16:09:41.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imExten.c 2009-03-03 15:32:40.000000000 +0100 +@@ -162,7 +162,7 @@ XPutBackEvent(im->core.display, &ev); _XimRespSyncReply(ic, buf_s[0]); @@ -71,11 +79,10 @@ return True; } -diff --git a/src/xlibi18n/XimintP.h b/src/xlibi18n/XimintP.h -index bb99313..d51b85b 100644 ---- a/src/xlibi18n/XimintP.h -+++ b/src/xlibi18n/XimintP.h -@@ -144,6 +144,8 @@ typedef struct _XimProtoPrivateRec { +diff -r -u libX11-1.2.orig/src/xlibi18n/XimintP.h libX11-1.2/src/xlibi18n/XimintP.h +--- libX11-1.2.orig/src/xlibi18n/XimintP.h 2009-02-17 16:09:41.000000000 +0100 ++++ libX11-1.2/src/xlibi18n/XimintP.h 2009-03-03 15:32:40.000000000 +0100 +@@ -144,6 +144,8 @@ #define DELAYBINDABLE (1L << 3) #define RECONNECTABLE (1L << 4) #endif /* XIM_CONNECTABLE */ @@ -84,7 +91,7 @@ /* * macro for the flag of XIMPrivateRec -@@ -182,6 +184,20 @@ typedef struct _XimProtoPrivateRec { +@@ -182,6 +184,20 @@ (((Xim)im)->private.proto.flag &= ~(DELAYBINDABLE|RECONNECTABLE)) #endif /* XIM_CONNECTABLE */ @@ -105,7 +112,7 @@ /* * bit mask for the register_filter_event of XIMPrivateRec/XICPrivateRec */ -@@ -242,9 +258,6 @@ typedef struct _XicProtoPrivateRec { +@@ -242,9 +258,6 @@ * bit mask for the flag of XICPrivateRec */ #define IC_CONNECTED (1L) @@ -115,7 +122,7 @@ /* * macro for the flag of XICPrivateRec -@@ -256,27 +269,6 @@ typedef struct _XicProtoPrivateRec { +@@ -256,27 +269,6 @@ #define UNMARK_IC_CONNECTED(ic) \ (((Xic)ic)->private.proto.flag &= ~IC_CONNECTED) @@ -143,8 +150,8 @@ /* * macro for the filter_event_mask of XICPrivateRec */ ---- libX11-1.2/modules/im/ximcp/imDefLkup.c.orig 2009-03-03 11:59:48.000000000 +0100 -+++ libX11-1.2/modules/im/ximcp/imDefLkup.c 2009-03-03 12:04:07.000000000 +0100 +--- libX11-1.2/modules/im/ximcp/imDefLkup.c.orig 2009-03-03 18:11:06.000000000 +0100 ++++ libX11-1.2/modules/im/ximcp/imDefLkup.c 2009-03-03 18:14:59.000000000 +0100 @@ -216,12 +216,8 @@ _XimRespSyncReply( Xic ic, BITMASK16 mode) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tar for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package tar for openSUSE:Factory checked in at Tue Mar 3 22:46:15 CET 2009. -------- --- tar/tar.changes 2009-02-11 10:44:59.000000000 +0100 +++ tar/tar.changes 2009-03-03 14:50:35.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 14:49:58 CET 2009 - pth(a)suse.de + +- Recognize .xz as lzma archive. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- tar-recognize_xz.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar.spec ++++++ --- /var/tmp/diff_new_pack.c32627/_old 2009-03-03 22:45:14.000000000 +0100 +++ /var/tmp/diff_new_pack.c32627/_new 2009-03-03 22:45:14.000000000 +0100 @@ -27,7 +27,7 @@ PreReq: %install_info_prereq AutoReqProv: on Version: 1.21 -Release: 1 +Release: 2 Summary: GNU implementation of tar ((t)ape (ar)chiver) Source0: %name-%version.tar.bz2 # merged @@ -38,6 +38,7 @@ Patch1: tar-disable-listed02-test.diff Patch2: tar-manpage.patch Patch3: tar-wildcards.patch +Patch4: tar-recognize_xz.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: xz Requires: tar-lang = %version @@ -80,6 +81,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 %build rm -f po/no.* po/ky.* @@ -122,6 +124,8 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 03 2009 pth(a)suse.de +- Recognize .xz as lzma archive. * Wed Feb 11 2009 coolo(a)suse.de - update to version 1.21 * New short option -J - A shortcut for --lzma. ++++++ tar-recognize_xz.patch ++++++ --- src/suffix.c +++ src/suffix.c @@ -40,6 +40,7 @@ { S(lzma, lzma) }, { S(tlz, lzma) }, { S(lzo, lzop) }, + { S(xz, lzma) }, #undef S }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pingus for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package pingus for openSUSE:Factory checked in at Tue Mar 3 22:45:07 CET 2009. -------- --- pingus/pingus.changes 2007-11-30 13:12:04.000000000 +0100 +++ pingus/pingus.changes 2009-03-03 03:43:58.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 3 03:43:49 CET 2009 - crrodriguez(a)suse.de + +- fix buildrequires + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pingus.spec ++++++ --- /var/tmp/diff_new_pack.p30599/_old 2009-03-03 22:44:36.000000000 +0100 +++ /var/tmp/diff_new_pack.p30599/_new 2009-03-03 22:44:36.000000000 +0100 @@ -1,24 +1,32 @@ # # spec file for package pingus (Version 0.7.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: pingus BuildRequires: coreutils gcc-c++ scons update-desktop-files -BuildRequires: SDL-devel SDL_image-devel SDL_mixer-devel boost-devel +BuildRequires: SDL_image-devel SDL_mixer-devel boost-devel libpng-devel License: GPL v2 or later Group: Amusements/Games/Action/Arcade Url: http://pingus.seul.org/ AutoReqProv: on Version: 0.7.2 -Release: 1 +Release: 112 Summary: A Lemmings Clone Source: %{name}-%{version}.tar.bz2 Source2: %{name}.desktop @@ -70,7 +78,9 @@ %{_datadir}/pixmaps/%{name}.png %changelog -* Fri Nov 30 2007 - prusnak(a)suse.cz +* Tue Mar 03 2009 crrodriguez(a)suse.de +- fix buildrequires +* Fri Nov 30 2007 prusnak(a)suse.cz - update to 0.7.2 * added support for levelsets * added 8 new levels in the form of a halloween levelset @@ -82,9 +92,9 @@ * numerous other small bug fixes - removed obsoleted patch * stdlib_string.patch (included in update) -* Thu Oct 18 2007 - prusnak(a)suse.cz +* Thu Oct 18 2007 prusnak(a)suse.cz - added missing include (stdlib_string.patch) -* Tue Oct 09 2007 - prusnak(a)suse.cz +* Tue Oct 09 2007 prusnak(a)suse.cz - update to 0.7.1 * faster sprite drawing, so more overall fps * level editor rewritten from scratch @@ -94,7 +104,7 @@ * input subsystem rewritten from scratch, supports now gamepads, usbmice, wiimote (some of those might unfinished and not enabled by default) -* Tue Sep 04 2007 - prusnak(a)suse.cz +* Tue Sep 04 2007 prusnak(a)suse.cz - updated to 0.7.0 (first SDL version) * switch from ClanLib to SDL * new anti-aliased fonts @@ -106,103 +116,103 @@ * level editor temporarly removed * a little less fps then the ClanLib version * no new levels or other main features -* Wed Jun 06 2007 - prusnak(a)suse.cz +* Wed Jun 06 2007 prusnak(a)suse.cz - modified Makefile.in to accept DESTDIR (destdir.patch) - cleaned spec file -* Fri Apr 13 2007 - ro(a)suse.de +* Fri Apr 13 2007 ro(a)suse.de - added libmikmod-devel to buildreq -* Tue Sep 12 2006 - dmueller(a)suse.de +* Tue Sep 12 2006 dmueller(a)suse.de - don't set -save-temps in a spec file -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Apr 20 2005 - nadvornik(a)suse.de +* Wed Apr 20 2005 nadvornik(a)suse.de - fixed to compile with gcc4 -* Tue Nov 09 2004 - sndirsch(a)suse.de +* Tue Nov 09 2004 sndirsch(a)suse.de - pingus-snow11.diff: fixed wrong level description (Bug #47953) -* Wed Jul 21 2004 - schwab(a)suse.de +* Wed Jul 21 2004 schwab(a)suse.de - Fix use of size_type. -* Sat Jan 10 2004 - adrian(a)suse.de +* Sat Jan 10 2004 adrian(a)suse.de - add %%defattr -* Tue Sep 23 2003 - sndirsch(a)suse.de +* Tue Sep 23 2003 sndirsch(a)suse.de - fixed category; should be Arcade instead of Puzzle (Bug #31608) -* Wed Sep 03 2003 - adrian(a)suse.de +* Wed Sep 03 2003 adrian(a)suse.de - disable KDE wait cursor blinking on startup -* Sat Aug 30 2003 - sndirsch(a)suse.de +* Sat Aug 30 2003 sndirsch(a)suse.de - added desktop icon -* Sun Aug 10 2003 - sndirsch(a)suse.de +* Sun Aug 10 2003 sndirsch(a)suse.de - added desktop file -* Wed May 14 2003 - ro(a)suse.de +* Wed May 14 2003 ro(a)suse.de - run autoreconf -* Mon Apr 21 2003 - sndirsch(a)suse.de +* Mon Apr 21 2003 sndirsch(a)suse.de - updated to version 0.6 - announced as first playable version! -* Tue Feb 25 2003 - aj(a)suse.de +* Tue Feb 25 2003 aj(a)suse.de - Add missing assert include. -* Tue Feb 11 2003 - nadvornik(a)suse.cz +* Tue Feb 11 2003 nadvornik(a)suse.cz - added install_info macros -* Thu Nov 21 2002 - ro(a)suse.de +* Thu Nov 21 2002 ro(a)suse.de - removed duplicates in output files of configure.in -* Tue Nov 05 2002 - ro(a)suse.de +* Tue Nov 05 2002 ro(a)suse.de - use correct include path for libxml -* Sat Jun 01 2002 - ro(a)suse.de +* Sat Jun 01 2002 ro(a)suse.de - changed neededforbuild <libmikmo> to <libmikmod> -* Tue May 07 2002 - ro(a)suse.de +* Tue May 07 2002 ro(a)suse.de - make it compile with current gcc-3.1 snapshot -* Tue May 07 2002 - ro(a)suse.de +* Tue May 07 2002 ro(a)suse.de - added <libmikmo> <DirectFB> to neededforbuild -* Fri Apr 12 2002 - ro(a)suse.de +* Fri Apr 12 2002 ro(a)suse.de - build with gcc-3.1 -* Fri Feb 01 2002 - ro(a)suse.de +* Fri Feb 01 2002 ro(a)suse.de - changed neededforbuild <libpng> to <libpng-devel-packages> -* Thu Jan 24 2002 - ro(a)suse.de +* Thu Jan 24 2002 ro(a)suse.de - up to pre3 to make it build with latest clanlib - (doesn't seem to use artsd at all anyway ...) -* Tue Jan 22 2002 - ro(a)suse.de +* Tue Jan 22 2002 ro(a)suse.de - changed neededforbuild <kdelibs-artsd> to <kdelibs3-artsd> -* Tue Nov 20 2001 - nadvornik(a)suse.cz +* Tue Nov 20 2001 nadvornik(a)suse.cz - added suse_update_config -* Sat Sep 22 2001 - sndirsch(a)suse.de +* Sat Sep 22 2001 sndirsch(a)suse.de - RPM Group tag set to Amusements/Games, so it can be found easier -* Wed Aug 29 2001 - sndirsch(a)suse.de +* Wed Aug 29 2001 sndirsch(a)suse.de - added pingus.sh -* Wed Aug 08 2001 - ro(a)suse.de +* Wed Aug 08 2001 ro(a)suse.de - changed neededforbuild <sdl> to <SDL> - changed neededforbuild <sdl-devel> to <SDL-devel> -* Mon Jul 30 2001 - nadvornik(a)suse.cz +* Mon Jul 30 2001 nadvornik(a)suse.cz - update to 0.5.0pre2 -* Mon Oct 09 2000 - nadvornik(a)suse.cz +* Mon Oct 09 2000 nadvornik(a)suse.cz - fixed Copyright -* Thu Apr 13 2000 - nadvornik(a)suse.cz +* Thu Apr 13 2000 nadvornik(a)suse.cz - added BuildRoot -* Fri Feb 18 2000 - sndirsch(a)suse.de +* Fri Feb 18 2000 sndirsch(a)suse.de - updated to release 0.3.1 -* Wed Feb 09 2000 - sndirsch(a)suse.de +* Wed Feb 09 2000 sndirsch(a)suse.de - changed group tag -* Thu Jan 20 2000 - sndirsch(a)suse.de +* Thu Jan 20 2000 sndirsch(a)suse.de - moved /usr/man/*,/usr/info/* to /usr/share/man and /usr/share/info -* Tue Jan 04 2000 - sndirsch(a)suse.de +* Tue Jan 04 2000 sndirsch(a)suse.de - update to release 0.3.0a -* Mon Jan 03 2000 - sndirsch(a)suse.de +* Mon Jan 03 2000 sndirsch(a)suse.de - adjusted to new clanlib package -* Thu Dec 23 1999 - sndirsch(a)suse.de +* Thu Dec 23 1999 sndirsch(a)suse.de - updated to pingus 0.2.4, ClanLib 0.2.3 and Hermes 1.2.6 - removed OpenPTC, SVGALIB, FBDEV and GLX support (never worked) - now only the necessary files are included -* Sun Oct 03 1999 - sndirsch(a)suse.de +* Sun Oct 03 1999 sndirsch(a)suse.de - updated to pingus 0.2.3 and ClanLib 0.1.19 - the patch against ClanLib is not required any more -* Mon Sep 13 1999 - bs(a)suse.de +* Mon Sep 13 1999 bs(a)suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Mon Aug 30 1999 - ro(a)suse.de +* Mon Aug 30 1999 ro(a)suse.de - asm parts only used on x86 - no sa_restorer on alpha -* Fri Jul 16 1999 - sndirsch(a)suse.de +* Fri Jul 16 1999 sndirsch(a)suse.de - updated pingus sources to version 0.1.1, now there are 5 levels playable - updated OpenPTC sources to version 1.0.0-2 -* Fri Jun 11 1999 - sndirsch(a)suse.de +* Fri Jun 11 1999 sndirsch(a)suse.de - updated pingus sources to version 0.0.15 - updated clanlib sources to version 0.1.15 - updated hermes sources to version 1.2.5 -* Tue May 11 1999 - sndirsch(a)suse.de +* Tue May 11 1999 sndirsch(a)suse.de - updated package to release 0.0.14 (now two additional levels) -* Mon May 10 1999 - sndirsch(a)suse.de +* Mon May 10 1999 sndirsch(a)suse.de - created SPEC file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openssh for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package openssh for openSUSE:Factory checked in at Tue Mar 3 22:42:41 CET 2009. -------- --- openssh/openssh-askpass-gnome.changes 2008-04-09 14:35:50.000000000 +0200 +++ openssh/openssh-askpass-gnome.changes 2009-03-03 21:38:19.792350000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 23 17:27:22 CET 2009 - anicka(a)suse.cz + +- update to 5.2p1 + +------------------------------------------------------------------- --- openssh/openssh.changes 2008-12-01 15:43:59.000000000 +0100 +++ openssh/openssh.changes 2009-03-03 21:38:27.297017000 +0100 @@ -1,0 +2,54 @@ +Mon Feb 23 17:27:45 CET 2009 - anicka(a)suse.cz + +- update to 5.2p1 + * This release changes the default cipher order to prefer the AES CTR + modes and the revised "arcfour256" mode to CBC mode ciphers that are + susceptible to CPNI-957037 "Plaintext Recovery Attack Against SSH". + * This release also adds countermeasures to mitigate CPNI-957037-style + attacks against the SSH protocol's use of CBC-mode ciphers. Upon + detection of an invalid packet length or Message Authentication + Code, ssh/sshd will continue reading up to the maximum supported + packet length rather than immediately terminating the connection. + This eliminates most of the known differences in behaviour that + leaked information about the plaintext of injected data which formed + the basis of this attack. We believe that these attacks are rendered + infeasible by these changes. + * Added a -y option to ssh(1) to force logging to syslog rather than + stderr, which is useful when running daemonised (ssh -f) + * The sshd_config(5) ForceCommand directive now accepts commandline + arguments for the internal-sftp server. + * The ssh(1) ~C escape commandline now support runtime creation of + dynamic (-D) port forwards. + * Support the SOCKS4A protocol in ssh(1) dynamic (-D) forwards. + (bz#1482) + * Support remote port forwarding with a listen port of '0'. This + informs the server that it should dynamically allocate a listen + port and report it back to the client. (bz#1003) + * sshd(8) now supports setting PermitEmptyPasswords and + AllowAgentForwarding in Match blocks + * Repair a ssh(1) crash introduced in openssh-5.1 when the client is + sent a zero-length banner (bz#1496) + * Due to interoperability problems with certain + broken SSH implementations, the eow(a)openssh.com and + no-more-sessions(a)openssh.com protocol extensions are now only sent + to peers that identify themselves as OpenSSH. + * Make ssh(1) send the correct channel number for + SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to + avoid triggering 'Non-public channel' error messages on sshd(8) in + openssh-5.1. + * Avoid printing 'Non-public channel' warnings in sshd(8), since the + ssh(1) has sent incorrect channel numbers since ~2004 (this reverts + a behaviour introduced in openssh-5.1). + * Avoid double-free in ssh(1) ~C escape -L handler (bz#1539) + * Correct fail-on-error behaviour in sftp(1) batchmode for remote + stat operations. (bz#1541) + * Disable nonfunctional ssh(1) ~C escape handler in multiplex slave + connections. (bz#1543) + * Avoid hang in ssh(1) when attempting to connect to a server that + has MaxSessions=0 set. + * Multiple fixes to sshd(8) configuration test (-T) mode + * Several core and portable OpenSSH bugs fixed: 1380, 1412, 1418, + 1419, 1421, 1490, 1491, 1492, 1514, 1515, 1518, 1520, 1538, 1540 + * Many manual page improvements. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- openssh-5.1p1-askpass-fix.diff openssh-5.1p1-audit.patch openssh-5.1p1-blocksigalrm.diff openssh-5.1p1-default-protocol.diff openssh-5.1p1.dif openssh-5.1p1-eal3.diff openssh-5.1p1-engines.diff openssh-5.1p1-forwards.diff openssh-5.1p1-gcc-fix.patch openssh-5.1p1-gssapimitm.patch openssh-5.1p1-pam-fix2.diff openssh-5.1p1-pam-fix3.diff openssh-5.1p1-pam-fix4.diff openssh-5.1p1-pts.diff openssh-5.1p1-saveargv-fix.diff openssh-5.1p1-send_locale.diff openssh-5.1p1-strnvis.diff openssh-5.1p1.tar.bz2 openssh-5.1p1-tmpdir.diff openssh-5.1p1-xauth.diff openssh-5.1p1-xauthlocalhostname.diff New: ---- openssh-5.2p1-askpass-fix.diff openssh-5.2p1-audit.patch openssh-5.2p1-blocksigalrm.diff openssh-5.2p1-default-protocol.diff openssh-5.2p1.dif openssh-5.2p1-eal3.diff openssh-5.2p1-engines.diff openssh-5.2p1-forwards.diff openssh-5.2p1-gcc-fix.patch openssh-5.2p1-gssapimitm.patch openssh-5.2p1-pam-fix2.diff openssh-5.2p1-pam-fix3.diff openssh-5.2p1-pam-fix4.diff openssh-5.2p1-pts.diff openssh-5.2p1-saveargv-fix.diff openssh-5.2p1-send_locale.diff openssh-5.2p1.tar.bz2 openssh-5.2p1-tmpdir.diff openssh-5.2p1-xauth.diff openssh-5.2p1-xauthlocalhostname.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh-askpass-gnome.spec ++++++ --- /var/tmp/diff_new_pack.R30939/_old 2009-03-03 22:41:10.000000000 +0100 +++ /var/tmp/diff_new_pack.R30939/_new 2009-03-03 22:41:10.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package openssh-askpass-gnome (Version 5.1p1) +# spec file for package openssh-askpass-gnome (Version 5.2p1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,8 @@ BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-devel tcpd-devel update-desktop-files License: BSD 3-Clause Group: Productivity/Networking/SSH -Version: 5.1p1 -Release: 41 +Version: 5.2p1 +Release: 1 Requires: openssh = %{version} openssh-askpass = %{version} AutoReqProv: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH @@ -118,6 +118,8 @@ %attr(0755,root,root) /usr/%_lib/ssh/gnome-ssh-askpass %changelog +* Mon Feb 23 2009 anicka(a)suse.cz +- update to 5.2p1 * Wed Apr 09 2008 anicka(a)suse.cz - update to 5.0p1 * Wed Apr 02 2008 anicka(a)suse.cz ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.R30939/_old 2009-03-03 22:41:10.000000000 +0100 +++ /var/tmp/diff_new_pack.R30939/_new 2009-03-03 22:41:10.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package openssh (Version 5.1p1) +# spec file for package openssh (Version 5.2p1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,8 +37,8 @@ PreReq: /usr/sbin/groupadd /usr/sbin/useradd %insserv_prereq %fillup_prereq /bin/mkdir /bin/cat permissions Conflicts: nonfreessh AutoReqProv: on -Version: 5.1p1 -Release: 41 +Version: 5.2p1 +Release: 1 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) Url: http://www.openssh.com/ @@ -70,7 +70,6 @@ Patch44: %{name}-%{version}-audit.patch Patch45: %{name}-%{version}-pts.diff Patch46: %{name}-%{version}-pam-fix4.diff -Patch47: %{name}-%{version}-strnvis.diff Patch48: %{name}-%{version}-forwards.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -162,7 +161,6 @@ %patch44 -p1 %patch45 %patch46 -p1 -%patch47 %patch48 cp -v %{SOURCE4} . cp -v %{SOURCE6} . @@ -294,7 +292,7 @@ %attr(0755,root,root) /usr/%_lib/ssh/sftp-server %attr(0755,root,root) /usr/%_lib/ssh/ssh-keysign %dir /etc/slp.reg.d -/etc/slp.reg.d/ssh.reg +%config /etc/slp.reg.d/ssh.reg /var/adm/fillup-templates/sysconfig.ssh %config %{_fwdefdir}/sshd @@ -304,9 +302,60 @@ %attr(0755,root,root) /usr/%_lib/ssh/x11-ssh-askpass %doc %_mandir/man1/ssh-askpass.1x.gz %doc %_mandir/man1/x11-ssh-askpass.1x.gz -%config %_appdefdir/SshAskpass +%_appdefdir/SshAskpass %changelog +* Mon Feb 23 2009 anicka(a)suse.cz +- update to 5.2p1 + * This release changes the default cipher order to prefer the AES CTR + modes and the revised "arcfour256" mode to CBC mode ciphers that are + susceptible to CPNI-957037 "Plaintext Recovery Attack Against SSH". + * This release also adds countermeasures to mitigate CPNI-957037-style + attacks against the SSH protocol's use of CBC-mode ciphers. Upon + detection of an invalid packet length or Message Authentication + Code, ssh/sshd will continue reading up to the maximum supported + packet length rather than immediately terminating the connection. + This eliminates most of the known differences in behaviour that + leaked information about the plaintext of injected data which formed + the basis of this attack. We believe that these attacks are rendered + infeasible by these changes. + * Added a -y option to ssh(1) to force logging to syslog rather than + stderr, which is useful when running daemonised (ssh -f) + * The sshd_config(5) ForceCommand directive now accepts commandline + arguments for the internal-sftp server. + * The ssh(1) ~C escape commandline now support runtime creation of + dynamic (-D) port forwards. + * Support the SOCKS4A protocol in ssh(1) dynamic (-D) forwards. + (bz#1482) + * Support remote port forwarding with a listen port of '0'. This + informs the server that it should dynamically allocate a listen + port and report it back to the client. (bz#1003) + * sshd(8) now supports setting PermitEmptyPasswords and + AllowAgentForwarding in Match blocks + * Repair a ssh(1) crash introduced in openssh-5.1 when the client is + sent a zero-length banner (bz#1496) + * Due to interoperability problems with certain + broken SSH implementations, the eow(a)openssh.com and + no-more-sessions(a)openssh.com protocol extensions are now only sent + to peers that identify themselves as OpenSSH. + * Make ssh(1) send the correct channel number for + SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to + avoid triggering 'Non-public channel' error messages on sshd(8) in + openssh-5.1. + * Avoid printing 'Non-public channel' warnings in sshd(8), since the + ssh(1) has sent incorrect channel numbers since ~2004 (this reverts + a behaviour introduced in openssh-5.1). + * Avoid double-free in ssh(1) ~C escape -L handler (bz#1539) + * Correct fail-on-error behaviour in sftp(1) batchmode for remote + stat operations. (bz#1541) + * Disable nonfunctional ssh(1) ~C escape handler in multiplex slave + connections. (bz#1543) + * Avoid hang in ssh(1) when attempting to connect to a server that + has MaxSessions=0 set. + * Multiple fixes to sshd(8) configuration test (-T) mode + * Several core and portable OpenSSH bugs fixed: 1380, 1412, 1418, + 1419, 1421, 1490, 1491, 1492, 1514, 1515, 1518, 1520, 1538, 1540 + * Many manual page improvements. * Mon Dec 01 2008 anicka(a)suse.cz - respect SSH_MAX_FORWARDS_PER_DIRECTION (bnc#448775) * Mon Nov 10 2008 anicka(a)suse.cz ++++++ openssh-5.1p1-askpass-fix.diff -> openssh-5.2p1-askpass-fix.diff ++++++ ++++++ openssh-5.1p1-audit.patch -> openssh-5.2p1-audit.patch ++++++ --- openssh/openssh-5.1p1-audit.patch 2008-07-22 20:32:05.000000000 +0200 +++ openssh/openssh-5.2p1-audit.patch 2009-02-23 17:08:57.000000000 +0100 @@ -1,7 +1,7 @@ # add support for Linux audit (FATE #120269) ================================================================================ ---- openssh-5.1p1/Makefile.in -+++ openssh-5.1p1/Makefile.in +--- openssh-5.2p1/Makefile.in ++++ openssh-5.2p1/Makefile.in @@ -44,6 +44,7 @@ CFLAGS=@CFLAGS@ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ @@ -19,8 +19,8 @@ scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o $(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) ---- openssh-5.1p1/auth.c -+++ openssh-5.1p1/auth.c +--- openssh-5.2p1/auth.c ++++ openssh-5.2p1/auth.c @@ -287,6 +287,12 @@ get_canonical_hostname(options.use_dns), "ssh", &loginmsg); # endif @@ -45,9 +45,9 @@ #ifdef SSH_AUDIT_EVENTS audit_event(SSH_INVALID_USER); #endif /* SSH_AUDIT_EVENTS */ ---- openssh-5.1p1/config.h.in -+++ openssh-5.1p1/config.h.in -@@ -1388,6 +1388,9 @@ +--- openssh-5.2p1/config.h.in ++++ openssh-5.2p1/config.h.in +@@ -1397,6 +1397,9 @@ /* Define if you want SELinux support. */ #undef WITH_SELINUX @@ -57,9 +57,9 @@ /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN ---- openssh-5.1p1/configure.ac -+++ openssh-5.1p1/configure.ac -@@ -3314,6 +3314,20 @@ +--- openssh-5.2p1/configure.ac ++++ openssh-5.2p1/configure.ac +@@ -3340,6 +3340,20 @@ fi ] ) @@ -80,7 +80,7 @@ # Check whether user wants Kerberos 5 support KRB5_MSG="no" AC_ARG_WITH(kerberos5, -@@ -4134,6 +4148,7 @@ +@@ -4160,6 +4174,7 @@ echo " OSF SIA support: $SIA_MSG" echo " KerberosV support: $KRB5_MSG" echo " SELinux support: $SELINUX_MSG" @@ -88,8 +88,8 @@ echo " Smartcard support: $SCARD_MSG" echo " S/KEY support: $SKEY_MSG" echo " TCP Wrappers support: $TCPW_MSG" ---- openssh-5.1p1/loginrec.c -+++ openssh-5.1p1/loginrec.c +--- openssh-5.2p1/loginrec.c ++++ openssh-5.2p1/loginrec.c @@ -176,6 +176,10 @@ #include "auth.h" #include "buffer.h" @@ -174,8 +174,8 @@ /** ** Low-level libutil login() functions **/ ---- openssh-5.1p1/loginrec.h -+++ openssh-5.1p1/loginrec.h +--- openssh-5.2p1/loginrec.h ++++ openssh-5.2p1/loginrec.h @@ -127,5 +127,9 @@ char *line_abbrevname(char *dst, const char *src, int dstsize); ++++++ openssh-5.1p1-blocksigalrm.diff -> openssh-5.2p1-blocksigalrm.diff ++++++ ++++++ openssh-5.1p1-default-protocol.diff -> openssh-5.2p1-default-protocol.diff ++++++ --- openssh/openssh-5.1p1-default-protocol.diff 2008-07-22 20:32:05.000000000 +0200 +++ openssh/openssh-5.2p1-default-protocol.diff 2009-02-23 17:08:57.000000000 +0100 @@ -7,5 +7,5 @@ -# Protocol 2,1 + Protocol 2 # Cipher 3des - # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc + # Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc # MACs hmac-md5,hmac-sha1,umac-64(a)openssh.com,hmac-ripemd160 ++++++ openssh-5.1p1.dif -> openssh-5.2p1.dif ++++++ ++++++ openssh-5.1p1-eal3.diff -> openssh-5.2p1-eal3.diff ++++++ --- openssh/openssh-5.1p1-eal3.diff 2008-07-22 20:32:04.000000000 +0200 +++ openssh/openssh-5.2p1-eal3.diff 2009-02-23 17:08:56.000000000 +0100 @@ -1,6 +1,6 @@ ---- openssh-5.1p1/sshd.8 -+++ openssh-5.1p1/sshd.8 -@@ -785,7 +785,7 @@ +--- openssh-5.2p1/sshd.8 ++++ openssh-5.2p1/sshd.8 +@@ -783,7 +783,7 @@ The file format is described in .Xr moduli 5 . .Pp @@ -9,7 +9,7 @@ See .Xr motd 5 . .Pp -@@ -798,7 +798,7 @@ +@@ -796,7 +796,7 @@ refused. The file should be world-readable. .Pp @@ -18,7 +18,7 @@ This file is used in exactly the same way as .Pa hosts.equiv , but allows host-based authentication without permitting login with -@@ -875,8 +875,7 @@ +@@ -873,8 +873,7 @@ .Xr ssh-keyscan 1 , .Xr chroot 2 , .Xr hosts_access 5 , @@ -28,8 +28,8 @@ .Xr sshd_config 5 , .Xr inetd 8 , .Xr sftp-server 8 ---- openssh-5.1p1/sshd_config.5 -+++ openssh-5.1p1/sshd_config.5 +--- openssh-5.2p1/sshd_config.5 ++++ openssh-5.2p1/sshd_config.5 @@ -177,9 +177,6 @@ By default, no banner is displayed. .It Cm ChallengeResponseAuthentication ++++++ openssh-5.1p1-engines.diff -> openssh-5.2p1-engines.diff ++++++ --- openssh/openssh-5.1p1-engines.diff 2008-07-22 20:32:04.000000000 +0200 +++ openssh/openssh-5.2p1-engines.diff 2009-02-23 17:08:56.000000000 +0100 @@ -1,5 +1,5 @@ ---- openssh-5.1p1/ssh-add.c -+++ openssh-5.1p1/ssh-add.c +--- openssh-5.2p1/ssh-add.c ++++ openssh-5.2p1/ssh-add.c @@ -43,6 +43,7 @@ #include <openssl/evp.h> @@ -19,8 +19,8 @@ /* At first, get a connection to the authentication agent. */ ac = ssh_get_authentication_connection(); if (ac == NULL) { ---- openssh-5.1p1/ssh-agent.c -+++ openssh-5.1p1/ssh-agent.c +--- openssh-5.2p1/ssh-agent.c ++++ openssh-5.2p1/ssh-agent.c @@ -52,6 +52,7 @@ #include <openssl/evp.h> #include <openssl/md5.h> @@ -40,8 +40,8 @@ __progname = ssh_get_progname(av[0]); init_rng(); seed_rng(); ---- openssh-5.1p1/ssh-keygen.c -+++ openssh-5.1p1/ssh-keygen.c +--- openssh-5.2p1/ssh-keygen.c ++++ openssh-5.2p1/ssh-keygen.c @@ -22,6 +22,7 @@ #include <openssl/evp.h> #include <openssl/pem.h> @@ -62,8 +62,8 @@ log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); init_rng(); ---- openssh-5.1p1/ssh-keysign.c -+++ openssh-5.1p1/ssh-keysign.c +--- openssh-5.2p1/ssh-keysign.c ++++ openssh-5.2p1/ssh-keysign.c @@ -38,6 +38,7 @@ #include <openssl/evp.h> #include <openssl/rand.h> @@ -84,8 +84,8 @@ for (i = 0; i < 256; i++) rnd[i] = arc4random(); RAND_seed(rnd, sizeof(rnd)); ---- openssh-5.1p1/ssh.c -+++ openssh-5.1p1/ssh.c +--- openssh-5.2p1/ssh.c ++++ openssh-5.2p1/ssh.c @@ -73,6 +73,7 @@ #include <openssl/err.h> #include "openbsd-compat/openssl-compat.h" @@ -94,7 +94,7 @@ #include "xmalloc.h" #include "ssh.h" -@@ -562,6 +563,10 @@ +@@ -550,6 +551,10 @@ SSLeay_add_all_algorithms(); ERR_load_crypto_strings(); @@ -105,8 +105,8 @@ /* Initialize the command to execute on remote host. */ buffer_init(&command); ---- openssh-5.1p1/sshd.c -+++ openssh-5.1p1/sshd.c +--- openssh-5.2p1/sshd.c ++++ openssh-5.2p1/sshd.c @@ -77,6 +77,7 @@ #include <openssl/md5.h> #include <openssl/rand.h> @@ -115,7 +115,7 @@ #ifdef HAVE_SECUREWARE #include <sys/security.h> -@@ -1416,6 +1417,10 @@ +@@ -1415,6 +1416,10 @@ SSLeay_add_all_algorithms(); ++++++ openssh-5.1p1-forwards.diff -> openssh-5.2p1-forwards.diff ++++++ --- openssh/openssh-5.1p1-forwards.diff 2008-12-01 15:36:10.000000000 +0100 +++ openssh/openssh-5.2p1-forwards.diff 2009-02-23 17:08:58.000000000 +0100 @@ -1,8 +1,8 @@ --- channels.c +++ channels.c -@@ -2418,6 +2418,9 @@ - const char *host, *addr; +@@ -2471,6 +2471,9 @@ char ntop[NI_MAXHOST], strport[NI_MAXSERV]; + in_port_t *lport_p; + if (num_adm_permitted_opens >= SSH_MAX_FORWARDS_PER_DIRECTION) + fatal("channel_setup_fwd_listener: too many forwards"); ++++++ openssh-5.1p1-gcc-fix.patch -> openssh-5.2p1-gcc-fix.patch ++++++ ++++++ openssh-5.1p1-gssapimitm.patch -> openssh-5.2p1-gssapimitm.patch ++++++ --- openssh/openssh-5.1p1-gssapimitm.patch 2008-07-22 20:32:04.000000000 +0200 +++ openssh/openssh-5.2p1-gssapimitm.patch 2009-02-23 17:08:55.000000000 +0100 @@ -52,16 +52,16 @@ extern Authmethod method_gssapi; +extern Authmethod method_gssapi_old; #endif - - Authmethod *authmethods[] = { -@@ -77,6 +78,7 @@ + #ifdef JPAKE + extern Authmethod method_jpake; +@@ -80,6 +81,7 @@ &method_pubkey, #ifdef GSSAPI &method_gssapi, + &method_gssapi_old, #endif - &method_passwd, - &method_kbdint, + #ifdef JPAKE + &method_jpake, --- readconf.c +++ readconf.c @@ -126,7 +126,7 @@ @@ -85,7 +85,7 @@ #endif { "fallbacktorsh", oDeprecated }, { "usersh", oDeprecated }, -@@ -447,6 +449,10 @@ +@@ -456,6 +458,10 @@ case oGssDelegateCreds: intptr = &options->gss_deleg_creds; goto parse_flag; @@ -96,7 +96,7 @@ case oBatchMode: intptr = &options->batch_mode; -@@ -1017,6 +1023,7 @@ +@@ -1009,6 +1015,7 @@ options->challenge_response_authentication = -1; options->gss_authentication = -1; options->gss_deleg_creds = -1; @@ -104,7 +104,7 @@ options->password_authentication = -1; options->kbd_interactive_authentication = -1; options->kbd_interactive_devices = NULL; -@@ -1108,6 +1115,8 @@ +@@ -1101,6 +1108,8 @@ options->gss_authentication = 0; if (options->gss_deleg_creds == -1) options->gss_deleg_creds = 0; @@ -133,7 +133,7 @@ options->password_authentication = -1; options->kbd_interactive_authentication = -1; options->challenge_response_authentication = -1; -@@ -211,6 +212,8 @@ +@@ -212,6 +213,8 @@ options->gss_authentication = 0; if (options->gss_cleanup_creds == -1) options->gss_cleanup_creds = 1; @@ -142,7 +142,7 @@ if (options->password_authentication == -1) options->password_authentication = 1; if (options->kbd_interactive_authentication == -1) -@@ -299,7 +302,7 @@ +@@ -302,7 +305,7 @@ sBanner, sUseDNS, sHostbasedAuthentication, sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, @@ -150,8 +150,8 @@ + sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, sGssEnableMITM, sMatch, sPermitOpen, sForceCommand, sChrootDirectory, sUsePrivilegeSeparation, sAllowAgentForwarding, - sDeprecated, sUnsupported -@@ -360,9 +363,11 @@ + sZeroKnowledgePasswordAuthentication, +@@ -364,9 +367,11 @@ #ifdef GSSAPI { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, @@ -163,7 +163,7 @@ #endif { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, -@@ -885,6 +890,10 @@ +@@ -894,6 +899,10 @@ case sGssCleanupCreds: intptr = &options->gss_cleanup_creds; goto parse_flag; @@ -186,7 +186,7 @@ int kbd_interactive_authentication; /* If true, permit */ --- ssh_config +++ ssh_config -@@ -54,3 +54,13 @@ +@@ -54,4 +54,14 @@ # Tunnel no # TunnelDevice any:any # PermitLocalCommand no @@ -200,10 +200,11 @@ +# GSSAPIEnableMITMAttack no + +>>>>>>> + # VisualHostKey no --- sshconnect2.c +++ sshconnect2.c -@@ -246,6 +246,10 @@ - userauth_gssapi, +@@ -255,6 +255,10 @@ + NULL, &options.gss_authentication, NULL}, + {"gssapi", @@ -213,7 +214,7 @@ #endif {"hostbased", userauth_hostbased, -@@ -587,7 +591,9 @@ +@@ -617,7 +621,9 @@ if (status == GSS_S_COMPLETE) { /* send either complete or MIC, depending on mechanism */ ++++++ openssh-5.1p1-pam-fix2.diff -> openssh-5.2p1-pam-fix2.diff ++++++ ++++++ openssh-5.1p1-pam-fix2.diff -> openssh-5.2p1-pam-fix3.diff ++++++ --- openssh/openssh-5.1p1-pam-fix2.diff 2008-07-22 20:32:03.000000000 +0200 +++ openssh/openssh-5.2p1-pam-fix3.diff 2009-02-23 17:08:55.000000000 +0100 @@ -1,20 +1,13 @@ ---- sshd_config -+++ sshd_config -@@ -58,7 +58,7 @@ - #IgnoreRhosts yes - - # To disable tunneled clear text passwords, change to no here! --#PasswordAuthentication yes -+PasswordAuthentication no - #PermitEmptyPasswords no - - # Change to no to disable s/key passwords -@@ -83,7 +83,7 @@ - # If you just want the PAM account and session checks to run without - # PAM authentication, then enable this but set PasswordAuthentication - # and ChallengeResponseAuthentication to 'no'. --#UsePAM no -+UsePAM yes - - #AllowAgentForwarding yes - #AllowTcpForwarding yes +--- auth-pam.c ++++ auth-pam.c +@@ -786,7 +786,9 @@ + fatal("Internal error: PAM auth " + "succeeded when it should have " + "failed"); +- import_environments(&buffer); ++#ifndef USE_POSIX_THREADS ++ import_environments(&buffer); ++#endif + *num = 0; + **echo_on = 0; + ctxt->pam_done = 1; ++++++ openssh-5.1p1-pam-fix2.diff -> openssh-5.2p1-pam-fix4.diff ++++++ --- openssh/openssh-5.1p1-pam-fix2.diff 2008-07-22 20:32:03.000000000 +0200 +++ openssh/openssh-5.2p1-pam-fix4.diff 2009-02-23 17:08:58.000000000 +0100 @@ -1,20 +1,26 @@ ---- sshd_config -+++ sshd_config -@@ -58,7 +58,7 @@ - #IgnoreRhosts yes - - # To disable tunneled clear text passwords, change to no here! --#PasswordAuthentication yes -+PasswordAuthentication no - #PermitEmptyPasswords no - - # Change to no to disable s/key passwords -@@ -83,7 +83,7 @@ - # If you just want the PAM account and session checks to run without - # PAM authentication, then enable this but set PasswordAuthentication - # and ChallengeResponseAuthentication to 'no'. --#UsePAM no -+UsePAM yes - - #AllowAgentForwarding yes - #AllowTcpForwarding yes +Index: openssh-5.1p1/auth-pam.c +================================================================================ +--- openssh-5.2p1/auth-pam.c ++++ openssh-5.2p1/auth-pam.c +@@ -602,16 +602,16 @@ + return; + debug("PAM: cleanup"); + pam_set_item(sshpam_handle, PAM_CONV, (const void *)&null_conv); +- if (sshpam_cred_established) { +- debug("PAM: deleting credentials"); +- pam_setcred(sshpam_handle, PAM_DELETE_CRED); +- sshpam_cred_established = 0; +- } + if (sshpam_session_open) { + debug("PAM: closing session"); + pam_close_session(sshpam_handle, PAM_SILENT); + sshpam_session_open = 0; + } ++ if (sshpam_cred_established) { ++ debug("PAM: deleting credentials"); ++ pam_setcred(sshpam_handle, PAM_DELETE_CRED); ++ sshpam_cred_established = 0; ++ } + sshpam_authenticated = 0; + pam_end(sshpam_handle, sshpam_err); + sshpam_handle = NULL; ++++++ openssh-5.1p1-pts.diff -> openssh-5.2p1-pts.diff ++++++ ++++++ openssh-5.1p1-saveargv-fix.diff -> openssh-5.2p1-saveargv-fix.diff ++++++ --- openssh/openssh-5.1p1-saveargv-fix.diff 2008-07-22 20:32:03.000000000 +0200 +++ openssh/openssh-5.2p1-saveargv-fix.diff 2009-02-23 17:08:55.000000000 +0100 @@ -1,6 +1,6 @@ --- sshd.c +++ sshd.c -@@ -305,6 +305,7 @@ +@@ -304,6 +304,7 @@ static void sighup_restart(void) { @@ -8,7 +8,7 @@ logit("Received SIGHUP; restarting."); close_listen_socks(); close_startup_pipes(); -@@ -1270,7 +1271,11 @@ +@@ -1269,7 +1270,11 @@ #ifndef HAVE_SETPROCTITLE /* Prepare for later setproctitle emulation */ compat_init_setproctitle(ac, av); ++++++ openssh-5.1p1-send_locale.diff -> openssh-5.2p1-send_locale.diff ++++++ --- openssh/openssh-5.1p1-send_locale.diff 2008-07-22 20:32:04.000000000 +0200 +++ openssh/openssh-5.2p1-send_locale.diff 2009-02-23 17:08:56.000000000 +0100 @@ -1,6 +1,6 @@ --- ssh_config +++ ssh_config -@@ -63,4 +63,7 @@ +@@ -63,5 +63,8 @@ # potential man-in-the-middle attacks, which 'gssapi-with-mic' is not susceptible to. # GSSAPIEnableMITMAttack no @@ -9,6 +9,7 @@ +SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES +SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT +SendEnv LC_IDENTIFICATION LC_ALL + # VisualHostKey no --- sshd_config +++ sshd_config @@ -119,6 +119,11 @@ ++++++ openssh-5.1p1.tar.bz2 -> openssh-5.2p1.tar.bz2 ++++++ ++++ 13050 lines of diff (skipped) ++++++ openssh-5.1p1-tmpdir.diff -> openssh-5.2p1-tmpdir.diff ++++++ ++++++ openssh-5.1p1-xauth.diff -> openssh-5.2p1-xauth.diff ++++++ --- openssh/openssh-5.1p1-xauth.diff 2008-07-22 20:32:05.000000000 +0200 +++ openssh/openssh-5.2p1-xauth.diff 2009-02-23 17:08:57.000000000 +0100 @@ -1,6 +1,6 @@ --- session.c +++ session.c -@@ -2487,8 +2487,41 @@ +@@ -2493,8 +2493,41 @@ session_close(Session *s) { u_int i; ++++++ openssh-5.1p1-xauthlocalhostname.diff -> openssh-5.2p1-xauthlocalhostname.diff ++++++ --- openssh/openssh-5.1p1-xauthlocalhostname.diff 2008-07-22 20:32:04.000000000 +0200 +++ openssh/openssh-5.2p1-xauthlocalhostname.diff 2009-02-23 17:08:56.000000000 +0100 @@ -1,6 +1,6 @@ --- session.c +++ session.c -@@ -1104,7 +1104,7 @@ +@@ -1110,7 +1110,7 @@ } static char ** @@ -9,7 +9,7 @@ { char buf[256]; u_int i, envsize; -@@ -1291,6 +1291,8 @@ +@@ -1297,6 +1297,8 @@ for (i = 0; env[i]; i++) fprintf(stderr, " %.200s\n", env[i]); } @@ -18,7 +18,7 @@ return env; } -@@ -1299,7 +1301,7 @@ +@@ -1305,7 +1307,7 @@ * first in this order). */ static void @@ -27,7 +27,7 @@ { FILE *f = NULL; char cmd[1024]; -@@ -1353,12 +1355,20 @@ +@@ -1359,12 +1361,20 @@ options.xauth_location); f = popen(cmd, "w"); if (f) { @@ -48,7 +48,7 @@ } else { fprintf(stderr, "Could not run %s\n", cmd); -@@ -1644,6 +1654,7 @@ +@@ -1650,6 +1660,7 @@ { extern char **environ; char **env; @@ -56,7 +56,7 @@ char *argv[ARGV_MAX]; const char *shell, *shell0, *hostname = NULL; struct passwd *pw = s->pw; -@@ -1710,7 +1721,7 @@ +@@ -1716,7 +1727,7 @@ * Make sure $SHELL points to the shell from the password file, * even if shell is overridden from login.conf */ @@ -65,7 +65,7 @@ #ifdef HAVE_LOGIN_CAP shell = login_getcapstr(lc, "shell", (char *)shell, (char *)shell); -@@ -1778,7 +1789,7 @@ +@@ -1784,7 +1795,7 @@ closefrom(STDERR_FILENO + 1); if (!options.use_login) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nagios for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at Tue Mar 3 22:33:55 CET 2009. -------- --- nagios/nagios.changes 2008-12-16 16:02:42.000000000 +0100 +++ nagios/nagios.changes 2009-03-03 14:06:10.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 3 14:05:41 CET 2009 - cschneemann(a)suse.de + +- changed rcnagios to delete control characters from values + BNC #480747 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.v21580/_old 2009-03-03 22:32:28.000000000 +0100 +++ /var/tmp/diff_new_pack.v21580/_new 2009-03-03 22:32:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nagios (Version 3.0.6) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,7 +21,7 @@ Name: nagios Summary: The Nagios Network Monitor Version: 3.0.6 -Release: 1 +Release: 2 Url: http://www.nagios.org/ License: GPL v2 or later Group: System/Monitoring @@ -473,6 +473,9 @@ %_includedir/%realname/* %changelog +* Tue Mar 03 2009 cschneemann(a)suse.de +- changed rcnagios to delete control characters from values + BNC #480747 * Tue Dec 09 2008 cschneemann(a)suse.de - update to 3.0.6: + Fix for CGI submission of external commands (writing newlines ++++++ rcnagios ++++++ --- /var/tmp/diff_new_pack.v21580/_old 2009-03-03 22:32:28.000000000 +0100 +++ /var/tmp/diff_new_pack.v21580/_new 2009-03-03 22:32:28.000000000 +0100 @@ -49,9 +49,9 @@ # grab a config option function get_var() { if [ -n "$2" ]; then - set -- `grep ^$1 $2 | sed 's@=@ @'` + set -- `grep ^$1 $2 | sed 's@=@ @' | tr -d '[:cntrl:]'` else - set -- `grep ^$1 $NAGIOS_CFG | sed 's@=@ @'` + set -- `grep ^$1 $NAGIOS_CFG | sed 's@=@ @' | tr -d '[:cntrl:]'` fi shift # remove first ARG => search-string echo $* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mutt for openSUSE:Factory
by root＠Hilbert.suse.de 03 Mar '09

03 Mar '09

Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at Tue Mar 3 22:28:26 CET 2009. -------- --- mutt/mutt.changes 2008-04-10 15:29:09.000000000 +0200 +++ mutt/mutt.changes 2009-03-03 18:12:36.360001827 +0100 @@ -1,0 +2,12 @@ +Tue Mar 3 17:17:51 CET 2009 - werner(a)suse.de + +- updated to mutt version 1.5.19 mostly a bugfix release +- updated sidebar patch to 1.5.18.sidebar.20080611 + * make it work with 1.5.19 + * make sidebar-fix also work +- updated compression patch to patch-1.5.19.rr.compressed +- enable smtp support +- enable mixmaster support +- use regex(7) of glibc + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mutt-1.5.15.sidebar-fix.dif mutt-1.5.17.dif mutt-1.5.17-opennfs.dif mutt-1.5.17.tar.bz2 patch-1.5.17.rr.compressed.1.bz2 patch-1.5.17.sidebar.20071102.txt.bz2 New: ---- mutt-1.5.19.dif mutt-1.5.19-opennfs.dif mutt-1.5.19.sidebar-fix.dif mutt-1.5.19.tar.bz2 patch-1.5.19.rr.compressed.1.bz2 patch-1.5.19.sidebar.20080611.txt.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.Z14829/_old 2009-03-03 22:27:05.000000000 +0100 +++ /var/tmp/diff_new_pack.Z14829/_new 2009-03-03 22:27:05.000000000 +0100 @@ -1,10 +1,17 @@ # -# spec file for package mutt (Version 1.5.17) +# spec file for package mutt (Version 1.5.19) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -24,8 +31,8 @@ # desktop selections. #Requires: desktop-data-SuSE AutoReqProv: on -Version: 1.5.17 -Release: 42 +Version: 1.5.19 +Release: 1 Summary: Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0: %name-%version.tar.bz2 @@ -43,9 +50,9 @@ Patch4: %name-1.5.15-wrapcolumn.diff Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 # http://lunar-linux.org/index.php?page=mutt-sidebar -Patch6: patch-%version.sidebar.20071102.txt.bz2 -Patch7: mutt-1.5.15.sidebar-fix.dif -Patch8: mutt-1.5.17-opennfs.dif +Patch6: patch-%version.sidebar.20080611.txt.bz2 +Patch7: mutt-1.5.19.sidebar-fix.dif +Patch8: mutt-1.5.19-opennfs.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -71,25 +78,20 @@ %patch5 -p1 %patch6 -p1 %patch7 -p0 -%patch8 -p1 -cp Muttrc Muttrc.SuSE +%patch8 -p0 +cp doc/Muttrc Muttrc.SuSE cp %{S:2} . %build autoreconf -fi CC=gcc CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE -fno-strict-aliasing" -%if %suse_version > 1000 CFLAGS="$CFLAGS -fstack-protector" -%endif -%if %suse_version < 1030 -CFLAGS="$CFLAGS -DSUSE_IMAP_FORCE_SSL" -%endif +#CFLAGS="$CFLAGS -DSUSE_IMAP_FORCE_SSL" KRB5CFGPATH=%{S:6} export CC CFLAGS KRB5CFGPATH chmod 755 $KRB5CFGPATH ./configure $RPM_ARCH-suse-linux \ - --disable-domain \ --prefix=%{_prefix} \ --datadir=%{_datadir} \ --sysconfdir=%{_sysconfdir} \ @@ -100,15 +102,16 @@ --enable-pgp \ --enable-gpgme \ --enable-nfs-fix \ + --enable-mailtool \ --enable-compressed \ + --disable-external-dotlock \ --with-ssl=%{_prefix} \ --with-sasl=%{_prefix} \ - --with-sasl2=%{_prefix} \ --with-gss=%{_prefix} \ - --enable-buffy-size \ + --with-regex \ + --enable-smtp \ --enable-hcache \ - --with-idn \ - --disable-inodesort + --with-idn make -C doc clean make make -C doc @@ -157,7 +160,6 @@ %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/mutt.png %_mandir/man1/mutt.1.gz -%_mandir/man1/mutt_dotlock.1.gz %_mandir/man5/mmdf_mutt.5.gz %_mandir/man5/muttrc.5.gz %_mandir/man5/mbox_mutt.5.gz @@ -165,6 +167,15 @@ %config(noreplace) %{_sysconfdir}/Muttrc %changelog +* Tue Mar 03 2009 werner(a)suse.de +- updated to mutt version 1.5.19 mostly a bugfix release +- updated sidebar patch to 1.5.18.sidebar.20080611 + * make it work with 1.5.19 + * make sidebar-fix also work +- updated compression patch to patch-1.5.19.rr.compressed +- enable smtp support +- enable mixmaster support +- use regex(7) of glibc * Thu Apr 10 2008 werner(a)suse.de - Avoid trouble with krb5-config * Thu Dec 20 2007 bwalle(a)suse.de @@ -252,7 +263,7 @@ - Rename mmdf.5 -> mmdf_mutt.5 to not conflict with tin * Tue Feb 01 2005 mmj(a)suse.de - Update to 1.5.7 -* Wed Jan 12 2005 mmj(a)suse.de +* Tue Jan 11 2005 mmj(a)suse.de - Fix plain auth for sasl with patch from HEAD [#49573] - Update header cache patch to latest * Wed Nov 17 2004 mmj(a)suse.de @@ -285,9 +296,9 @@ - People are going to ask over and over again about the alternates error, even though it's documented in the manual page, so install /usr/share/doc/packages/mutt/README.alternates -* Thu Feb 05 2004 mmj(a)suse.de +* Wed Feb 04 2004 mmj(a)suse.de - Readd cast that got lost when 99%% of a patch was merged upstream -* Thu Feb 05 2004 mmj(a)suse.de +* Wed Feb 04 2004 mmj(a)suse.de - Update to 1.5.6 - Include patch from Jo�l Riou <joel.riou(a)normalesup.org> which adds a variable config_charset that one may define in a rc file @@ -298,7 +309,7 @@ latin-encoded terminal. * Mon Nov 17 2003 mmj(a)suse.de - Use rr.compressed for 1.5.5.1 from the author -* Thu Nov 06 2003 mmj(a)suse.de +* Wed Nov 05 2003 mmj(a)suse.de - Update to mutt-1.5.5.1i which includes the missing files * Wed Nov 05 2003 mmj(a)suse.de - Update to mutt-1.5.5i which is the last planned development snap- @@ -352,7 +363,7 @@ * Fri Jan 24 2003 mmj(a)suse.de - Add --enable-buffy-size which got lost because the maintainer kept several versions around -* Fri Jan 24 2003 mmj(a)suse.de +* Thu Jan 23 2003 mmj(a)suse.de - Add patch to use sasl2 instead og sasl * Mon Jan 06 2003 mmj(a)suse.de - Below action was not A Good Thing[tm] for all, so made it a @@ -376,7 +387,7 @@ improved IMAP and POP support. Better maildir handling, improved threading. And lots more, which is better summarized on http://www.mutt.org -* Wed May 29 2002 mmj(a)suse.de +* Tue May 28 2002 mmj(a)suse.de - Added a patch to allow longer lines [Bug #16030] - Added a patch to allow mailboxes > 2 GB [Bug #16356] * Tue May 14 2002 mmj(a)suse.de @@ -416,7 +427,7 @@ - po updates * Sun Sep 02 2001 bjacke(a)suse.de - update to 1.3.22.1 -* Fri Aug 24 2001 bjacke(a)suse.de +* Thu Aug 23 2001 bjacke(a)suse.de - update to 1.3.21 which fixes some MH bugs and others * Mon Aug 13 2001 ro(a)suse.de - changed neededforbuild <sp_libs> to <sp-devel> @@ -437,7 +448,7 @@ - fixed a buffer underrun - fixed possible segfault (#6979) - redisabled buffy fix -* Mon Mar 26 2001 bjacke(a)suse.de +* Sun Mar 25 2001 bjacke(a)suse.de - update to 1.3.16i - dropped superfluous additional options patch - add compressed folder patch @@ -501,13 +512,13 @@ - highlight_unread sometimes didn't work. Fixed. * Thu Oct 14 1999 garloff(a)suse.de - Added contrib/Pine.rc and Mush.rc to as %%docs -* Thu Oct 14 1999 garloff(a)suse.de +* Wed Oct 13 1999 garloff(a)suse.de - Two new options: "delete_tilde" and "highlight_unread". The meaning is obvious ... * Fri Oct 01 1999 werner(a)suse.de - Added gpg in neededforbuild to get both pgp and gpg path included into mutt. -* Wed Sep 29 1999 werner(a)suse.de +* Tue Sep 28 1999 werner(a)suse.de - Put urlview into mutt package - Use changes Muttrc instead of my.Muttrc * there is no variable web_browser anymore @@ -537,7 +548,7 @@ - update to version 0.85 * Tue May 20 1997 florian(a)suse.de - update to version 0.74 -* Mon Apr 14 1997 florian(a)suse.de +* Sun Apr 13 1997 florian(a)suse.de - update to new version 0.69 * Tue Jan 28 1997 florian(a)suse.de - update to new version 0.59 ++++++ mutt-1.5.15.sidebar-fix.dif -> mutt-1.5.19.dif ++++++ --- mutt/mutt-1.5.15.sidebar-fix.dif 2007-06-01 13:37:57.000000000 +0200 +++ mutt/mutt-1.5.19.dif 2009-03-03 15:58:21.500002479 +0100 @@ -1,156 +1,295 @@ ---- buffy.c -+++ buffy.c 2007-06-01 13:37:02.671160950 +0200 -@@ -259,7 +259,7 @@ int mutt_buffy_check (int force) - char path[_POSIX_PATH_MAX]; - struct stat contex_sb; - time_t t; -- CONTEXT *ctx; -+ - #ifdef USE_IMAP - /* update postponed count as well, on force */ - if (force) -@@ -294,8 +294,6 @@ int mutt_buffy_check (int force) - - for (tmp = Incoming; tmp; tmp = tmp->next) - { -- if ( tmp->new == 1 ) -- tmp->has_new = 1; - #ifdef USE_IMAP - if (tmp->magic != M_IMAP) - #endif -@@ -347,14 +345,18 @@ int mutt_buffy_check (int force) - ) - - { -+ int check; +--- configure.ac ++++ configure.ac 2007-06-01 12:57:38.328822000 +0200 +@@ -234,7 +234,7 @@ main () + mutt_cv_slang=$withval + if test -d $withval/include/slang; then + CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" +- elif test -d $withval/include; then ++ elif test -d $withval/include && test $withval != /usr ; then + CPPFLAGS="$CPPFLAGS -I${withval}/include" + fi + LDFLAGS="$LDFLAGS -L${withval}/lib" +@@ -656,8 +656,12 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with- + else + if test "$with_ssl" != "yes" + then ++ case $withval in /usr|/usr/local) ;; ++ *) + LDFLAGS="$LDFLAGS -L$withval/lib" + CPPFLAGS="$CPPFLAGS -I$withval/include" ++ ;; ++ esac + fi + saved_LIBS="$LIBS" + +@@ -717,8 +721,12 @@ AC_ARG_WITH(sasl, AC_HELP_STRING([--with + + if test "$with_sasl" != "yes" + then ++ case $with_sasl in /usr|/usr/local) ;; ++ *) + CPPFLAGS="$CPPFLAGS -I$with_sasl/include" + LDFLAGS="$LDFLAGS -L$with_sasl/lib" ++ ;; ++ esac + fi + + saved_LIBS="$LIBS" +--- init.h ++++ init.h 2006-08-17 19:07:25.000000000 +0200 +@@ -2138,6 +2138,9 @@ struct option_t MuttVars[] = { + ** since it would otherwise have to abort the connection anyway. This + ** option supersedes $$ssl_starttls. + */ ++#if defined(USE_IMAP) && defined(SUSE_IMAP_FORCE_SSL) ++ { "imap_force_ssl", DT_SYN, R_NONE, UL "ssl_force_tls", 0 }, ++#endif + { "ssl_starttls", DT_QUAD, R_NONE, OPT_SSLSTARTTLS, M_YES }, + /* + ** .pp +--- doc/Makefile.in ++++ doc/Makefile.in 2009-03-03 15:58:09.281410456 +0100 +@@ -547,7 +547,7 @@ uninstall-local: + + check: + manual.txt: manual.html +- -LC_ALL=C lynx -dump -nolist -with_backspaces manual.html > $@ || \ ++ -LC_ALL=C lynx -dont_wrap_pre -center -dump -nolist -with_backspaces manual.html > $@ || \ + LC_ALL=C w3m -dump manual.html > $@ || \ + LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@ + +--- doc/Muttrc ++++ doc/Muttrc 2009-03-03 15:56:32.904001949 +0100 +@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ + "call urlview to extract URLs out of a message" + + # Show documentation when pressing F1 +-macro generic,pager <F1> "<shell-escape> less /usr/local/share/doc/mutt/manual.txt<Enter>" "show Mutt documentation" ++macro generic,index,pager <F1> "<shell-escape> less -iM /usr/share/doc/packages/mutt/manual.txt.gz<Enter>" "show Mutt documentation" + + # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" + macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list" +@@ -348,9 +348,9 @@ attachments -I message/external-body + # in a reply. For a full listing of defined printf(3)-like sequences see + # the section on $index_format. + # +-# +-# set autoedit=no +-# + - switch (tmp->magic) - { - case M_MBOX: - case M_MMDF: ++set autoedit=yes ++ + # Name: autoedit + # Type: boolean + # Default: no +@@ -437,9 +437,9 @@ attachments -I message/external-body + # follow these menus. The option is unset by default because many + # visual terminals don't permit making the cursor invisible. + # +-# +-# set check_mbox_size=no +-# ++ ++set check_mbox_size=yes ++ + # Name: check_mbox_size + # Type: boolean + # Default: no +@@ -750,11 +750,11 @@ attachments -I message/external-body + # filtered message is read from the standard output. + # + # +-# set dotlock_program="/usr/local/bin/mutt_dotlock" ++# set dotlock_program="/usr/bin/mutt_dotlock" + # + # Name: dotlock_program + # Type: path +-# Default: "/usr/local/bin/mutt_dotlock" ++# Default: "/usr/bin/mutt_dotlock" + # + # + # Contains the path of the mutt_dotlock(8) binary to be used by +@@ -2108,9 +2108,9 @@ attachments -I message/external-body + # directly from the pager, and screen resizes cause lines longer than + # the screen width to be badly formatted in the help menu. + # +-# +-# set pager_context=0 +-# ++ ++set pager_context=4 ++ + # Name: pager_context + # Type: number + # Default: 0 +@@ -2134,9 +2134,9 @@ attachments -I message/external-body + # pager. The valid sequences are listed in the $index_format + # section. + # +-# +-# set pager_index_lines=0 +-# ++ ++set pager_index_lines=10 ++ + # Name: pager_index_lines + # Type: number + # Default: 0 +@@ -2154,9 +2154,9 @@ attachments -I message/external-body + # is less than $pager_index_lines, then the index will only use as + # many lines as it needs. + # +-# +-# set pager_stop=no +-# ++ ++set pager_stop=yes ++ + # Name: pager_stop + # Type: boolean + # Default: no +@@ -3678,9 +3678,9 @@ attachments -I message/external-body + # (possibly undeleted) message whenever a command that modifies the + # current message is executed. + # +-# +-# set reverse_alias=no +-# ++ ++set reverse_alias=yes ++ + # Name: reverse_alias + # Type: boolean + # Default: no +@@ -3812,6 +3812,18 @@ attachments -I message/external-body + # Also see the $force_name variable. + # + # ++# set send_group_reply_to=no ++# ++# Name: send_group_reply_to ++# Type: boolean ++# Default: no ++# ++# ++# This variable controls how group replies are done. ++# When set, all recepients listet in "To:" are set in the ++# "To:" header again, else in the "CC", which is the default. ++# ++# + # set score=yes + # + # Name: score +@@ -4071,9 +4083,9 @@ attachments -I message/external-body + # Setting this variable overrides the value of the $sendmail + # variable. + # +-# +-# set sort=date +-# ++ ++set sort=reverse-date-sent ++ + # Name: sort + # Type: sort order + # Default: date +@@ -4382,9 +4394,9 @@ attachments -I message/external-body + # raw message received (for example quoted-printable encoded or with encoded + # headers) which may lead to incorrect search results. + # +-# +-# set tilde=no +-# ++ ++set tilde=yes ++ + # Name: tilde + # Type: boolean + # Default: no +@@ -4678,3 +4690,39 @@ attachments -I message/external-body + # in this case. + # + # ++# set xterm_icon="M%?n?AIL&ail?" ++# ++# Name: xterm_icon ++# Type: string ++# Default: "M%?n?AIL&ail?" ++# ++# ++# Controls the format of the icon title, as long as xterm_set_titles ++# is enabled. This string is identical in formatting to the one used by ++# ``$status_format''. ++# ++# ++# set xterm_set_titles=no ++# ++# Name: xterm_set_titles ++# Type: boolean ++# Default: no ++# ++# ++# Controls whether mutt sets the xterm title bar and icon name ++# (as long as you're in an appropriate terminal). The default must ++# be off to force in the validity checking. ++# ++# ++# set xterm_title="Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?" ++# ++# Name: xterm_title ++# Type: string ++# Default: "Mutt with %?m?%m messages&no messages?%?n? [%n NEW]?" ++# ++# ++# Controls the format of the title bar of the xterm provided that ++# xterm_set_titles has been set. This string is identical in formatting ++# to the one used by ``$status_format''. ++# ++# +--- doc/Muttrc.head ++++ doc/Muttrc.head 2007-06-01 12:51:03.642800000 +0200 +@@ -23,7 +23,7 @@ macro index,pager,attach,compose \cb "\ + "call urlview to extract URLs out of a message" -- { -- if (STAT_CHECK || tmp->msgcount == 0) -+ check = STAT_CHECK; -+ -+ if (option(OPTSIDEBAR) && (check || tmp->msgcount == 0)) - { -+ CONTEXT *ctx; - BUFFY b = *tmp; - int msgcount = 0; - int msg_unread = 0; -@@ -369,21 +371,22 @@ int mutt_buffy_check (int force) - *tmp = b; - tmp->msgcount = msgcount; - tmp->msg_unread = msg_unread; -- if(STAT_CHECK) { -- tmp->has_new = tmp->new = 1; -- BuffyCount++; -- } -+ } -+ if (check) + # Show documentation when pressing F1 +-macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation" ++macro generic,index,pager <F1> "<shell-escape> less -iM @docdir@/manual.txt<Enter>" "show Mutt documentation" + + # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" + macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list" +--- imap/auth.c ++++ imap/auth.c 2006-11-09 16:19:56.000000000 +0100 +@@ -72,6 +72,23 @@ int imap_authenticate (IMAP_DATA* idata) + dprint (2, (debugfile, "imap_authenticate: Trying method %s\n", method)); + authenticator = imap_authenticators; + ++#ifdef USE_SASL ++ /* "login" not supported by SASL */ ++ if (!ascii_strcasecmp ("login", method)) ++ { ++ while (authenticator->authenticate) + { -+ BuffyCount++; -+ tmp->new = 1; - } - else if (option(OPTCHECKMBOXSIZE)) - { - /* some other program has deleted mail from the folder */ - tmp->size = (long) sb.st_size; - } -- if (tmp->newly_created && -- (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) -- tmp->newly_created = 0; -- } -- break; -+ if (tmp->newly_created && -+ (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) -+ tmp->newly_created = 0; -+ -+ break; - - case M_MAILDIR: - -@@ -402,16 +405,25 @@ int mutt_buffy_check (int force) - if (*de->d_name != '.' && - (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) - { -- tmp->has_new = tmp->new = 1; -+ if (!option(OPTSIDEBAR)) ++ char* identify = authenticator->method; ++ if (identify && !ascii_strcasecmp(identify, method)) ++ if ((r = authenticator->authenticate(idata, method)) != IMAP_AUTH_UNAVAIL) + { -+ BuffyCount++; -+ tmp->new = 1; -+ break; ++ FREE(&methods); ++ return r; + } -+ tmp->new = 1; - tmp->msgcount++; - tmp->msg_unread++; - } - } - if(tmp->msg_unread) - BuffyCount++; -- -+ - closedir (dirp); - -+ if (!option(OPTSIDEBAR)) -+ break; -+ - /* - * count read messages (for folderlist (sidebar) we also need to count - * messages in cur so that we the total number of messages -@@ -435,25 +447,25 @@ int mutt_buffy_check (int force) - break; - - case M_MH: -- { -- DIR *dp; -- struct dirent *de; -- if ((tmp->new = mh_buffy (tmp->path)) > 0) -- BuffyCount++; -- -- if ((dp = opendir (path)) == NULL) -- break; -- tmp->msgcount = 0; -- while ((de = readdir (dp))) -- { -- if (mh_valid_message (de->d_name)) -- { -- tmp->msgcount++; -- tmp->has_new = tmp->new = 1; -- } -- } -- closedir (dp); -- } -+ -+ if ((tmp->new = mh_buffy (tmp->path)) > 0) -+ BuffyCount++; -+ if (!option(OPTSIDEBAR)) -+ break; -+ -+ if ((dirp = opendir (path)) == NULL) -+ break; -+ tmp->msgcount = 0; -+ while ((de = readdir (dirp))) -+ { -+ if (mh_valid_message (de->d_name)) -+ { -+ tmp->msgcount++; -+ tmp->new = 1; -+ } ++ authenticator++; + } -+ closedir (dirp); -+ - break; ++ } else { ++#endif + while (authenticator->authenticate) + { + if (!authenticator->method || +@@ -85,6 +102,9 @@ int imap_authenticate (IMAP_DATA* idata) + + authenticator++; } ++#ifdef USE_SASL ++ } ++#endif } ---- buffy.h -+++ buffy.h 2006-11-16 12:26:58.000000000 +0100 -@@ -27,7 +27,6 @@ typedef struct buffy_t - struct buffy_t *next; - struct buffy_t *prev; - short new; /* mailbox has new mail */ -- short has_new; /* set it new if new and not read */ - int msgcount; /* total number of messages */ - int msg_unread; /* number of unread messages */ - short notified; /* user has been notified */ + + FREE (&methods); ++++++ mutt-1.5.17-opennfs.dif -> mutt-1.5.19-opennfs.dif ++++++ --- mutt/mutt-1.5.17-opennfs.dif 2007-12-20 19:57:18.000000000 +0100 +++ mutt/mutt-1.5.19-opennfs.dif 2009-03-03 17:02:23.104002378 +0100 @@ -1,17 +1,6 @@ ---- - Makefile.am | 4 - - Makefile.in | 6 +- - lib.c | 7 ++- - mbox.c | 2 - mh.c | 9 +++- - mutt.h | 1 - opennfs.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - sendlib.c | 2 - 8 files changed, 144 insertions(+), 9 deletions(-) - ---- a/Makefile.am -+++ b/Makefile.am -@@ -23,7 +23,7 @@ mutt_SOURCES = $(BUILT_SOURCES) \ +--- Makefile.am ++++ Makefile.am 2009-03-03 00:00:00.000000000 +0100 +@@ -23,7 +23,7 @@ mutt_SOURCES = \ edit.c enter.c flags.c init.c filter.c from.c \ getdomain.c group.c \ handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ @@ -20,7 +9,7 @@ postpone.c query.c recvattach.c recvcmd.c \ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ score.c send.c sendlib.c signal.c sort.c \ -@@ -87,7 +87,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c +@@ -78,7 +78,7 @@ mutt_dotlock_SOURCES = mutt_dotlock.c mutt_dotlock_LDADD = @LIBOBJS@ mutt_dotlock_DEPENDENCIES = @LIBOBJS@ @@ -29,18 +18,18 @@ pgpring_LDADD = @LIBOBJS@ $(INTLLIBS) pgpring_DEPENDENCIES = @LIBOBJS@ $(INTLDEPS) ---- a/Makefile.in -+++ b/Makefile.in -@@ -81,7 +81,7 @@ am_mutt_OBJECTS = $(am__objects_1) addrb - group.$(OBJEXT) handler.$(OBJEXT) hash.$(OBJEXT) \ - hdrline.$(OBJEXT) headers.$(OBJEXT) help.$(OBJEXT) \ - hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) mbox.$(OBJEXT) \ -- menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) pager.$(OBJEXT) \ -+ menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) opennfs.$(OBJEXT) pager.$(OBJEXT) \ - parse.$(OBJEXT) pattern.$(OBJEXT) postpone.$(OBJEXT) \ - query.$(OBJEXT) recvattach.$(OBJEXT) recvcmd.$(OBJEXT) \ - rfc822.$(OBJEXT) rfc1524.$(OBJEXT) rfc2047.$(OBJEXT) \ -@@ -103,7 +103,7 @@ pgpewrap_LDADD = $(LDADD) +--- Makefile.in ++++ Makefile.in 2009-03-03 17:00:37.648811010 +0100 +@@ -75,7 +75,7 @@ am_mutt_OBJECTS = addrbook.$(OBJEXT) ali + hash.$(OBJEXT) hdrline.$(OBJEXT) headers.$(OBJEXT) \ + help.$(OBJEXT) hook.$(OBJEXT) keymap.$(OBJEXT) main.$(OBJEXT) \ + mbox.$(OBJEXT) menu.$(OBJEXT) mh.$(OBJEXT) mx.$(OBJEXT) \ +- pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \ ++ opennfs.$(OBJEXT) pager.$(OBJEXT) parse.$(OBJEXT) pattern.$(OBJEXT) \ + postpone.$(OBJEXT) query.$(OBJEXT) recvattach.$(OBJEXT) \ + recvcmd.$(OBJEXT) rfc822.$(OBJEXT) rfc1524.$(OBJEXT) \ + rfc2047.$(OBJEXT) rfc2231.$(OBJEXT) rfc3676.$(OBJEXT) \ +@@ -102,7 +102,7 @@ pgpewrap_LDADD = $(LDADD) pgpewrap_DEPENDENCIES = @LIBOBJS@ am_pgpring_OBJECTS = pgppubring.$(OBJEXT) pgplib.$(OBJEXT) \ lib.$(OBJEXT) extlib.$(OBJEXT) sha1.$(OBJEXT) md5.$(OBJEXT) \ @@ -49,7 +38,7 @@ pgpring_OBJECTS = $(am_pgpring_OBJECTS) binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) -@@ -308,7 +308,7 @@ mutt_SOURCES = $(BUILT_SOURCES) \ +@@ -302,7 +302,7 @@ mutt_SOURCES = \ edit.c enter.c flags.c init.c filter.c from.c \ getdomain.c group.c \ handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ @@ -58,9 +47,9 @@ postpone.c query.c recvattach.c recvcmd.c \ rfc822.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \ score.c send.c sendlib.c signal.c sort.c \ ---- a/lib.c -+++ b/lib.c -@@ -48,6 +48,7 @@ +--- lib.c ++++ lib.c 2009-03-03 00:00:00.000000000 +0100 +@@ -50,6 +50,7 @@ #define EX_OK 0 #endif @@ -68,7 +57,7 @@ #include "lib.h" -@@ -566,6 +567,10 @@ int safe_open (const char *path, int fla +@@ -633,6 +634,10 @@ int safe_open (const char *path, int fla struct stat osb, nsb; int fd; @@ -79,7 +68,7 @@ if (flags & O_EXCL) { char safe_file[_POSIX_PATH_MAX]; -@@ -589,7 +594,7 @@ int safe_open (const char *path, int fla +@@ -656,7 +661,7 @@ int safe_open (const char *path, int fla if ((fd = open (path, flags & ~O_EXCL, 0600)) < 0) return fd; @@ -88,9 +77,9 @@ /* make sure the file is not symlink */ if (lstat (path, &osb) < 0 || fstat (fd, &nsb) < 0 || compare_stat(&osb, &nsb) == -1) ---- a/mbox.c -+++ b/mbox.c -@@ -741,7 +741,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int +--- mbox.c ++++ mbox.c 2009-03-03 00:00:00.000000000 +0100 +@@ -749,7 +749,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int /* Create a temporary file to write the new version of the mailbox in. */ mutt_mktemp (tempfile); @@ -99,8 +88,8 @@ (fp = fdopen (i, "w")) == NULL) { if (-1 != i) ---- a/mh.c -+++ b/mh.c +--- mh.c ++++ mh.c 2009-03-03 00:00:00.000000000 +0100 @@ -238,7 +238,11 @@ static int mh_mkstemp (CONTEXT * dest, F { snprintf (path, _POSIX_PATH_MAX, "%s/.mutt-%s-%d-%d", @@ -113,7 +102,7 @@ { if (errno != EEXIST) { -@@ -1215,8 +1219,11 @@ int maildir_open_new_message (MESSAGE * +@@ -1248,8 +1252,11 @@ int maildir_open_new_message (MESSAGE * dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n", path)); @@ -126,16 +115,16 @@ { if (errno != EEXIST) { ---- a/mutt.h -+++ b/mutt.h -@@ -974,4 +974,5 @@ typedef struct +--- mutt.h ++++ mutt.h 2009-03-03 00:00:00.000000000 +0100 +@@ -956,4 +956,5 @@ typedef struct #include "lib.h" #include "globals.h" +extern int opennfs(const char *, int, int); #endif /*MUTT_H*/ ---- /dev/null -+++ b/opennfs.c +--- opennfs.c ++++ opennfs.c 2009-03-03 00:00:00.000000000 +0100 @@ -0,0 +1,122 @@ +#include <errno.h> +#include <fcntl.h> @@ -259,9 +248,9 @@ + if (clear) free(clear); + return open(path, flags, mode); +} ---- a/sendlib.c -+++ b/sendlib.c -@@ -2030,7 +2030,7 @@ send_msg (const char *path, char **args, +--- sendlib.c ++++ sendlib.c 2009-03-03 00:00:00.000000000 +0100 +@@ -2028,7 +2028,7 @@ send_msg (const char *path, char **args, if (SendmailWait >= 0 && tempfile) { /* *tempfile will be opened as stdout */ ++++++ mutt-1.5.15.sidebar-fix.dif -> mutt-1.5.19.sidebar-fix.dif ++++++ --- mutt/mutt-1.5.15.sidebar-fix.dif 2007-06-01 13:37:57.000000000 +0200 +++ mutt/mutt-1.5.19.sidebar-fix.dif 2009-03-03 16:57:58.856002820 +0100 @@ -1,5 +1,5 @@ --- buffy.c -+++ buffy.c 2007-06-01 13:37:02.671160950 +0200 ++++ buffy.c 2009-03-03 16:56:53.886429226 +0100 @@ -259,7 +259,7 @@ int mutt_buffy_check (int force) char path[_POSIX_PATH_MAX]; struct stat contex_sb; @@ -18,7 +18,7 @@ #ifdef USE_IMAP if (tmp->magic != M_IMAP) #endif -@@ -347,14 +345,18 @@ int mutt_buffy_check (int force) +@@ -347,13 +345,18 @@ int mutt_buffy_check (int force) ) { @@ -29,53 +29,35 @@ case M_MBOX: case M_MMDF: -- { -- if (STAT_CHECK || tmp->msgcount == 0) +- if (STAT_CHECK || tmp->msgcount == 0) + check = STAT_CHECK; + + if (option(OPTSIDEBAR) && (check || tmp->msgcount == 0)) { + CONTEXT *ctx; BUFFY b = *tmp; - int msgcount = 0; - int msg_unread = 0; -@@ -369,21 +371,22 @@ int mutt_buffy_check (int force) - *tmp = b; - tmp->msgcount = msgcount; - tmp->msg_unread = msg_unread; -- if(STAT_CHECK) { -- tmp->has_new = tmp->new = 1; -- BuffyCount++; -- } + int msgcount = 0; + int msg_unread = 0; +@@ -368,11 +371,11 @@ int mutt_buffy_check (int force) + *tmp = b; + tmp->msgcount = msgcount; + tmp->msg_unread = msg_unread; +- if (STAT_CHECK) + } + if (check) -+ { -+ BuffyCount++; + { +- tmp->has_new = tmp->new = 1; + BuffyCount++; +- } + tmp->new = 1; } else if (option(OPTCHECKMBOXSIZE)) { - /* some other program has deleted mail from the folder */ - tmp->size = (long) sb.st_size; - } -- if (tmp->newly_created && -- (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) -- tmp->newly_created = 0; -- } -- break; -+ if (tmp->newly_created && -+ (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime)) -+ tmp->newly_created = 0; -+ -+ break; - - case M_MAILDIR: - -@@ -402,16 +405,25 @@ int mutt_buffy_check (int force) +@@ -403,7 +406,13 @@ int mutt_buffy_check (int force) if (*de->d_name != '.' && (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) { -- tmp->has_new = tmp->new = 1; +- tmp->has_new = tmp->new = 1; + if (!option(OPTSIDEBAR)) + { + BuffyCount++; @@ -83,69 +65,71 @@ + break; + } + tmp->new = 1; - tmp->msgcount++; - tmp->msg_unread++; - } - } - if(tmp->msg_unread) - BuffyCount++; -- -+ - closedir (dirp); - + tmp->msgcount++; + tmp->msg_unread++; + } +@@ -413,6 +422,9 @@ int mutt_buffy_check (int force) + + closedir (dirp); + + if (!option(OPTSIDEBAR)) + break; + - /* - * count read messages (for folderlist (sidebar) we also need to count - * messages in cur so that we the total number of messages -@@ -435,25 +447,25 @@ int mutt_buffy_check (int force) + /* + * count read messages (for folderlist (sidebar) we also need to count + * messages in cur so that we the total number of messages +@@ -430,8 +442,7 @@ int mutt_buffy_check (int force) + (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T'))) + { + tmp->msgcount++; +- if (p && strchr(p + 3, 'F')) +- { ++ if (p && strchr(p + 3, 'F')) { + tmp->msg_flagged++; + } + } +@@ -440,26 +451,25 @@ int mutt_buffy_check (int force) break; case M_MH: -- { -- DIR *dp; -- struct dirent *de; -- if ((tmp->new = mh_buffy (tmp->path)) > 0) -- BuffyCount++; -- -- if ((dp = opendir (path)) == NULL) -- break; -- tmp->msgcount = 0; -- while ((de = readdir (dp))) -- { -- if (mh_valid_message (de->d_name)) -- { -- tmp->msgcount++; -- tmp->has_new = tmp->new = 1; -- } -- } -- closedir (dp); -- } + -+ if ((tmp->new = mh_buffy (tmp->path)) > 0) -+ BuffyCount++; + if ((tmp->new = mh_buffy (tmp->path)) > 0) +- { +- DIR *dp; +- struct dirent *de; +- if ((tmp->new = mh_buffy (tmp->path)) > 0) + BuffyCount++; + if (!option(OPTSIDEBAR)) + break; -+ + +- if ((dp = opendir (path)) == NULL) +- break; +- tmp->msgcount = 0; +- while ((de = readdir (dp))) + if ((dirp = opendir (path)) == NULL) + break; + tmp->msgcount = 0; + while ((de = readdir (dirp))) + { + if (mh_valid_message (de->d_name)) -+ { + { +- if (mh_valid_message (de->d_name)) +- { +- tmp->msgcount++; +- tmp->has_new = tmp->new = 1; +- } + tmp->msgcount++; -+ tmp->new = 1; -+ } -+ } ++ tmp->new = 1; + } +- closedir (dp); + } + closedir (dirp); + break; } } --- buffy.h -+++ buffy.h 2006-11-16 12:26:58.000000000 +0100 ++++ buffy.h 2009-03-03 16:47:06.444002194 +0100 @@ -27,7 +27,6 @@ typedef struct buffy_t struct buffy_t *next; struct buffy_t *prev; @@ -153,4 +137,4 @@ - short has_new; /* set it new if new and not read */ int msgcount; /* total number of messages */ int msg_unread; /* number of unread messages */ - short notified; /* user has been notified */ + int msg_flagged; /* number of flagged messages */ ++++++ mutt-1.5.17.tar.bz2 -> mutt-1.5.19.tar.bz2 ++++++ ++++ 304893 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0