February 2007 - openSUSE Commits - openSUSE Mailing Lists

commit postfix
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package postfix checked in at Mon Feb 26 19:06:54 CET 2007. -------- --- postfix/postfix.changes 2007-01-16 09:11:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/postfix/postfix.changes 2007-02-26 10:34:32.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 26 10:32:36 CET 2007 - varkoly(a)suse.de + +- #247351 - postfix - Ports for SuSEfirewall added via packages + +- Move postfix.xml into the postfix-SuSE tarball + +------------------------------------------------------------------- Old: ---- postfix.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.uE6894/_old 2007-02-26 19:06:38.000000000 +0100 +++ /var/tmp/diff_new_pack.uE6894/_new 2007-02-26 19:06:38.000000000 +0100 @@ -22,10 +22,9 @@ Autoreqprov: on Summary: A fast, secure, and flexible mailer Version: 2.3.2 -Release: 34 +Release: 37 Source: postfix-%{version}.tar.gz Source1: postfix-SuSE.tar.gz -Source2: postfix.xml Patch: dynamic_maps.patch Patch1: dynamic_maps_pie.patch Prereq: /usr/sbin/useradd /usr/sbin/groupadd %insserv_prereq %fillup_prereq /bin/sed /bin/awk /bin/grep textutils sh-utils fileutils pcre openldap2-client netcfg /sbin/ip @@ -187,7 +186,9 @@ rm -rf $RPM_BUILD_ROOT/var/spool/postfix install -m 644 postfix-SuSE/master.cf $RPM_BUILD_ROOT/%{conf_backup_dir}/master.cf mkdir -p $RPM_BUILD_ROOT/%{omc_dir} -install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{omc_dir} +install -m 644 postfix-SuSE/postfix.xml $RPM_BUILD_ROOT/%{omc_dir} +mkdir -p $RPM_BUILD_ROOT/usr/share/SuSEfirewall2/services/ +install -m 644 postfix-SuSE/postfix-fw $RPM_BUILD_ROOT/usr/share/SuSEfirewall2/services/postfix { cat<<EOF # @@ -491,6 +492,7 @@ %config(noreplace) /etc/postfix/header_checks %config(noreplace) /etc/postfix/bounce.cf.default %config(noreplace) /etc/postfix/dynamicmaps.cf +%config(noreplace) /usr/share/SuSEfirewall2/services/postfix %dir /etc/sasl2/ %config(noreplace) /etc/sasl2/smtpd.conf /etc/postfix/LICENSE @@ -567,7 +569,10 @@ Wietse Venema <wietse(a)porcupine.org> -%changelog -n postfix +%changelog +* Mon Feb 26 2007 - varkoly(a)suse.de +- #247351 - postfix - Ports for SuSEfirewall added via packages +- Move postfix.xml into the postfix-SuSE tarball * Mon Jan 15 2007 - varkoly(a)suse.de - #144104 - postfix does not start - Implementing Fate #301840: Postfix XML Service Description Document ++++++ postfix-SuSE.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/postfix-fw new/postfix-SuSE/postfix-fw --- old/postfix-SuSE/postfix-fw 1970-01-01 01:00:00.000000000 +0100 +++ new/postfix-SuSE/postfix-fw 2007-02-26 10:29:47.000000000 +0100 @@ -0,0 +1,17 @@ +## Description: Firewall Configuration file for postfix + +# space separated list of allowed TCP ports +TCP="25 465" + +# space separated list of allowed UDP ports +UDP="" + +# space separated list of allowed RPC services +RPC="" + +# space separated list of allowed IP protocols +IP="" + +# space separated list of allowed UDP broadcast ports +BROADCAST="" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/postfix.xml new/postfix-SuSE/postfix.xml --- old/postfix-SuSE/postfix.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/postfix-SuSE/postfix.xml 2007-01-16 09:11:27.000000000 +0100 @@ -0,0 +1,77 @@ +<?xml version="1.0"?> + + +<serviceDescription version="1.0"> + +  + <caption>Postfix Mail Server</caption> + +  + <description> + Postfix is a fast, secure, and flexible mailer. + Postfix aims to be an alternative to the widely-used sendmail program. + </description> + +  + <dependsOn> + <serviceName>network</serviceName> + <serviceName>syslog</serviceName> + </dependsOn> + +  + <startCommand>/usr/sbin/postfix start</startCommand> + +  + <reStartCommand>/usr/sbin/postfix restart</reStartCommand> + +  + <stopCommand>/usr/sbin/postfix stop</stopCommand> + +  + <statusCommand>/etc/init.d/postfix status</statusCommand> + +</serviceDescription> + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/postfix-SuSE/SuSEconfig.postfix new/postfix-SuSE/SuSEconfig.postfix --- old/postfix-SuSE/SuSEconfig.postfix 2007-01-16 09:08:32.000000000 +0100 +++ new/postfix-SuSE/SuSEconfig.postfix 2007-02-26 10:24:26.000000000 +0100 @@ -485,10 +485,10 @@ $line = $1; } if ( $use_amavis eq "yes" ) { - $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(\s+\w+)/; + $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; $line = $1."10".$2." -o content_filter=smtp:[127.0.0.1]:10024"; } else { - $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(\s+\w+)/; + $line =~ /(\#?\s*smtp\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; $line = $1."-".$2; } } elsif( /\#?\s*(local\s+unix.*)/ ) { @@ -520,10 +520,10 @@ $line = $1." -o smtpd_tls_wrappermode=yes"; } if ( $use_amavis eq "yes" ) { - $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(\s+\w+)/; + $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; $line = $1."10".$2." -o content_filter=smtp:[127.0.0.1]:10024"; } else { - $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(\s+\w+)/; + $line =~ /(\#?\s*smtps\s+inet\s+[yn-]?\s+[yn-]?\s+[yn-]?\s+[0-9?yn-]?\s+)[0-9-]+(.*)/; $line = $1."-".$2; } } elsif( /^(\#?\s*(?:pickup|qmgr)\s+)(?:fifo|unix)(\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 yast2-users
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package yast2-users checked in at Mon Feb 26 19:06:40 CET 2007. -------- --- yast2-users/yast2-users.changes 2007-02-23 14:25:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2007-02-26 13:59:08.844555000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 26 13:51:56 CET 2007 - jsuchome(a)suse.cz + +- fixed usage of new Package::Available +- 2.15.15 + +------------------------------------------------------------------- Old: ---- yast2-users-2.15.14.tar.bz2 New: ---- yast2-users-2.15.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.qo6279/_old 2007-02-26 19:06:33.000000000 +0100 +++ /var/tmp/diff_new_pack.qo6279/_new 2007-02-26 19:06:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-users (Version 2.15.14) +# spec file for package yast2-users (Version 2.15.15) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-users -Version: 2.15.14 +Version: 2.15.15 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.15.14.tar.bz2 +Source0: yast2-users-2.15.15.tar.bz2 prefix: /usr BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-mail-aliases yast2-perl-bindings yast2-security yast2-testsuite Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security yast2-mail-aliases cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext yast2-ldap-client @@ -42,7 +42,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-users-2.15.14 +%setup -n yast2-users-2.15.15 %build %{prefix}/bin/y2tool y2autoconf @@ -86,6 +86,9 @@ %doc %{prefix}/share/doc/packages/yast2-users %changelog +* Mon Feb 26 2007 - jsuchome(a)suse.cz +- fixed usage of new Package::Available +- 2.15.15 * Fri Feb 23 2007 - jsuchome(a)suse.cz - include documentaion for YaPI's USERS.pm (#248203) - 2.15.14 ++++++ yast2-users-2.15.14.tar.bz2 -> yast2-users-2.15.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.15.14/src/inst_auth.ycp new/yast2-users-2.15.15/src/inst_auth.ycp --- old/yast2-users-2.15.14/src/inst_auth.ycp 2007-02-01 14:21:03.000000000 +0100 +++ new/yast2-users-2.15.15/src/inst_auth.ycp 2007-02-26 10:27:33.000000000 +0100 @@ -178,14 +178,19 @@ list<string> available_clients = [ "users", "ldap" ]; -if (Package::Available ("yast2-nis-client") && found) - available_clients = add (available_clients, "nis"); - -if (Package::Available ("yast2-samba-client") && found) - available_clients = add (available_clients, "samba"); +if (found) +{ + boolean available = false; + foreach (string client, string package, $[ "nis" : "yast2-nis-client", + "samba" : "yast2-samba-client", "edir_ldap" : "yast2-linux-user-mgmt" ], { + if (available == nil) + return; + available = Package::Available (package); + if (available == true) + available_clients = add (available_clients, client); + }); +} -if (Package::Available ("yast2-linux-user-mgmt") && found) - available_clients = add (available_clients, "edir_ldap"); if (contains (available_clients, "nis")) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.15.14/VERSION new/yast2-users-2.15.15/VERSION --- old/yast2-users-2.15.14/VERSION 2007-02-23 13:50:34.000000000 +0100 +++ new/yast2-users-2.15.15/VERSION 2007-02-26 13:52:16.000000000 +0100 @@ -1 +1 @@ -2.15.14 +2.15.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 yast2-ncurses
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package yast2-ncurses checked in at Mon Feb 26 19:06:24 CET 2007. -------- --- yast2-ncurses/yast2-ncurses.changes 2007-02-21 13:34:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2007-02-22 12:43:38.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 22 12:43:06 CET 2007 - gs(a)suse.de + +- Online Update: Add column with patch version and show the version in + the description window (bug #239829) +- 2.15.9 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.15.8.tar.bz2 New: ---- yast2-ncurses-2.15.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.Qh3349/_old 2007-02-26 19:06:11.000000000 +0100 +++ /var/tmp/diff_new_pack.Qh3349/_new 2007-02-26 19:06:11.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.15.8) +# spec file for package yast2-ncurses (Version 2.15.9) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.15.8 +Version: 2.15.9 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.15.8.tar.bz2 +Source0: yast2-ncurses-2.15.9.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -44,7 +44,7 @@ %prep -%setup -n yast2-ncurses-2.15.8 +%setup -n yast2-ncurses-2.15.9 %build %{prefix}/bin/y2tool y2autoconf @@ -77,6 +77,10 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog +* Thu Feb 22 2007 - gs(a)suse.de +- Online Update: Add column with patch version and show the version in + the description window (bug #239829) +- 2.15.9 * Wed Feb 21 2007 - kmachalkova(a)suse.cz - Show 'automatic changes' popup when any pkgs are selected for installation by 'verify system' call (#239750) ++++++ yast2-ncurses-2.15.8.tar.bz2 -> yast2-ncurses-2.15.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.8/configure new/yast2-ncurses-2.15.9/configure --- old/yast2-ncurses-2.15.8/configure 2007-02-21 13:26:46.000000000 +0100 +++ new/yast2-ncurses-2.15.9/configure 2006-12-12 11:07:03.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.15.8. +# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.15.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses' PACKAGE_TARNAME='yast2-ncurses' -PACKAGE_VERSION='2.15.8' -PACKAGE_STRING='yast2-ncurses 2.15.8' +PACKAGE_VERSION='2.15.1' +PACKAGE_STRING='yast2-ncurses 2.15.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1421,7 +1421,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-ncurses 2.15.8 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses 2.15.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1492,7 +1492,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses 2.15.8:";; + short | recursive ) echo "Configuration of yast2-ncurses 2.15.1:";; esac cat <<\_ACEOF @@ -1600,7 +1600,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses configure 2.15.8 +yast2-ncurses configure 2.15.1 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1614,7 +1614,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-ncurses $as_me 2.15.8, which was +It was created by yast2-ncurses $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2415,7 +2415,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses' - VERSION='2.15.8' + VERSION='2.15.1' cat >>confdefs.h <<_ACEOF @@ -2642,7 +2642,7 @@ -VERSION="2.15.8" +VERSION="2.15.1" RPMNAME="yast2-ncurses" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -21648,7 +21648,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses $as_me 2.15.8, which was +This file was extended by yast2-ncurses $as_me 2.15.1, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21701,7 +21701,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ncurses config.status 2.15.8 +yast2-ncurses config.status 2.15.1 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.8/configure.in new/yast2-ncurses-2.15.9/configure.in --- old/yast2-ncurses-2.15.8/configure.in 2007-02-21 13:26:34.000000000 +0100 +++ new/yast2-ncurses-2.15.9/configure.in 2006-12-12 11:06:53.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ncurses dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.15.8, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.15.1, http://bugs.opensuse.org/, yast2-ncurses) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.8" +VERSION="2.15.1" RPMNAME="yast2-ncurses" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.8/src/NCPkgTable.cc new/yast2-ncurses-2.15.9/src/NCPkgTable.cc --- old/yast2-ncurses-2.15.8/src/NCPkgTable.cc 2007-02-06 16:47:43.000000000 +0100 +++ new/yast2-ncurses-2.15.9/src/NCPkgTable.cc 2007-02-22 12:27:56.000000000 +0100 @@ -537,6 +537,7 @@ header.push_back( "L" + PkgNames::PkgName() ); header.push_back( "L" + PkgNames::PkgSummary() ); header.push_back( "L" + PkgNames::PatchKind() ); + header.push_back( "L" + PkgNames::PkgVersion() ); // header.push_back( "L" + PkgNames::PkgSize() ); break; } @@ -743,7 +744,8 @@ pkgLine.push_back( selectable->name() ); // name pkgLine.push_back( patchPtr->category() ); // patch kind - + pkgLine.push_back( patchPtr->edition().asString() ); // patch version + // zypp::ByteCount size = patchPtr->size(); // pkgLine.push_back( size.asString( 8 ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.8/src/PackageSelector.cc new/yast2-ncurses-2.15.9/src/PackageSelector.cc --- old/yast2-ncurses-2.15.8/src/PackageSelector.cc 2007-02-20 14:41:44.000000000 +0100 +++ new/yast2-ncurses-2.15.9/src/PackageSelector.cc 2007-02-22 12:27:56.000000000 +0100 @@ -2481,6 +2481,9 @@ descr += PkgNames::PatchKind(); descr += ": "; descr += patchPtr->category(); + descr += " "; + descr += PkgNames::Version(); + descr += patchPtr->edition().asString(); descr += " "; if ( selectable->hasInstalledObj() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.15.8/VERSION new/yast2-ncurses-2.15.9/VERSION --- old/yast2-ncurses-2.15.8/VERSION 2007-02-21 13:06:10.000000000 +0100 +++ new/yast2-ncurses-2.15.9/VERSION 2007-02-22 12:42:25.000000000 +0100 @@ -1 +1 @@ -2.15.8 +2.15.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-storage
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package yast2-storage checked in at Mon Feb 26 19:06:24 CET 2007. -------- --- yast2-storage/yast2-storage.changes 2007-02-15 16:20:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-02-26 16:27:14.000000000 +0100 @@ -1,0 +2,29 @@ +Thu Feb 22 18:23:36 CET 2007 - fehr(a)suse.de + +- only allow crypt password from /dev/randowm when persistent + devices names are available +- fix problems caused by activated EVMS during update (#247801) +- version 2.15.5 + +------------------------------------------------------------------- +Wed Feb 21 16:51:15 CET 2007 - fehr(a)suse.de + +- provide functionality for feature #301966 + +------------------------------------------------------------------- +Tue Feb 20 12:12:58 CET 2007 - fehr(a)suse.de + +- add text to inform user about crippled IDE support +- initialize dmraid before LVM + +------------------------------------------------------------------- +Mon Feb 19 13:53:30 CET 2007 - fehr(a)suse.de + +- improve help text for journal mode (#245538) +- prevent deleted pertitione from showing up in EVMS dialog if EVMS + is activated later (#202361) +- prevent invalid creation of too small partitions in EVMS proposal + (#246211) +- do not offer whole dasd disks as PVs in EVMS (#246752) + +------------------------------------------------------------------- @@ -100 +129 @@ -- make Storage::GetDiskParition understand paths with /disk/by- (#233712) +- make Storage::GetDiskPartition understand paths with /disk/by- (#233712) Old: ---- yast2-storage-2.15.4.tar.bz2 New: ---- yast2-storage-2.15.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.el3508/_old 2007-02-26 19:06:14.000000000 +0100 +++ /var/tmp/diff_new_pack.el3508/_new 2007-02-26 19:06:14.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.15.4) +# spec file for package yast2-storage (Version 2.15.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.15.4 +Version: 2.15.5 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.15.4.tar.bz2 +Source0: yast2-storage-2.15.5.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.15.4 +%setup -n yast2-storage-2.15.5 %build %{prefix}/bin/y2tool y2autoconf @@ -164,7 +164,24 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description -%changelog -n yast2-storage +%changelog +* Thu Feb 22 2007 - fehr(a)suse.de +- only allow crypt password from /dev/randowm when persistent + devices names are available +- fix problems caused by activated EVMS during update (#247801) +- version 2.15.5 +* Wed Feb 21 2007 - fehr(a)suse.de +- provide functionality for feature #301966 +* Tue Feb 20 2007 - fehr(a)suse.de +- add text to inform user about crippled IDE support +- initialize dmraid before LVM +* Mon Feb 19 2007 - fehr(a)suse.de +- improve help text for journal mode (#245538) +- prevent deleted pertitione from showing up in EVMS dialog if EVMS + is activated later (#202361) +- prevent invalid creation of too small partitions in EVMS proposal + (#246211) +- do not offer whole dasd disks as PVs in EVMS (#246752) * Thu Feb 15 2007 - fehr(a)suse.de - ignore busy disk in parted when only type is changed (#231887) - version 2.15.4 @@ -220,7 +237,7 @@ is called and initial map is restored afterwards (#235756) - fix unchangeable mountby default (#235794) * Tue Jan 16 2007 - fehr(a)suse.de -- make Storage::GetDiskParition understand paths with /disk/by- (#233712) +- make Storage::GetDiskPartition understand paths with /disk/by- (#233712) * Mon Jan 15 2007 - fehr(a)suse.de - fix bug when removing all device on a disk (#233779) - make flexible proposal work again (#229651) ++++++ yast2-storage-2.15.4.tar.bz2 -> yast2-storage-2.15.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/disk/src/disk.ycp new/yast2-storage-2.15.5/disk/src/disk.ycp --- old/yast2-storage-2.15.4/disk/src/disk.ycp 2006-03-23 14:01:33.000000000 +0100 +++ new/yast2-storage-2.15.5/disk/src/disk.ycp 2007-02-21 16:53:41.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Michael Hager <mike(a)suse.de> * - * $Id: disk.ycp 29327 2006-03-23 13:01:30Z fehr $ + * $Id: disk.ycp 36352 2007-02-21 15:53:38Z fehr $ * * Wrapper file for inst_disk.ycp * @@ -49,6 +49,7 @@ Storage::SwitchUiAutomounter( false ); ret = WFM::CallFunction("inst_disk", [ true, true ]); Storage::SwitchUiAutomounter( true ); + Storage::SaveUsedFs(); } return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/libstorage/src/Disk.cc new/yast2-storage-2.15.5/libstorage/src/Disk.cc --- old/yast2-storage-2.15.4/libstorage/src/Disk.cc 2007-02-15 15:26:08.000000000 +0100 +++ new/yast2-storage-2.15.5/libstorage/src/Disk.cc 2007-02-20 12:10:54.000000000 +0100 @@ -804,6 +804,21 @@ "of partitions that the kernel driver of the disk can handle is %3$lu.\n" "Partitions numbered above %3$lu cannot be accessed."), (char*)dev.c_str(), range_exceed, range-1 ); + if( dev.find( "/dev/sd" )==0 ) + { + txt += "\n"; + txt += +_("openSUSE is switching to the new IDE drivers using the libata\n" +"modules. These do only support partitions with up to 15\n" +"partitions. You have the following options with openSUSE 10.3:\n" +" - Use the old IDE drivers: Boot again and add\n" +" \'hwprobe=-modules.pata\' as argument to the kernel\n" +" - Repartition your system so that maximal 15 partitions are used.\n" +" To repartition, use your existing operating system.\n" +" - Use LVM/EVMS since they can provide an arbitrary and flexible\n" +" number of block devices partitions. This needs a repartition\n" +" as well."); + } getStorage()->addInfoPopupText( dev, txt ); } for( list<Partition*>::iterator i=pl.begin(); i!=pl.end(); ++i ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/libstorage/src/EvmsCo.cc new/yast2-storage-2.15.5/libstorage/src/EvmsCo.cc --- old/yast2-storage-2.15.4/libstorage/src/EvmsCo.cc 2007-02-12 16:35:20.000000000 +0100 +++ new/yast2-storage-2.15.5/libstorage/src/EvmsCo.cc 2007-02-19 17:34:19.000000000 +0100 @@ -739,7 +739,7 @@ for( Storage::ConstDiskIterator d = dp.begin(); d!=dp.end(); ++d ) { y2mil( "disk:" << d->device() << " empty:" << d->isEmpty() ); - if( d->isEmpty() ) + if( d->isEmpty() && d->device().find("/dev/dasd")!=0 ) { y2milestone( "empty disk %s", d->name().c_str() ); i = ep.begin(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/libstorage/src/Storage.cc new/yast2-storage-2.15.5/libstorage/src/Storage.cc --- old/yast2-storage-2.15.4/libstorage/src/Storage.cc 2007-02-14 12:43:49.000000000 +0100 +++ new/yast2-storage-2.15.5/libstorage/src/Storage.cc 2007-02-21 12:44:40.000000000 +0100 @@ -240,9 +240,9 @@ ppart = new ProcPart; } detectMds(); + detectDmraid( *ppart ); detectLvmVgs(); detectEvms(); - detectDmraid( *ppart ); detectDm( *ppart ); LvmVgPair p = lvgPair(); @@ -2739,6 +2739,11 @@ return( co.isContainer()); } +static bool isDiskCreated( const Volume& v ) + { + return( v.cType()==DISK && v.created() ); + } + int Storage::evmsActivate() { int ret = 0; @@ -2766,6 +2771,46 @@ VPair p = vPair( isEvms ); detectFsData( p.begin(), p.end() ); EvmsCoPair ep = evCoPair(); + EvmsCoIterator coi = ep.begin(); + while( coi!=ep.end() && coi->device()!="/dev/evms" ) + ++coi; + if( coi!=ep.end() ) + { + EvmsCo::EvmsPair vp = coi->evmsPair(EvmsCo::lvNotDeleted); + EvmsCo::EvmsIter ei = vp.begin(); + p = vPair( Volume::isDeleted ); + while( ei!=vp.end() ) + { + y2mil( "ev:" << *ei ); + string dev = EvmsCo::evmsToDev( ei->device() ); + y2mil( "disk dev:" << dev ); + VolIterator vi = p.begin(); + while( vi!=p.end() && + (!vi->deleted() || vi->device()!=dev) ) + ++vi; + if( vi!=p.end() ) + { + const Partition* p = dynamic_cast<const Partition *>(&(*vi)); + bool rename = p!=NULL && p->nr()>0 && + p->disk()->isLogical(p->nr()); + y2mil( "ev del :" << *ei ); + handleEvmsRemoveDevice( p->disk(), vi->device(), rename ); + } + ++ei; + } + } + p = vPair( isDiskCreated ); + VolIterator vi=p.begin(); + while( vi!=p.end() ) + { + y2mil( "vi:" << *vi ); + Partition* p = dynamic_cast<Partition *>(&(*vi)); + if( p!=NULL ) + handleEvmsCreateDevice( p->disk()->device(), + vi->device(), + p->type()==EXTENDED ); + ++vi; + } std::map<string,CCont>::iterator i=backups.find("initial"); if( !evCoPair().empty() && i!=backups.end() ) { @@ -2774,7 +2819,7 @@ ++ci; if( ci==i->second.end() ) { - EvmsCoIterator coi = ep.begin(); + coi = ep.begin(); while( coi != ep.end() ) { ci=i->second.begin(); @@ -4415,6 +4460,27 @@ return( ret ); } +string Storage::getAllUsedFs() const + { + list<FsType> fs; + ConstVolPair p = volPair( Volume::notDeleted ); + for( ConstVolIterator v=p.begin(); v!=p.end(); ++v ) + { + FsType t = v->getFs(); + if( t!=FSUNKNOWN && t!=FSNONE && + find( fs.begin(), fs.end(), t )==fs.end() ) + fs.push_back(t); + } + string ret; + for( list<FsType>::const_iterator i=fs.begin(); i!=fs.end(); ++i ) + { + if( !ret.empty() ) + ret += ' '; + ret += Volume::fsTypeString(*i); + } + y2mil( "ret:" << ret ); + return( ret ); + } bool Storage::getFsCapabilities (FsType fstype, FsCapabilities& fscapabilities) const @@ -4575,7 +4641,8 @@ v->setSilent(); y2mil( "v:" << *v ); } - if( disk->isEmpty() && !findVolume( EvmsCo::devToEvms(disk->device()), v) ) + if( disk->isEmpty() && disk->device().find("/dev/dasd")!=0 && + !findVolume( EvmsCo::devToEvms(disk->device()), v) ) { EvmsCo* co = dynamic_cast<EvmsCo *>(&(*c)); if( co != NULL ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/libstorage/src/Storage.h new/yast2-storage-2.15.5/libstorage/src/Storage.h --- old/yast2-storage-2.15.4/libstorage/src/Storage.h 2007-02-13 13:08:45.000000000 +0100 +++ new/yast2-storage-2.15.5/libstorage/src/Storage.h 2007-02-21 12:36:25.000000000 +0100 @@ -280,6 +280,7 @@ bool getFsCapabilities( storage::FsType fstype, storage::FsCapabilities& fscapabilities) const; + string getAllUsedFs() const; void setExtError( const string& txt ); int createPartition( const string& disk, storage::PartitionType type, unsigned long start, unsigned long size, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/libstorage/src/StorageInterface.h new/yast2-storage-2.15.5/libstorage/src/StorageInterface.h --- old/yast2-storage-2.15.4/libstorage/src/StorageInterface.h 2007-02-13 13:08:45.000000000 +0100 +++ new/yast2-storage-2.15.5/libstorage/src/StorageInterface.h 2007-02-22 18:33:29.000000000 +0100 @@ -818,6 +818,12 @@ virtual bool getFsCapabilities (FsType fstype, FsCapabilities& fscapabilities) const = 0; /** + * Get list of filesystem types present on any block devices. + * List elements are separated by blanks. + */ + virtual string getAllUsedFs() const = 0; + + /** * Print all detected entities to a stream. * Exact output format may change between releases. * Function mainly meant for debugging purposes. @@ -1939,10 +1945,8 @@ * Remove all possibly existing dm maps to a given device * * @param device device name for which dm maps should be removed - * @param also_evms flag if maps used by evms entities should also be removed - * @return bool true if maps to remove existed */ - virtual bool removeDmMapsTo( const string& device, bool also_evms ) = 0; + virtual void removeDmTableTo( const string& device ) = 0; /** * Detect potentially available free space on a partition diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/lvm/src/lvm_config.ycp new/yast2-storage-2.15.5/lvm/src/lvm_config.ycp --- old/yast2-storage-2.15.4/lvm/src/lvm_config.ycp 2006-03-23 14:01:33.000000000 +0100 +++ new/yast2-storage-2.15.5/lvm/src/lvm_config.ycp 2007-02-21 16:53:41.000000000 +0100 @@ -9,7 +9,7 @@ * Authors: * mike <mike(a)suse.de> * - * $Id: lvm_config.ycp 29327 2006-03-23 13:01:30Z fehr $ + * $Id: lvm_config.ycp 36352 2007-02-21 15:53:38Z fehr $ * */ @@ -101,6 +101,7 @@ ///////////////////////////////////////////////////////////////////////////////// Storage::SwitchUiAutomounter( true ); + Storage::SaveUsedFs(); if( result == `end ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/storage/src/include/custom_part_helptexts.ycp new/yast2-storage-2.15.5/storage/src/include/custom_part_helptexts.ycp --- old/yast2-storage-2.15.4/storage/src/include/custom_part_helptexts.ycp 2007-01-11 19:16:06.000000000 +0100 +++ new/yast2-storage-2.15.5/storage/src/include/custom_part_helptexts.ycp 2007-02-22 18:24:07.000000000 +0100 @@ -20,7 +20,7 @@ * ************************************************************* - $Id: custom_part_helptexts.ycp 35243 2007-01-11 18:16:00Z fehr $ + $Id: custom_part_helptexts.ycp 36426 2007-02-22 17:24:04Z fehr $ */ @@ -57,19 +57,19 @@ "); - if( tmpcrypt ) - { - helptext = helptext + _(" + + if (format) + { + if( tmpcrypt ) + { + helptext = helptext + _(" This mount point corresponds to a temporary filesystem like /tmp or /var/tmp. You may leave the crypt password empty. If you do this, the system will create a random password at system startup for you. This means, you will loose all data on these filesystems at system shutdown. "); - } - - if (format) - { + } // help text, continued helptext = helptext + _(" If you forget your password, you will lose access to the data on your file system. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.15.5/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.15.4/storage/src/include/custom_part_lib.ycp 2007-02-07 16:21:49.000000000 +0100 +++ new/yast2-storage-2.15.5/storage/src/include/custom_part_lib.ycp 2007-02-22 18:24:07.000000000 +0100 @@ -13,7 +13,7 @@ * ************************************************************* * - $Id: custom_part_lib.ycp 35951 2007-02-07 15:21:48Z fehr $ + $Id: custom_part_lib.ycp 36426 2007-02-22 17:24:04Z fehr $ * */ @@ -475,6 +475,25 @@ return( ret ); }; +define boolean EmptyCryptPwdAllowed( map p ) + { + boolean ret = p["format"]:false && + contains( union(FileSystems::tmp_m_mpoint,["swap"]), + p["mount"]:"" ); + ret = ret && Storage::IsPersistent( p ); + y2milestone( "EmptyCryptPwdAllowed ret:%1", ret ); + return( ret ); + } + +define boolean AskCryptPwd( map p ) + { + /* boolean ret = p["mount"]:""!="swap" || !EmptyCryptPwdAllowed(p); */ + boolean ret = true; + y2milestone( "AskCryptPwd ret:%1", ret ); + return( true ); + } + + /** * Do all checks concerning handling of crypt fs * @param new partition map @@ -492,11 +511,10 @@ new["enc_type"] = new["format"]:false?`luks:`twofish; else new["enc_type"] = `none; - if( crypt_fs && new["mount"]:""!="swap" && + if( crypt_fs && AskCryptPwd( new ) && size(Storage::GetCryptPwd( new["device"]:"" ))==0 ) { - boolean tmpc = new["format"]:false && - contains( FileSystems::tmp_m_mpoint, new["mount"]:"" ); + boolean tmpc = EmptyCryptPwdAllowed( new ); string fs_passwd = DlgCreateCryptFs( new["device"]:"", new["format"]:false?8:1, new["format"]:false, tmpc ); @@ -525,7 +543,7 @@ } else { - ret["ok"] = (new["mount"]:""=="swap") || tmpc; + ret["ok"] = tmpc; } } ret["map"] = new; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.15.5/storage/src/include/do_proposal_flexible.ycp --- old/yast2-storage-2.15.4/storage/src/include/do_proposal_flexible.ycp 2007-02-13 15:57:23.000000000 +0100 +++ new/yast2-storage-2.15.5/storage/src/include/do_proposal_flexible.ycp 2007-02-19 17:05:30.000000000 +0100 @@ -14,7 +14,7 @@ * ************************************************************* - $Id: do_proposal_flexible.ycp 36102 2007-02-13 14:57:21Z fehr $ + $Id: do_proposal_flexible.ycp 36285 2007-02-19 16:05:29Z fehr $ */ { @@ -273,7 +273,7 @@ g["added"] = [ [ 1, gap[key,0]:0, cyl_num ] ]; g["cylinders"] = g["cylinders"]:0-cyl_num; gap[key] = remove( gap[key]:[], 0 ); - if( g["cylinders"]:0 > 0 ) + if( g["cylinders"]:0 > 1 ) { g["added"] = add( g["added"]:[], [ 0, gap[key,0]:0, g["cylinders"]:0 ] ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/storage/src/inst_custom_part.ycp new/yast2-storage-2.15.5/storage/src/inst_custom_part.ycp --- old/yast2-storage-2.15.4/storage/src/inst_custom_part.ycp 2007-02-13 15:33:27.000000000 +0100 +++ new/yast2-storage-2.15.5/storage/src/inst_custom_part.ycp 2007-02-22 18:24:07.000000000 +0100 @@ -26,7 +26,7 @@ * ************************************************************* - $Id: inst_custom_part.ycp 36097 2007-02-13 14:33:26Z fehr $ + $Id: inst_custom_part.ycp 36426 2007-02-22 17:24:04Z fehr $ */ { @@ -1561,7 +1561,7 @@ } - map ret_cr = CheckCryptOk( retval ); + map ret_cr = CheckDeviceFinalOk( retval ); if( !ret_cr["ok"]:false ) { ret = `retry; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/storage/src/modules/FileSystems.ycp new/yast2-storage-2.15.5/storage/src/modules/FileSystems.ycp --- old/yast2-storage-2.15.4/storage/src/modules/FileSystems.ycp 2007-01-11 19:16:06.000000000 +0100 +++ new/yast2-storage-2.15.5/storage/src/modules/FileSystems.ycp 2007-02-19 14:09:40.000000000 +0100 @@ -7,7 +7,7 @@ * These module contains the supported filesystems and their settings. * * - * $Id: FileSystems.ycp 35243 2007-01-11 18:16:00Z fehr $ + * $Id: FileSystems.ycp 36260 2007-02-19 13:09:39Z fehr $ */ { module "FileSystems"; @@ -278,10 +278,10 @@ `help_text : _("Data Journaling Mode: Specifies the journaling mode for file data. <tt>journal</tt> -- All data is committed into the journal prior to being -written into the main file system. +written into the main file system. Highest performance impact. <tt>ordered</tt> -- All data is forced directly out to the main file system -prior to its metadata being committed to the journal. -<tt>writeback</tt> -- Data ordering is not preserved. +prior to its metadata being committed to the journal. Medium performance impact. +<tt>writeback</tt> -- Data ordering is not preserved. No performanc impact. "), `str_opt : "data=%1", `str_scan : "data=$.*$" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/storage/src/modules/StorageDevices.ycp new/yast2-storage-2.15.5/storage/src/modules/StorageDevices.ycp --- old/yast2-storage-2.15.4/storage/src/modules/StorageDevices.ycp 2007-01-10 13:14:21.000000000 +0100 +++ new/yast2-storage-2.15.5/storage/src/modules/StorageDevices.ycp 2007-02-21 16:53:41.000000000 +0100 @@ -14,7 +14,7 @@ * - removable drives (ZIP) * - floppy devices * - * $Id: StorageDevices.ycp 35192 2007-01-10 12:14:16Z fehr $ + * $Id: StorageDevices.ycp 36352 2007-02-21 15:53:38Z fehr $ * * Author: * Klaus Kaempf <kkaempf(a)suse.de> (initial) @@ -241,7 +241,9 @@ { if (Stage::initial () || Stage::cont ()) { + y2milestone( "before SCR::Read (.probe.cdrom)" ); cddrives = (list<map>) SCR::Read (.probe.cdrom); + y2milestone( "after SCR::Read (.probe.cdrom)" ); // write out data for hardware status check foreach (map drive, cddrives, ``{ @@ -251,6 +253,7 @@ else { cddrives = []; + y2milestone( "before SCR::Read (.probe.cdrom)" ); foreach(map e, (list<map>) SCR::Read (.probe.cdrom), ``{ map conf = (map) SCR::Read(.probe.status, e["unique_key"]:""); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/storage/src/modules/Storage.ycp new/yast2-storage-2.15.5/storage/src/modules/Storage.ycp --- old/yast2-storage-2.15.4/storage/src/modules/Storage.ycp 2007-02-14 14:53:27.000000000 +0100 +++ new/yast2-storage-2.15.5/storage/src/modules/Storage.ycp 2007-02-22 18:34:21.000000000 +0100 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 36137 2007-02-14 13:53:25Z fehr $ + * $Id: Storage.ycp 36429 2007-02-22 17:34:19Z fehr $ */ { @@ -3188,7 +3188,7 @@ { y2milestone( "RemoveDmMapsTo device:%1", device ); InitLibstorage(); - LibStorage::StorageInterface::removeDmMapsTo( sint, device, true ); + LibStorage::StorageInterface::removeDmTableTo( sint, device ); } global define boolean CheckSwapable( string dev ) @@ -6080,7 +6080,6 @@ } boolean expert_detail = nil; -path ed_path = .sysconfig.storage.EXPERT_DETAIL; list FindExpertLine( map file ) { @@ -6120,7 +6119,7 @@ expert_detail = val; } -global boolean SaveExpertDetail() +global void SaveExpertDetail() { y2milestone( "SaveExpertDetail val:%1", expert_detail ); if( expert_detail!=nil ) @@ -6160,4 +6159,62 @@ return( ret ); } +global string GetUsedFs() + { + InitLibstorage(); + string r = LibStorage::StorageInterface::getAllUsedFs( sint ); + list<string> lr = sort(splitstring(r," \t")); + r = mergestring( lr, " " ); + y2milestone( "GetUsedFs ret:%1", r ); + return( r ); + } + +list FindUsedFsLine( map file ) + { + list ret = []; + list<list> t = maplist( integer k, map e, file["l"]:$[], + ``([k, e["line"]:""])); + t = filter( list e, t, ``(search(e[1]:"","USED_FS_LIST")==0)); + y2milestone( "FindUsedFsLine t:%1", t ); + ret = t[0]:[]; + y2milestone( "FindUsedFsLine ret:%1", ret ); + return( ret ); + } + +global void SaveUsedFs() + { + y2milestone( "SaveUsedFs" ); + string s = GetUsedFs(); + map file = $[]; + AsciiFile::ReadFile( file, "/etc/sysconfig/storage" ); + list l = FindUsedFsLine( file ); + string e = "USED_FS_LIST=\"" + s + "\""; + integer lineno = l[0]:(size(file["l"]:$[]) + 1); + if( size(l)==0 ) + file["l",lineno] = $[]; + if( file["l",lineno,"line"]:""!=e ) + { + file["l",lineno,"line"] = e; + file["l",lineno,"changed"] = true; + AsciiFile::RewriteFile( file, "/etc/sysconfig/storage" ); + } + } + +global boolean Storage::IsPersistent( map p ) + { + boolean ret = contains( [ `lvm, `sw_raid, `dm ], p["type"]:`unknown ); + if( !ret && contains( [ `evms, `primary, `logical, `extended ], + p["type"]:`unknown )) + { + map d = GetDisk( GetTargetMap(), p["device"]:"" ); + if( p["type"]:`unknown==`evms ) + ret = d["is_container"]:false || p["evms_native"]:false; + else + ret = d["type"]:`CT_UNKNONW==`CT_DMRAID || + size(d["udev_id"]:[])>0; + } + y2milestone( "IsPersistent device:%1 ret:%2", p["device"]:"", ret ); + return( ret ); + } + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/storage/src/proposal/partitions_proposal.ycp new/yast2-storage-2.15.5/storage/src/proposal/partitions_proposal.ycp --- old/yast2-storage-2.15.4/storage/src/proposal/partitions_proposal.ycp 2006-04-10 11:45:03.000000000 +0200 +++ new/yast2-storage-2.15.5/storage/src/proposal/partitions_proposal.ycp 2007-02-21 16:53:41.000000000 +0100 @@ -1,7 +1,7 @@ /** * Module: proposal_partitions.ycp * - * $Id: partitions_proposal.ycp 29761 2006-04-05 16:36:41Z fehr $ + * $Id: partitions_proposal.ycp 36352 2007-02-21 15:53:38Z fehr $ * * Author: Klaus Kaempf <kkaempf(a)suse.de> * @@ -30,6 +30,10 @@ { Pkg::DoProvide( pack ); } + if( Stage::initial() ) + { + Storage::SaveUsedFs(); + } } y2milestone( "func:%1 param:%2", func, param ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.4/VERSION new/yast2-storage-2.15.5/VERSION --- old/yast2-storage-2.15.4/VERSION 2007-02-15 16:20:25.000000000 +0100 +++ new/yast2-storage-2.15.5/VERSION 2007-02-26 16:27:18.000000000 +0100 @@ -1 +1 @@ -2.15.4 +2.15.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-bootloader
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package yast2-bootloader checked in at Mon Feb 26 19:06:05 CET 2007. -------- --- yast2-bootloader/yast2-bootloader.changes 2007-01-23 13:22:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2007-02-26 18:49:28.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Feb 26 18:44:18 CET 2007 - od(a)suse.de + +- safeguard against mount-by device that does not exist (yet): fall + back to kernel name (#239473, #223608) +- fix entry for memtest86, it is named memtest86+ meanwhile +- collecting device information for perl-Bootloader now works with + persistent device names; this caused a bug in the grub + configuration where the gfxmenu entry was discarded because the + device name could not be translated, as well as unbootable system + (#244566, #247775) +- 2.15.5 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.15.4.tar.bz2 New: ---- yast2-bootloader-2.15.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.uC2112/_old 2007-02-26 19:05:52.000000000 +0100 +++ /var/tmp/diff_new_pack.uC2112/_new 2007-02-26 19:05:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.15.4) +# spec file for package yast2-bootloader (Version 2.15.5) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.15.4 +Version: 2.15.5 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.15.4.tar.bz2 +Source0: yast2-bootloader-2.15.5.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -46,7 +46,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.15.4 +%setup -n yast2-bootloader-2.15.5 %build %{prefix}/bin/y2tool y2autoconf @@ -90,7 +90,17 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc -%changelog -n yast2-bootloader +%changelog +* Mon Feb 26 2007 - od(a)suse.de +- safeguard against mount-by device that does not exist (yet): fall + back to kernel name (#239473, #223608) +- fix entry for memtest86, it is named memtest86+ meanwhile +- collecting device information for perl-Bootloader now works with + persistent device names; this caused a bug in the grub + configuration where the gfxmenu entry was discarded because the + device name could not be translated, as well as unbootable system + (#244566, #247775) +- 2.15.5 * Tue Jan 23 2007 - aosthof(a)suse.de - Forgot to delete "src/clients/bootfloppy.ycp" and "src/config/bootfloppy.desktop" from SVN (#218437) ++++++ yast2-bootloader-2.15.4.tar.bz2 -> yast2-bootloader-2.15.5.tar.bz2 ++++++ ++++ 3062 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.4/autodocs-ycp.ami new/yast2-bootloader-2.15.5/autodocs-ycp.ami --- old/yast2-bootloader-2.15.4/autodocs-ycp.ami 2007-01-23 10:29:08.000000000 +0100 +++ new/yast2-bootloader-2.15.5/autodocs-ycp.ami 2006-10-16 20:54:55.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 32798 2006-09-11 11:25:01Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.4/configure.in new/yast2-bootloader-2.15.5/configure.in --- old/yast2-bootloader-2.15.4/configure.in 2007-01-23 10:29:08.000000000 +0100 +++ new/yast2-bootloader-2.15.5/configure.in 2006-10-16 20:54:54.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-bootloader dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.15.3, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.13.79, http://bugs.opensuse.org/, yast2-bootloader) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.3" +VERSION="2.13.79" RPMNAME="yast2-bootloader" MAINTAINER="Olaf Dabrunz <od(a)suse.de>" @@ -111,8 +111,6 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -145,9 +143,6 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) AC_PATH_PROG(YDOXYGEN, ydoxygen, false, $PATH:$devtools_ybindir) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.4/Makefile.am new/yast2-bootloader-2.15.5/Makefile.am --- old/yast2-bootloader-2.15.4/Makefile.am 2007-01-23 10:29:08.000000000 +0100 +++ new/yast2-bootloader-2.15.5/Makefile.am 2006-10-16 20:54:55.000000000 +0200 @@ -7,7 +7,8 @@ # #where devtools are -Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -19,7 +20,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -33,7 +34,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.4/src/generic/widget_funcs.ycp new/yast2-bootloader-2.15.5/src/generic/widget_funcs.ycp --- old/yast2-bootloader-2.15.4/src/generic/widget_funcs.ycp 2007-01-23 10:23:56.000000000 +0100 +++ new/yast2-bootloader-2.15.5/src/generic/widget_funcs.ycp 2007-02-01 16:53:44.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Joachim Plack <jplack(a)suse.de> * - * $Id: widget_funcs.ycp 35128 2007-01-05 18:04:27Z jplack $ + * $Id: widget_funcs.ycp 35806 2007-02-01 15:53:43Z odabrunz $ * */ @@ -20,10 +20,10 @@ textdomain "bootloader"; string generic_Help (string widget_name) { - string arch_widget_name = BootCommon::getLoaderType(false) + "_" + widget_name; + string loader_widget_name = BootCommon::getLoaderType(false) + "_" + widget_name; - if ( haskey( BootCommon::help_messages, arch_widget_name ) ) - return(BootCommon::help_messages[arch_widget_name]:"" ); + if ( haskey( BootCommon::help_messages, loader_widget_name ) ) + return(BootCommon::help_messages[loader_widget_name]:"" ); return(BootCommon::help_messages[widget_name]:"" ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.4/src/modules/BootArch.ycp new/yast2-bootloader-2.15.5/src/modules/BootArch.ycp --- old/yast2-bootloader-2.15.4/src/modules/BootArch.ycp 2007-01-23 10:23:53.000000000 +0100 +++ new/yast2-bootloader-2.15.5/src/modules/BootArch.ycp 2007-02-01 16:53:44.000000000 +0100 @@ -13,7 +13,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: BootArch.ycp 35416 2007-01-16 22:51:18Z jplack $ + * $Id: BootArch.ycp 35806 2007-02-01 15:53:43Z odabrunz $ * */ @@ -69,6 +69,8 @@ ret = ret + features + " "; ret = ret + "splash=silent"; + // FIXME: this does not belong here, it cannot be tracked or maintained + // and is undocumented // on SGI Altix change kernel default hash tables sizes if (SCR::Read (.target.stat, "/proc/sgi_sn") != $[]) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.4/src/modules/BootGRUB.ycp new/yast2-bootloader-2.15.5/src/modules/BootGRUB.ycp --- old/yast2-bootloader-2.15.4/src/modules/BootGRUB.ycp 2007-01-23 10:23:53.000000000 +0100 +++ new/yast2-bootloader-2.15.5/src/modules/BootGRUB.ycp 2007-02-24 01:46:23.000000000 +0100 @@ -13,7 +13,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Joachim Plack <jplack(a)suse.de> * - * $Id: BootGRUB.ycp 35228 2007-01-11 13:20:36Z jplack $ + * $Id: BootGRUB.ycp 36030 2007-02-12 11:21:35Z jplack $ * */ @@ -256,6 +256,11 @@ if (contains (destroyed_partitions, _d)) _add = false; }); + + // FIXME: create a new config file section instead of + // using <s> which only shares the name/original_name + // This makes it possible to support cascaded boot + // environments in a supportable way ! if (_add) { // FIXME: fallback to vmlinux and initrd symlink if diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.4/src/routines/lib_iface.ycp new/yast2-bootloader-2.15.5/src/routines/lib_iface.ycp --- old/yast2-bootloader-2.15.4/src/routines/lib_iface.ycp 2007-01-23 10:23:55.000000000 +0100 +++ new/yast2-bootloader-2.15.5/src/routines/lib_iface.ycp 2007-02-26 18:43:44.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: lib_iface.ycp 34433 2006-11-16 16:28:10Z jplack $ + * $Id: lib_iface.ycp 36516 2007-02-26 17:43:40Z odabrunz $ * * WARNING: * To be included to BootCommon.ycp only @@ -40,6 +40,8 @@ // FIXME: this should be done directly in perl-Bootloader through LibStorage.pm global void SetDiskInfo () { map<string,list<string> > md_info = $[]; + map<string,map> tm = (map<string,map>)Storage::GetTargetMap (); + map<string,any> mountpoints = mapmap (string k, list v, (map<string,list>)Storage::GetMountPoints (), { @@ -60,7 +62,10 @@ list<map<string,any> > mounted_list = (list<map<string,any> >) SCR::Read (.proc.mounts); map<string,string> mounted = listmap (map<string,any> m, mounted_list, { - return $[ m["file"]:"" : m["spec"]:"" ]; + // make partition canonical ("/dev/disk/by-id/..." -> "/dev/sda5") + map p = Storage::GetPartition( tm, m["spec"]:"" ); + y2debug ("Translated device %1 to canonical device %2", m["spec"]:"", p["device"]:""); + return $[ m["file"]:"" : p["device"]:"" ]; }); y2milestone ("Really mounted: %1", mounted); mountpoints = filter (string k, any v, mountpoints, { @@ -69,7 +74,6 @@ } y2milestone ("Detected mountpoints: %1", mountpoints); - map<string,map> tm = (map<string,map>)Storage::GetTargetMap (); list<list<list> > pi = maplist (string disk, map info, tm, { if (info["type"]:`CT_UNKNOWN==`CT_LVM) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.4/src/routines/misc.ycp new/yast2-bootloader-2.15.5/src/routines/misc.ycp --- old/yast2-bootloader-2.15.4/src/routines/misc.ycp 2007-01-23 10:23:55.000000000 +0100 +++ new/yast2-bootloader-2.15.5/src/routines/misc.ycp 2007-02-23 16:58:13.000000000 +0100 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 34952 2006-12-14 12:57:33Z jplack $ + * $Id: misc.ycp 36098 2007-02-13 14:38:17Z sf $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -214,7 +214,9 @@ /** * Converts a device name to the corresponding device name it should be * mounted by, according to the "mountby" setting for the device from - * yast2-storage. + * yast2-storage. As a safeguard against problems, if the "mountby" device + * name does not exist in the information from yast2-storage, it will + * fallback to the "kernel name" ("/dev/hda1"). * * @param dev string device name * @return string device name according to "mountby" @@ -236,16 +238,16 @@ symbol mountby = `device; mountby = (symbol) partitions[dev, "mountby"]:nil; - if ( mountby == `uuid ) + if ( mountby == `uuid && partitions[dev, "uuid"]:nil != nil ) { ret = sformat ("/dev/disk/by-uuid/%1", partitions[dev, "uuid"]:""); - } else if ( mountby == `label ) + } else if ( mountby == `label && partitions[dev, "label"]:nil != nil ) { ret = sformat ("/dev/disk/by-label/%1", partitions[dev, "label"]:""); - } else if ( mountby == `id ) + } else if ( mountby == `id && partitions[dev, "udev_id"]:nil != nil ) { ret = sformat ("/dev/disk/by-id/%1", partitions[dev, "udev_id", 0]:""); - } else if ( mountby == `path ) + } else if ( mountby == `path && partitions[dev, "udev_path"]:nil != nil ) { ret = sformat ("/dev/disk/by-path/%1", partitions[dev, "udev_path"]:""); } @@ -1348,8 +1350,8 @@ global boolean MemtestPresent () { return (! contains (removed_sections, "memtest")) && (Mode::test () - || (Mode::normal () && Pkg::IsProvided ("memtest86")) - || (! Mode::normal () && Pkg::IsSelected ("memtest86"))); + || (Mode::normal () && Pkg::IsProvided ("memtest86+")) + || (! Mode::normal () && Pkg::IsSelected ("memtest86+"))); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bootloader-2.15.4/VERSION new/yast2-bootloader-2.15.5/VERSION --- old/yast2-bootloader-2.15.4/VERSION 2007-01-23 10:56:07.000000000 +0100 +++ new/yast2-bootloader-2.15.5/VERSION 2007-02-26 18:44:02.000000000 +0100 @@ -1 +1 @@ -2.15.4 +2.15.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xterm
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package xterm checked in at Mon Feb 26 19:06:01 CET 2007. -------- --- xterm/xterm.changes 2007-02-21 12:14:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/xterm/xterm.changes 2007-02-26 16:07:14.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 26 16:04:31 CET 2007 - sndirsch(a)suse.de + +- bug-246573-tentative-patch.diff: + * simplify algorithm for verifying that a font contains double + width characters (Bug #246573, comment #53/54) + +------------------------------------------------------------------- New: ---- bug-246573-tentative-patch.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.Ca1820/_old 2007-02-26 19:05:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Ca1820/_new 2007-02-26 19:05:47.000000000 +0100 @@ -18,7 +18,7 @@ Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm Autoreqprov: on Version: 224 -Release: 4 +Release: 5 Summary: The basic X terminal program Source: %name.tar.gz Source1: luitx @@ -33,6 +33,7 @@ Patch: fix-fd_option.diff Patch1: p_xterm-settings.diff Patch2: p_xterm-sigwinch.diff +Patch3: bug-246573-tentative-patch.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -154,6 +155,7 @@ %patch -p1 %patch1 -p0 -b .xterm-settings %patch2 -p0 -b .xterm-sigwinch +%patch3 -p1 cp $RPM_SOURCE_DIR/*bdf.bz2 . bunzip2 *.bdf.bz2 @@ -258,6 +260,10 @@ /usr/share/pixmaps/terminal.png %changelog +* Mon Feb 26 2007 - sndirsch(a)suse.de +- bug-246573-tentative-patch.diff: + * simplify algorithm for verifying that a font contains double + width characters (Bug #246573, comment #53/54) * Wed Feb 21 2007 - sndirsch(a)suse.de - fix-fd_option.diff: * finally fixes double-width support (Bug #246573) ++++++ bug-246573-tentative-patch.diff ++++++ --- xterm-224/fontutils.c.orig 2007-02-26 16:42:29.000000000 +0100 +++ xterm-224/fontutils.c 2007-02-26 16:56:27.793649610 +0100 @@ -588,59 +588,19 @@ #endif #if OPT_WIDE_CHARS && OPT_RENDERFONT && defined(HAVE_TYPE_FCCHAR32) -#define HALF_WIDTH_TEST_STRING "1234567890" -/* '1234567890' in Chinese characters in UTF-8 */ -#define FULL_WIDTH_TEST_STRING "\xe4\xb8\x80\xe4\xba\x8c\xe4\xb8\x89" \ - "\xe5\x9b\x9b\xe4\xba\x94" \ - "\xef\xa7\x91\xe4\xb8\x83\xe5\x85\xab" \ - "\xe4\xb9\x9d\xef\xa6\xb2" - -/* '1234567890' in Korean script in UTF-8 */ -#define FULL_WIDTH_TEST_STRING2 "\xec\x9d\xbc\xec\x9d\xb4\xec\x82\xbc" \ - "\xec\x82\xac\xec\x98\xa4" \ - "\xec\x9c\xa1\xec\xb9\xa0\xed\x8c\x94" \ - "\xea\xb5\xac\xec\x98\x81" - -#define HALF_WIDTH_CHAR1 0x0031 /* 'l' */ -#define HALF_WIDTH_CHAR2 0x0057 /* 'W' */ #define FULL_WIDTH_CHAR1 0x4E00 /* CJK Ideograph 'number one' */ #define FULL_WIDTH_CHAR2 0xAC00 /* Korean script syllable 'Ka' */ static Bool is_double_width_font_xft(Display * dpy, XftFont * font) { - XGlyphInfo gi1, gi2; - FcChar32 c1 = HALF_WIDTH_CHAR1, c2 = HALF_WIDTH_CHAR2; - char *fwstr = FULL_WIDTH_TEST_STRING; - char *hwstr = HALF_WIDTH_TEST_STRING; - /* Some Korean fonts don't have Chinese characters at all. */ - if (!XftCharExists(dpy, font, FULL_WIDTH_CHAR1)) { - if (!XftCharExists(dpy, font, FULL_WIDTH_CHAR2)) - return False; /* Not a CJK font */ - else /* a Korean font without CJK Ideographs */ - fwstr = FULL_WIDTH_TEST_STRING2; - } - - XftTextExtents32(dpy, font, &c1, 1, &gi1); - XftTextExtents32(dpy, font, &c2, 1, &gi2); - if (gi1.xOff != gi2.xOff) /* Not a fixed-width font */ - return False; - - XftTextExtentsUtf8(dpy, font, (FcChar8 *) hwstr, (int) strlen(hwstr), &gi1); - XftTextExtentsUtf8(dpy, font, (FcChar8 *) fwstr, (int) strlen(fwstr), &gi2); - - /* - * fontconfig and Xft prior to 2.2(?) set the width of half-width - * characters identical to that of full-width character in CJK double-width - * (bi-width / monospace) font even though the former is half as wide as - * the latter. This was fixed sometime before the release of fontconfig - * 2.2 in early 2003. See - * http://bugzilla.mozilla.org/show_bug.cgi?id=196312 - * In the meantime, we have to check both possibilities. - */ - return ((2 * gi1.xOff == gi2.xOff) || (gi1.xOff == gi2.xOff)); + if (XftCharExists(dpy, font, FULL_WIDTH_CHAR1) || + XftCharExists(dpy, font, FULL_WIDTH_CHAR2)) + return True; /* CJK font */ + else + return False; /* Not a CJK font */ } #else #define is_double_width_font_xft(dpy, xftfont) 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xosview
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package xosview checked in at Mon Feb 26 19:05:44 CET 2007. -------- --- xosview/xosview.changes 2006-12-11 11:53:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/xosview/xosview.changes 2007-02-26 15:32:20.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 26 15:06:57 CET 2007 - stbinner(a)suse.de + +- fix build by including icon and .desktop into package + +------------------------------------------------------------------- New: ---- xosview.desktop xosview.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xosview.spec ++++++ --- /var/tmp/diff_new_pack.riV714/_old 2007-02-26 19:05:37.000000000 +0100 +++ /var/tmp/diff_new_pack.riV714/_new 2007-02-26 19:05:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xosview (Version 1.8.3) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,19 +11,21 @@ # norootforbuild Name: xosview -BuildRequires: desktop-data-SuSE gcc-c++ pkgconfig update-desktop-files xorg-x11-devel -License: BSD License and BSD-like, Other License(s), see package +BuildRequires: update-desktop-files xorg-x11-devel +License: BSD License and BSD-like, GNU General Public License (GPL) Group: System/Monitoring Autoreqprov: on # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE Version: 1.8.3 -Release: 25 +Release: 39 Summary: System Load Information URL: http://sourceforge.net/projects/xosview/ Source: xosview-%{version}.tar.bz2 Source1: rc.config.xosview +Source2: xosview.png +Source3: xosview.desktop Patch: xosview-%{version}.dif Patch1: xosview-1.8.2-serial.patch Patch2: xosview-1.8.1-procsys.patch @@ -105,14 +107,18 @@ sed 's|@@BINDIR@@|%{_bindir}|' < xosview.sh > %{buildroot}%{_bindir}/xosview chmod 0755 %{buildroot}%{_bindir}/xosview chmod 0755 %{buildroot}%{_bindir}/xosview.bin -%suse_update_desktop_file -i xosview System Monitor -rm %{buildroot}%{_datadir}/pixmaps/log.png +mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/usr/share/pixmaps/ +mkdir -p $RPM_BUILD_ROOT/usr/share/applications +install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/usr/share/applications/ +%suse_update_desktop_file xosview %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +%{_prefix}/share/pixmaps/xosview.png %{_datadir}/applications/xosview.desktop %{_bindir}/xosview %{_bindir}/xosview.bin @@ -122,7 +128,9 @@ %doc %{_docdir}/xosview/README %doc %{_docdir}/xosview/README.linux -%changelog -n xosview +%changelog +* Mon Feb 26 2007 - stbinner(a)suse.de +- fix build by including icon and .desktop into package * Mon Dec 11 2006 - werner(a)suse.de - Expand search path for app-defaults to /usr/share/X11 (#227401) * Mon Jul 31 2006 - werner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 squid
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package squid checked in at Mon Feb 26 19:05:40 CET 2007. -------- --- squid/squid.changes 2007-01-31 21:14:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/squid/squid.changes 2007-02-26 17:23:58.877177000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 26 17:23:21 CET 2007 - kssingvo(a)suse.de + +- needsrootforbuild injected: urgently required for ulimit setting + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.v32234/_old 2007-02-26 19:05:19.000000000 +0100 +++ /var/tmp/diff_new_pack.v32234/_new 2007-02-26 19:05:19.000000000 +0100 @@ -8,7 +8,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +# needsrootforbuild Name: squid BuildRequires: db-devel openldap2 openldap2-devel opensp-devel pam-devel samba sgmltool sharutils @@ -17,7 +17,7 @@ %endif Summary: Squid WWW proxy server Version: 2.6.STABLE9 -Release: 1 +Release: 5 License: GNU General Public License (GPL) URL: http://www.squid-cache.org Group: Productivity/Networking/Web/Proxy @@ -404,7 +404,9 @@ %doc squid_ldapauth.conf doc/%{name}-%{version}-RELEASENOTES.html %doc README.ip_user -%changelog -n squid +%changelog +* Mon Feb 26 2007 - kssingvo(a)suse.de +- needsrootforbuild injected: urgently required for ulimit setting * Wed Jan 31 2007 - kssingvo(a)suse.de - upgrade to 2.6.STABLE9 with this fixes: * Date parsing error causing objects to get unexpectedly cached. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tcsh
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package tcsh checked in at Mon Feb 26 19:05:29 CET 2007. -------- --- tcsh/tcsh.changes 2006-08-16 20:29:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/tcsh/tcsh.changes 2007-02-26 16:38:42.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 26 16:06:05 CET 2007 - werner(a)suse.de + +- Expand local ./files for manual pages even for tcsh (#248865) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcsh.spec ++++++ --- /var/tmp/diff_new_pack.o32480/_old 2007-02-26 19:05:22.000000000 +0100 +++ /var/tmp/diff_new_pack.o32480/_new 2007-02-26 19:05:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tcsh (Version 6.14.00) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,12 +12,12 @@ Name: tcsh URL: http://www.tcsh.org/ -License: BSD +License: BSD License and BSD-like Group: System/Shells Requires: gawk textutils Autoreqprov: on Version: 6.14.00 -Release: 24 +Release: 49 Summary: The C SHell Source: ftp.astron.com:/pub/tcsh/tcsh-6.14.00.tar.bz2 Source1: nls-iconv @@ -126,7 +126,9 @@ %doc /usr/share/man/man1/tcsh.1.gz /usr/share/locale/*/LC_MESSAGES/tcsh -%changelog -n tcsh +%changelog +* Mon Feb 26 2007 - werner(a)suse.de +- Expand local ./files for manual pages even for tcsh (#248865) * Wed Aug 16 2006 - aj(a)suse.de - Remove unneeded BuildRequires. * Wed Jun 21 2006 - werner(a)suse.de @@ -255,33 +257,33 @@ - fix neededforbuild: textutil -> textutils * Thu Nov 02 2000 - werner(a)suse.de - Use mkstemp for opening tmp files for `<<' redirects -- Use TMPDIR variable for location of tmp files -- Set group tag in spec + - Use TMPDIR variable for location of tmp files + - Set group tag in spec * Wed May 24 2000 - uli(a)suse.de - moved docs to %%{_docdir} * Wed Jan 26 2000 - werner(a)suse.de - New version 6.09.00 -- /usr/man -> /usr/share/man -- Fix usage of catopen (MCLoadBySet isn't that what is used + - /usr/man -> /usr/share/man + - Fix usage of catopen (MCLoadBySet isn't that what is used internally within glibc, set it to MCLoadBySet) -- Avoid crahs due coloured ls-F -- Correct setpath NLS message + - Avoid crahs due coloured ls-F + - Correct setpath NLS message * Mon Sep 13 1999 - bs(a)suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. * Mon Jun 28 1999 - werner(a)suse.de - Source key binding and completion code from /etc/csh.cshrc out into /etc/profile.d/bindkey.tcsh and /etc/profile.d/complete.tcsh -- No newgrp builtin because its equivalent to exec newgrp + - No newgrp builtin because its equivalent to exec newgrp * Wed Jun 16 1999 - ro(a)suse.de - create localedirs before make install * Fri Jun 11 1999 - werner(a)suse.de - New version Fri Mar 12 14:21:46 MET 1999 -- Fix SIGSEGV caused different sizes of FILSIZ and BUFSIZE -- New version -- Restore missed MAXNAMLEN -- Make it alpha compile + - Fix SIGSEGV caused different sizes of FILSIZ and BUFSIZE + - New version + - Restore missed MAXNAMLEN + - Make it alpha compile * Thu Dec 03 1998 - werner(a)suse.de - Fix SIGSEGV with SYSMALOC * alloc n+1 not n chunks @@ -290,10 +292,10 @@ - Stupid error fixed * Tue Sep 15 1998 - werner(a)suse.de - Security fix -- Avoid I/O trouble, use POSIX + - Avoid I/O trouble, use POSIX * Wed Oct 22 1997 - werner(a)suse.de - Updatet FAQ.tcsh -- Better installation: remove old files before linking + - Better installation: remove old files before linking * Thu Jan 02 1997 - bs(a)suse.de added FAQ.tcsh * Thu Jan 02 1997 - werner(a)suse.de ++++++ tcsh-6.14.00.dif ++++++ --- /var/tmp/diff_new_pack.o32480/_old 2007-02-26 19:05:22.000000000 +0100 +++ /var/tmp/diff_new_pack.o32480/_new 2007-02-26 19:05:22.000000000 +0100 @@ -1670,7 +1670,7 @@ + + + complete man n@[0-9n]@'`\ls -1fUA ${_manpath}$:-1/|&\sed \\%.\*:%d\;s%\\.$:-1.\*\$%%|\sort -u`'@ \ -+ c/-/"(- f k s t l)"/ n/-f/c/ n/-k/x:'<keyword>'/ n/-l/f/ n/*/c/ ++ c/-/"(- f k s t l)"/ n/-f/c/ n/-k/x:'<keyword>'/ n/-l/f/ C@./*@f@ n/*/c/ + + complete ps c/-t/x:'<tty>'/ c/-/"(a c C e g k l S t u v w x)"/ \ + n/-k/x:'<kernel>'/ N/-k/x:'<core_file>'/ n/*/x:'<PID>'/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 qcad
by root＠Hilbert.suse.de 26 Feb '07

26 Feb '07

Hello community, here is the log from the commit of package qcad checked in at Mon Feb 26 19:05:16 CET 2007. -------- --- qcad/qcad.changes 2006-11-22 16:00:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/qcad/qcad.changes 2007-02-26 17:13:24.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Feb 26 17:11:53 CET 2007 - mvaner(a)suse.cz + +- Fixing non-working help (#222885) + - help.patch + +------------------------------------------------------------------- New: ---- qcad-2.0.5.0-help.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qcad.spec ++++++ --- /var/tmp/diff_new_pack.Y31012/_old 2007-02-26 19:04:52.000000000 +0100 +++ /var/tmp/diff_new_pack.Y31012/_new 2007-02-26 19:04:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qcad (Version 2.0.5.0) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -17,7 +17,7 @@ Group: Productivity/Graphics/CAD Autoreqprov: on Version: 2.0.5.0 -Release: 37 +Release: 52 Summary: Free Open-source 2D CAD System Source: %{name}-%{version}-1.tar.bz2 Source1: %{name}.desktop @@ -27,6 +27,7 @@ Patch1: qcad-qmake-pro.patch Patch2: %{name}-%{version}-64b.patch Patch3: release_translations_sh.patch +Patch4: %{name}-%{version}-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,6 +48,7 @@ %patch1 %patch2 %patch3 +%patch4 %build #/u/lib/qt3/bin/qmake @@ -96,7 +98,10 @@ /usr/share/applications/%name.desktop %{_datadir}/%{name}/ -%changelog -n qcad +%changelog +* Mon Feb 26 2007 - mvaner(a)suse.cz +- Fixing non-working help (#222885) + - help.patch * Wed Nov 22 2006 - pnemec(a)suse.cz - another fix for (#222860) menu bar translations are added now ++++++ qcad-2.0.5.0-help.patch ++++++ --- qcad/src/qc_applicationwindow.cpp +++ qcad/src/qc_applicationwindow.cpp @@ -2943,7 +2943,7 @@ RS_SYSTEM->getAppDir().latin1()); RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s", RS_SYSTEM->getAppDir().latin1()); - assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this); + assistant = new QAssistantClient(QString::null, this); connect(assistant, SIGNAL(error(const QString&)), this, SLOT(slotError(const QString&))); QStringList args; ++++++ release_translations_sh.patch ++++++ --- /var/tmp/diff_new_pack.Y31012/_old 2007-02-26 19:04:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Y31012/_new 2007-02-26 19:04:53.000000000 +0100 @@ -1,6 +1,6 @@ Index: scripts/release_translations.sh -=================================================================== ---- /dev/null +================================================================================ +--- scripts/release_translations.sh +++ scripts/release_translations.sh @@ -0,0 +1,23 @@ +#!/bin/bash @@ -26,4 +26,3 @@ + done + popd +done -+echo "building translations finished" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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