December 2009 - openSUSE Commits - openSUSE Mailing Lists

commit dhcpcd for openSUSE:Factory
by root＠Hilbert.suse.de 02 Dec '09

02 Dec '09

Hello community, here is the log from the commit of package dhcpcd for openSUSE:Factory checked in at Wed Dec 2 12:39:04 CET 2009. -------- --- dhcpcd/dhcpcd.changes 2009-11-21 18:20:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/dhcpcd/dhcpcd.changes 2009-11-27 17:42:51.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 26 20:21:28 CET 2009 - varkoly(a)suse.de + +- bnc#558744 dhcpcd-3.x does not provide DHCPGIADDR and DHCPSIADDR info + file as dhcpcd-1.x did + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bnc#558744.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dhcpcd.spec ++++++ --- /var/tmp/diff_new_pack.Iw5YqY/_old 2009-12-02 12:38:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Iw5YqY/_new 2009-12-02 12:38:10.000000000 +0100 @@ -19,7 +19,7 @@ Name: dhcpcd Version: 3.2.3 -Release: 48 +Release: 49 Summary: A DHCP Client Daemon Url: http://developer.berlios.de/projects/dhcpcd/ #Source: http://prdownload.berlios.de/dhcpcd/dhcpcd-3.2.3.tar.bz2 @@ -37,7 +37,8 @@ Patch8: dhcpcd-%{version}-unaligned.diff Patch9: dhcpcd-%{version}-fiximplicit.diff Patch10: bnc#551350.diff -License: GPL v2 or later +Patch11: bnc#558744.diff +License: GPLv2+ Group: Productivity/Networking/Boot/Clients Provides: dhcp_client Requires: net-tools @@ -69,6 +70,7 @@ %patch8 %patch9 -p1 %patch10 -p1 +%patch11 -p1 cp %{S:1} . cp %{S:3} . ++++++ bnc#558744.diff ++++++ diff -u dhcpcd-3.2.3-patched//dhcp.c dhcpcd-3.2.3//dhcp.c --- dhcpcd-3.2.3-patched//dhcp.c 2009-11-27 21:50:34.755671212 +0100 +++ dhcpcd-3.2.3//dhcp.c 2009-11-27 21:52:13.374669989 +0100 @@ -653,6 +653,8 @@ return (-1); } + dhcp->siaddr = message->siaddr; + dhcp->giaddr = message->giaddr; dhcp->address.s_addr = message->yiaddr; dhcp->leasedfrom = tv.tv_sec; dhcp->frominfo = false; diff -u dhcpcd-3.2.3-patched//dhcp.h dhcpcd-3.2.3//dhcp.h --- dhcpcd-3.2.3-patched//dhcp.h 2009-11-27 21:50:34.755671212 +0100 +++ dhcpcd-3.2.3//dhcp.h 2009-11-27 21:52:13.374669989 +0100 @@ -200,6 +200,8 @@ struct address_head *netbiosddservers; char *netbiosscope; char *netbiosnodetype; + uint32_t siaddr; + uint32_t giaddr; } dhcp_t; diff -u dhcpcd-3.2.3-patched//info.c dhcpcd-3.2.3//info.c --- dhcpcd-3.2.3-patched//info.c 2009-11-27 21:50:34.755671212 +0100 +++ dhcpcd-3.2.3//info.c 2009-11-27 22:04:59.934820658 +0100 @@ -107,6 +107,7 @@ FILE *f; route_t *route; struct stat sb; + struct in_addr n; if (options->test) f = stdout; @@ -121,9 +122,15 @@ return (false); } } - + if (dhcp->giaddr) { + n.s_addr = dhcp->giaddr; + fprintf (f, "DHCPGIADDR='%s'\n", inet_ntoa (n)); + } + if (dhcp->siaddr) { + n.s_addr = dhcp->siaddr; + fprintf (f, "DHCPSIADDR='%s'\n", inet_ntoa (n)); + } if (dhcp->address.s_addr) { - struct in_addr n; n.s_addr = dhcp->address.s_addr & dhcp->netmask.s_addr; fprintf (f, "IPADDR='%s'\n", inet_ntoa (dhcp->address)); fprintf (f, "NETMASK='%s'\n", inet_ntoa (dhcp->netmask)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nfs-utils for openSUSE:Factory
by root＠Hilbert.suse.de 02 Dec '09

02 Dec '09

Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at Wed Dec 2 12:37:53 CET 2009. -------- --- nfs-utils/nfs-utils.changes 2009-11-16 14:23:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes 2009-11-29 23:03:34.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 29 22:03:26 UTC 2009 - nfbrown(a)novell.com + +- nfs-utils-eperm-fallback.patch: mount.nfs + tries a v3 mount after a v4 mount fails with ENOENT. + Older linux nfsd servers return EPERM, so fall + back in that case too. bnc#557138 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nfs-utils-eperm-fallback.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.MrauD5/_old 2009-12-02 12:33:23.000000000 +0100 +++ /var/tmp/diff_new_pack.MrauD5/_new 2009-12-02 12:33:23.000000000 +0100 @@ -27,9 +27,9 @@ Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.2.1 -Release: 1 +Release: 2 Group: Productivity/Networking/NFS -License: GPL v2 or later +License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on @@ -49,6 +49,7 @@ Source12: start-statd Patch0: nfs-utils-1.0.7-bind-syntax.patch Patch1: warn-nfs-udp.patch +Patch2: nfs-utils-eperm-fallback.patch %description This package contains the NFS utilities. You can tune the number of @@ -63,7 +64,7 @@ H.J. Lu <hjl(a)valinux.com> %package -n nfs-client -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/NFS Summary: Support Utilities for NFS Obsoletes: nfs-utils < 1.1.0 @@ -84,7 +85,7 @@ H.J. Lu <hjl(a)valinux.com> %package -n nfs-kernel-server -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/NFS Summary: Support Utilities for Kernel nfsd Provides: nfs-utils = %{version} @@ -107,7 +108,7 @@ H.J. Lu <hjl(a)valinux.com> %package -n nfs-doc -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/NFS Summary: Support Utilities for NFS Obsoletes: nfs-utils < 1.1.0 @@ -127,6 +128,7 @@ %setup -q -n nfs-utils-%{version} -a 1 %patch0 -p1 %patch1 -p1 +%patch2 -p1 cp %{S:6} . %build ++++++ nfs-utils-eperm-fallback.patch ++++++ Fall back from v4 to v3 on EPERM. When the mount version isn't specified, mount.nfs tries v4 and falls back to v3 if it gets ENOENT. Linux kernels prior to 2.6.25 will return EPERM if there is no v4 export, so fall back in that case too. This fixes bnc#557138 where a 2.6.31 or later kernel client gets an error when mounting from a 2.6.24 or earlier server. Signed-off-by: NeilBrown <neilb(a)suse.de> diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index b595649..68eb82b 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -657,8 +657,10 @@ static int nfs_try_mount(struct nfsmount_info *mi) * To deal with legacy Linux servers that don't * automatically export a pseudo root, retry * ENOENT errors using version 3 + * And for Linux servers prior to 2.6.25, retry + * EPERM */ - if (errno != ENOENT) + if (errno != ENOENT && errno != EPERM) break; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 02 Dec '09

02 Dec '09

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at Wed Dec 2 12:33:04 CET 2009. -------- --- yast2-storage/yast2-storage.changes 2009-10-09 10:23:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2009-11-27 17:23:57.000000000 +0100 @@ -1,0 +2,52 @@ +Fri Nov 27 17:08:15 CET 2009 - aschnell(a)suse.de + +- enable boot.crypt-early along with boot.crypto (bnc #558888) + +------------------------------------------------------------------- +Thu Nov 26 17:07:16 CET 2009 - fehr(a)suse.de + +- disable impossible mountby methods (#444328) + +------------------------------------------------------------------- +Tue Nov 24 17:13:39 CET 2009 - fehr(a)suse.de + +- do not format hfs boot partition on mac systems (#447782) + +------------------------------------------------------------------- +Tue Nov 24 14:59:54 CET 2009 - fehr(a)suse.de + +- enabled to set "noauto" option for LUKS-encrypted volumes + +------------------------------------------------------------------- +Fri Nov 20 18:01:15 CET 2009 - aschnell(a)suse.de + +- added mount graph (requires libstorage 2.19.1) + +------------------------------------------------------------------- +Thu Nov 19 10:32:36 CET 2009 - aschnell(a)suse.de + +- keep name entry in target-map as provided by libstorage + +------------------------------------------------------------------- +Tue Nov 17 12:03:12 CET 2009 - aschnell(a)suse.de + +- improved focus handling during creation of logical volumes + +------------------------------------------------------------------- +Mon Nov 16 14:11:34 CET 2009 - aschnell(a)suse.de + +- enabled storage proposal for S390 (bnc #462254) + +------------------------------------------------------------------- +Mon Nov 2 11:25:05 CET 2009 - jsrain(a)suse.cz + +- warn in installation proposal if not formatting /home partition + and using remote authentication (fate#306325) + +------------------------------------------------------------------- +Thu Oct 29 11:59:20 CET 2009 - aschnell(a)suse.de + +- provide usedby information as list in target-map (bnc #472812) +- 2.19.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.18.19.tar.bz2 New: ---- yast2-storage-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.py4Vw8/_old 2009-12-02 12:32:22.000000000 +0100 +++ /var/tmp/diff_new_pack.py4Vw8/_new 2009-12-02 12:32:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.18.19) +# spec file for package yast2-storage (Version 2.19.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,16 @@ Name: yast2-storage -Version: 2.18.19 +Version: 2.19.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.18.19.tar.bz2 +Source0: yast2-storage-2.19.0.tar.bz2 Prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPLv2+ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.18.21 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.1 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-perl-bindings yast2-testsuite Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.19 yast2-libyui >= 2.18.7 @@ -52,7 +52,7 @@ devices during installation and on an installed system. %prep -%setup -n yast2-storage-2.18.19 +%setup -n yast2-storage-2.19.0 %build %{prefix}/bin/y2tool y2autoconf @@ -121,7 +121,7 @@ %{perl_vendorarch}/LibStorage.so %package devel -License: GPL v2 or later +License: GPLv2+ Requires: libstorage-devel = %(echo `rpm -q --queryformat '%{VERSION}' libstorage-devel`) Requires: blocxx-devel libstdc++-devel yast2-storage = %version Summary: YaST2 - Storage Library Headers and Documentation ++++++ yast2-storage-2.18.19.tar.bz2 -> yast2-storage-2.19.0.tar.bz2 ++++++ ++++ 11191 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-storage-2.18.19/configure.in new/yast2-storage-2.19.0/configure.in --- old/yast2-storage-2.18.19/configure.in 2009-10-09 10:21:57.000000000 +0200 +++ new/yast2-storage-2.19.0/configure.in 2009-11-06 11:09:37.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.18.19, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.19.0, http://bugs.opensuse.org/, yast2-storage) 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.19" +VERSION="2.19.0" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.18.19/missing new/yast2-storage-2.19.0/missing --- old/yast2-storage-2.18.19/missing 2009-10-09 10:22:07.000000000 +0200 +++ new/yast2-storage-2.19.0/missing 2009-11-06 11:09:48.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: 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-storage-2.18.19/storage/doc/README.part.info new/yast2-storage-2.19.0/storage/doc/README.part.info --- old/yast2-storage-2.18.19/storage/doc/README.part.info 2009-07-21 16:37:05.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/doc/README.part.info 2009-11-24 15:57:46.000000000 +0100 @@ -44,7 +44,7 @@ if PREFER_REMOVE is set to 1. -KEEP_PARTITION_FSYS +KEEP_PARTITION_ID Possible values: comma separated list of possible partition ids Default value: Empty list @@ -117,7 +117,7 @@ Example: id=0x8E Description: This keyword makes it possible to create partitions with partition - ide other than 0x83 (for normal filesystem partitions) or 0x82 (for + ids other than 0x83 (for normal filesystem partitions) or 0x82 (for swap partitions). This make it possible to create LVM or MD partitions on a disk. @@ -179,7 +179,7 @@ If in the above example the machine has three disks then each of the partition groups gets on a separate disk. So one disk will hold - /var, another disk will hold /home and another disk will hole + /var, another disk will hold /home and another disk will hold /, /usr and /opt. If in the above example the machine has only two disks then /home will still be on a separate disk (since it has lower priority than @@ -217,6 +217,6 @@ If there are multiple partition groups the the partition group with the lowest number (means highest priority) get assigned its disk first. - Afterward the partition group with the next priority gets assigned a + Afterward the partition group with the next priority gets assigned the optimal disk from the so far unassigned disks. 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-storage-2.18.19/storage/src/include/custom_part_check_generated.ycp new/yast2-storage-2.19.0/storage/src/include/custom_part_check_generated.ycp --- old/yast2-storage-2.18.19/storage/src/include/custom_part_check_generated.ycp 2009-10-05 17:50:40.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/custom_part_check_generated.ycp 2009-11-17 17:30:03.000000000 +0100 @@ -192,8 +192,9 @@ }); y2milestone("diskless:%1", diskless); - y2milestone("root_found:%1 boot_found %2", root_found, boot_found); - y2milestone("root_dmraid:%1 root_raid %2 boot_raid %3 raid_type:%4", + y2milestone("root_found:%1 root_fs:%2", root_found, root_fs); + y2milestone("boot_found:%1 boot_fs:%2", boot_found, boot_fs); + y2milestone("root_dmraid:%1 root_raid:%2 boot_raid:%3 raid_type:%4", root_dmraid, root_raid, boot_raid, raid_type); boolean ok = true; 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-storage-2.18.19/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.19.0/storage/src/include/custom_part_dialogs.ycp --- old/yast2-storage-2.18.19/storage/src/include/custom_part_dialogs.ycp 2009-08-04 11:06:42.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/custom_part_dialogs.ycp 2009-11-26 18:34:16.000000000 +0100 @@ -16,7 +16,7 @@ * ************************************************************* - $Id: custom_part_dialogs.ycp 58178 2009-07-27 15:42:43Z aschnell $ + $Id: custom_part_dialogs.ycp 59799 2009-11-26 16:04:49Z fehr $ */ { @@ -684,21 +684,27 @@ { list no_mountby_type = [ `loop ]; list mountby_id_path_type = [ `primary, `logical ]; + map enab = $[]; + boolean tmp = !contains( no_mountby_type, new["type"]:`primary ); + enab[`label] = tmp && FileSystems::MountLabel( new["used_fs"]:`unknown ) && + new["enc_type"]:`none==`none; + enab[`uuid] = tmp && (new["format"]:false || size(new["uuid"]:"")>0) && + FileSystems::MountUuid( new["used_fs"]:`unknown ); + tmp = contains(mountby_id_path_type, new["type"]:`none); + enab[`id] = tmp && size(new["udev_id"]:[])>0; + enab[`path] = tmp && size(new["udev_path"]:"")>0; + y2milestone( "FstabOptions enab %1", enab ); + UI::ChangeWidget( `id(`label), `Enabled, enab[`label]:false ); + UI::ChangeWidget( `id(`uuid), `Enabled, enab[`uuid]:false ); + UI::ChangeWidget( `id(`id), `Enabled, enab[`id]:false ); + UI::ChangeWidget( `id(`path), `Enabled, enab[`path]:false ); symbol defmb = !Mode::config() ? Storage::GetMountBy( new["device"]:"" ) : `device; y2milestone( "FstabOptions defmb %1", defmb ); + if( haskey( enab, defmb ) && !enab[defmb]:false ) + defmb = `device; UI::ChangeWidget( `id(`mt_group), `CurrentButton, new["mountby"]:defmb ); - UI::ChangeWidget( `id(`label), `Enabled, - FileSystems::MountLabel( new["used_fs"]:`unknown ) && - new["enc_type"]:`none==`none && - !contains( no_mountby_type, new["type"]:`primary ) ); - UI::ChangeWidget( `id(`uuid), `Enabled, - (new["format"]:false || size(new["uuid"]:"")>0) && - FileSystems::MountUuid( new["used_fs"]:`unknown ) && - !contains( no_mountby_type, new["type"]:`primary ) ); - UI::ChangeWidget( `id(`id), `Enabled, contains(mountby_id_path_type, new["type"]:`none) ); - UI::ChangeWidget( `id(`path), `Enabled, contains(mountby_id_path_type, new["type"]:`none) ); } if( UI::WidgetExists( `id(`vol_label) )) @@ -717,12 +723,7 @@ if( UI::WidgetExists( `id("opt_user") )) { UI::ChangeWidget( `id("opt_user"), `Enabled, - new["enc_type"]:`none==`none || new["noauto"]:false ); - } - if( UI::WidgetExists( `id("opt_noauto") )) - { - UI::ChangeWidget( `id("opt_noauto"), `Enabled, - new["enc_type"]:`none==`none || new["noauto"]:false ); + new["enc_type"]:`none==`none ); } if( UI::WidgetExists( `id("opt_quota") )) { @@ -739,15 +740,6 @@ { ret = UI::UserInput(); y2milestone( "FstabOptions ret %1", ret ); - if( ret == "opt_noauto" ) - { - if( UI::WidgetExists( `id("opt_user") )) - { - boolean val = (boolean)UI::QueryWidget( `id("opt_noauto" ), `Value ); - UI::ChangeWidget( `id("opt_user"), `Enabled, - new["enc_type"]:`none==`none || val ); - } - } if( ret == `ok ) { if( UI::WidgetExists( `id(`mt_group) )) 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-storage-2.18.19/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.19.0/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.18.19/storage/src/include/custom_part_lib.ycp 2009-08-24 16:27:39.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/custom_part_lib.ycp 2009-11-17 10:29:54.000000000 +0100 @@ -13,7 +13,7 @@ * ************************************************************* * - $Id: custom_part_lib.ycp 58336 2009-08-13 12:05:21Z aschnell $ + $Id: custom_part_lib.ycp 59576 2009-11-17 09:30:47Z aschnell $ * */ @@ -193,19 +193,18 @@ * @param mount mount point * @return boolean */ -define boolean check_lvm_mount_points( string mount ) - ``{ - list not_allowed_lvm_mount_points = [ Partitions::BootMount() ]; - y2milestone( " check lvm mount"); - if( contains( not_allowed_lvm_mount_points, mount )) + boolean check_lvm_mount_points(string mount) + { + list<string> not_allowed_lvm_mount_points = [ Partitions::BootMount() ]; + y2milestone("check lvm mount"); + if (contains(not_allowed_lvm_mount_points, mount)) { - // error popup text - Popup::Error(sformat(_("You cannot use the mount point \"%1\" for LVM.\n"), Partitions::BootMount())); - + // error popup text + Popup::Error(sformat(_("You cannot use the mount point \"%1\" for LVM.\n"), Partitions::BootMount())); return false; } - return true; - }; + return true; + } /** @@ -213,25 +212,22 @@ * @param mount mount point * @return boolean **/ -define boolean check_raid_mount_points( string mount ) - ``{ - list not_allowed_raid_mount_points = [ ]; - if( Arch::ppc () || Arch::s390 () || Arch::sparc () ) - { - not_allowed_raid_mount_points = - add( not_allowed_raid_mount_points, Partitions::BootMount() ); - } - y2milestone( " check raid mount"); - if( contains( not_allowed_raid_mount_points, mount )) + boolean check_raid_mount_points(string mount) + { + list<string> not_allowed_raid_mount_points = []; + if (Arch::ppc() || Arch::s390()) + { + not_allowed_raid_mount_points = add(not_allowed_raid_mount_points, Partitions::BootMount()); + } + y2milestone("check raid mount"); + if (contains( not_allowed_raid_mount_points, mount)) { - // error popup text + // error popup text Popup::Error(sformat(_("You cannot use the mount point %1 for RAID."), Partitions::BootMount())); - return false; } return true; - }; - + } /** @@ -335,19 +331,19 @@ * @param mount mount point * @return boolean **/ -define boolean check_mount_point( map<string,map> targetMap, string dev, - map part ) -{ + boolean check_mount_point(map<string,map> targetMap, string dev, map part) + { string mount = part["mount"]:""; symbol used_fs = part["used_fs"]:`unknown; y2milestone( "check_mount_point part:%1", part ); boolean allowed = true; - list not_allowed_system_mount_points = - [ "/proc", "/dev", "/mnt", "/var/adm/mnt", "/lost+found", "/lib", - "/bin", "/etc", "/sbin" ]; - if (mount == "") + list<string> not_allowed_system_mount_points = [ "/proc", "/sys", + "/dev", "/mnt", "/var/adm/mnt", "/lost+found", "/lib", "/lib64", + "/bin", "/etc", "/sbin" ]; + + if (isempty(mount)) { Popup::Error(_("Mount point must not be empty.")); allowed = false; 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-storage-2.18.19/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.19.0/storage/src/include/ep-dialogs.ycp --- old/yast2-storage-2.18.19/storage/src/include/ep-dialogs.ycp 2009-09-29 13:43:59.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/ep-dialogs.ycp 2009-11-18 23:06:52.000000000 +0100 @@ -722,6 +722,7 @@ case `custom_size: { UI::ChangeWidget(`id(`custom_size_attachment), `Enabled, true); + UI::SetFocus(`id(`custom_size_input)); break; } 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-storage-2.18.19/storage/src/include/ep-dm-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-dm-lib.ycp --- old/yast2-storage-2.18.19/storage/src/include/ep-dm-lib.ycp 2009-07-21 16:37:06.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/ep-dm-lib.ycp 2009-10-29 11:54:51.000000000 +0100 @@ -22,7 +22,7 @@ map<string, map> target_map = Storage::GetTargetMap(); map<string, any> data = Storage::GetPartition(target_map, device); - if (!isempty(data["used_by_device"]:"")) + if (!isempty(data["used_by"]:[])) { // error popup Popup::Error(sformat(_("The DM %1 is in use. It cannot be 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-storage-2.18.19/storage/src/include/ep-graph.ycp new/yast2-storage-2.19.0/storage/src/include/ep-graph.ycp --- old/yast2-storage-2.18.19/storage/src/include/ep-graph.ycp 2009-07-21 16:37:06.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/ep-graph.ycp 2009-11-20 17:59:52.000000000 +0100 @@ -10,7 +10,7 @@ textdomain "storage"; - void EpContextMenuGraph() + void EpContextMenuDeviceGraph() { symbol widget = ContextMenu::Simple([ `item(`id(`add_raid), `icon(StorageIcons::raid_icon), _("Add RAID")), `item(`id(`add_lvmvg), `icon(StorageIcons::lvm_icon), _("Add Volume Group")) ]); @@ -28,21 +28,21 @@ } - void CreateGraphPanel(any user_data) + void CreateDeviceGraphPanel(any user_data) { - string filename = Directory::tmpdir + "/storage.gv"; - Storage::SaveGraph(filename); + string filename = Directory::tmpdir + "/device.gv"; + Storage::SaveDeviceGraph(filename); UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( // dialog heading, graph is the mathematic term for // a set of notes connected with edges - `IconAndHeading(_("Graph"), StorageIcons::graph_icon), + `IconAndHeading(_("Device Graph"), StorageIcons::graph_icon), `Graph(`id(`graph), `opt(`notify, `notifyContextMenu), filename, "dot"), `HBox( // button text - `PushButton(`id(`export), _("Export Graph...")), + `PushButton(`id(`export), _("Export Device Graph...")), `HStretch() ) )) @@ -51,22 +51,22 @@ SCR::Execute(.target.remove, filename); // helptext - string helptext = _("This view shows a graph."); + string helptext = _("This view shows a graph of devices."); Wizard::RestoreHelp(helptext); } - void RefreshGraphPanel(any user_data) + void RefreshDeviceGraphPanel(any user_data) { - string filename = Directory::tmpdir + "/storage.gv"; - Storage::SaveGraph(filename); + string filename = Directory::tmpdir + "/device.gv"; + Storage::SaveDeviceGraph(filename); UI::ChangeWidget(`id(`graph), `Filename, filename); } - void HandleGraphPanel(any user_data, map event) + void HandleDeviceGraphPanel(any user_data, map event) { void GotoDevice(string device) { @@ -81,7 +81,7 @@ string node = (string) UI::QueryWidget(`id(`graph), `Item); if (isempty(node)) - EpContextMenuGraph(); + EpContextMenuDeviceGraph(); else if (String::StartsWith(node, "device:")) EpContextMenuDevice(substring(node, 7)); @@ -108,7 +108,7 @@ string filename = UI::AskForSaveFileName("/tmp", "*.gv", "Save as..."); if (filename != nil) { - if (!Storage::SaveGraph(filename)) + if (!Storage::SaveDeviceGraph(filename)) { // error popup Popup::Error(_("Saving graph file failed.")); @@ -118,4 +118,79 @@ break; } } + + + void CreateMountGraphPanel(any user_data) + { + string filename = Directory::tmpdir + "/mount.gv"; + Storage::SaveMountGraph(filename); + + UI::ReplaceWidget(`tree_panel, + Greasemonkey::Transform( + `VBox( + // dialog heading, graph is the mathematic term for + // a set of notes connected with edges + `IconAndHeading(_("Mount Graph"), StorageIcons::graph_icon), + `Graph(`id(`graph), `opt(`notify, `notifyContextMenu), filename, "dot"), + `HBox( + // button text + `PushButton(`id(`export), _("Export Mount Graph...")), + `HStretch() + ) + )) + ); + + SCR::Execute(.target.remove, filename); + + // helptext + string helptext = _("This view shows a graph of mount points."); + + Wizard::RestoreHelp(helptext); + } + + + void RefreshMountGraphPanel(any user_data) + { + string filename = Directory::tmpdir + "/mount.gv"; + Storage::SaveMountGraph(filename); + + UI::ChangeWidget(`id(`graph), `Filename, filename); + } + + + void HandleMountGraphPanel(any user_data, map event) + { + void GotoDevice(string device) + { + TreePanel::SwitchToNew(device); + UI::SetFocus(UI::WidgetExists(`id(`table)) ? `id(`table) : `id(`text)); + } + + switch (Event::IsWidgetActivated(event)) + { + case `graph: + { + string node = (string) UI::QueryWidget(`id(`graph), `Item); + + if (String::StartsWith(node, "mountpoint:")) + GotoDevice(substring(node, 11)); + } + break; + + case `export: + { + string filename = UI::AskForSaveFileName("/tmp", "*.gv", "Save as..."); + if (filename != nil) + { + if (!Storage::SaveMountGraph(filename)) + { + // error popup + Popup::Error(_("Saving graph file failed.")); + } + } + } + break; + } + } + } 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-storage-2.18.19/storage/src/include/ep-hd-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-hd-lib.ycp --- old/yast2-storage-2.18.19/storage/src/include/ep-hd-lib.ycp 2009-07-31 12:49:04.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/ep-hd-lib.ycp 2009-10-29 11:43:46.000000000 +0100 @@ -22,7 +22,7 @@ map<string, map> target_map = Storage::GetTargetMap(); map disk = target_map[disk_device]:$[]; - if (!isempty(disk["used_by_device"]:"")) + if (!isempty(disk["used_by"]:[])) { // error popup Popup::Error(_("The disk is in use and cannot be modified.")); @@ -184,7 +184,7 @@ map<string, map> target_map = Storage::GetTargetMap(); map disk = target_map[disk_device]:$[]; - if (!isempty(disk["used_by_device"]:"")) + if (!isempty(disk["used_by"]:[])) { // error popup Popup::Error(_("The disk is in use and cannot be modified.")); @@ -243,7 +243,7 @@ if (!Storage::CanEdit(part, true)) return; - if (!isempty(part["used_by_device"]:"")) + if (!isempty(part["used_by"]:[])) { // error popup, %1 is replace by partition device name e.g. /dev/sdb1 Popup::Error(sformat(_("The partition %1 is in use. It cannot be @@ -289,7 +289,7 @@ return; } - if (!isempty(part["used_by_device"]:"")) + if (!isempty(part["used_by"]:[])) { // error popup, %1 is replace by partition device name, e.g. /dev/sdb1 Popup::Error(sformat(_("The partition %1 is in use. It cannot be 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-storage-2.18.19/storage/src/include/ep-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-lib.ycp --- old/yast2-storage-2.18.19/storage/src/include/ep-lib.ycp 2009-09-29 17:07:44.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/ep-lib.ycp 2009-10-29 11:56:07.000000000 +0100 @@ -318,7 +318,7 @@ map<string, map> target_map = Storage::GetTargetMap(); map disk = Storage::GetDisk(target_map, device); - if (disk["used_by_type"]:`UB_NONE != `UB_NONE) + if (!isempty(disk["used_by"]:[])) return `Empty(); list <integer> bits = []; 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-storage-2.18.19/storage/src/include/ep-loop-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-loop-lib.ycp --- old/yast2-storage-2.18.19/storage/src/include/ep-loop-lib.ycp 2009-07-21 16:37:06.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/ep-loop-lib.ycp 2009-10-29 11:55:09.000000000 +0100 @@ -45,7 +45,7 @@ map<string, map> target_map = Storage::GetTargetMap(); map<string, any> data = Storage::GetPartition(target_map, device); - if (!isempty(data["used_by_device"]:"")) + if (!isempty(data["used_by"]:[])) { // error popup, %1 is replaced by device name Popup::Error(sformat(_("The Crypt File %1 is in use. It cannot be 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-storage-2.18.19/storage/src/include/ep-lvm-dialogs.ycp new/yast2-storage-2.19.0/storage/src/include/ep-lvm-dialogs.ycp --- old/yast2-storage-2.18.19/storage/src/include/ep-lvm-dialogs.ycp 2009-08-19 14:26:55.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/ep-lvm-dialogs.ycp 2009-11-17 12:21:20.000000000 +0100 @@ -75,6 +75,7 @@ return ret; } + boolean ConfirmVgDelete( string vgname, list <string> log_volumes ) { return ConfirmRecursiveDelete( vgname, log_volumes, @@ -90,6 +91,7 @@ } + boolean CheckPeSize(integer pe_size) { if (!Integer::IsPowerOfTwo(pe_size) || pe_size < 1024) @@ -225,6 +227,7 @@ MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepVgHelptext()); MiniWorkflow::SetLastStep(true); + UI::SetFocus(`id(`vgname)); symbol widget = nil; @@ -449,6 +452,7 @@ case `manual_size: UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, true); + UI::SetFocus(`id(`size_input)); break; case `stripes: @@ -551,6 +555,7 @@ MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepLvNameHelptext()); MiniWorkflow::SetLastStep(false); + UI::SetFocus(`id(`lvname)); symbol widget = nil; 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-storage-2.18.19/storage/src/include/ep-main.ycp new/yast2-storage-2.19.0/storage/src/include/ep-main.ycp --- old/yast2-storage-2.18.19/storage/src/include/ep-main.ycp 2009-09-29 17:07:53.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/ep-main.ycp 2009-11-19 17:54:01.000000000 +0100 @@ -101,7 +101,8 @@ `dm : $[ `create : CreateDmMainPanel, `handle : HandleDmMainPanel ], `nfs : $[ `create : CreateNfsMainPanel, `handle : HandleNfsMainPanel ], `unused : $[ `create : CreateUnusedPanel, `handle : HandleUnusedPanel ], - `graph : $[ `create : CreateGraphPanel, `refresh : RefreshGraphPanel, `handle : HandleGraphPanel ], + `devicegraph : $[ `create : CreateDeviceGraphPanel, `refresh : RefreshDeviceGraphPanel, `handle : HandleDeviceGraphPanel ], + `mountgraph : $[ `create : CreateMountGraphPanel, `refresh : RefreshDeviceGraphPanel, `handle : HandleMountGraphPanel ], `summary : $[ `create : CreateSummaryPanel ], `settings : $[ `create : CreateSettingsPanel, `handle : HandleSettingsPanel, `destroy : DestroySettingsPanel ], `log : $[ `create : CreateLogPanel, `handle : HandleLogPanel, `destroy : DestroyLogPanel ] ]; @@ -203,8 +204,13 @@ ]; if (UI::HasSpecialWidget(`Graph)) + { + // tree node label + tree = add(tree, `item(`id(`devicegraph), `icon(StorageIcons::graph_icon), _("Device Graph"), open(`devicegraph))); // tree node label - tree = add(tree, `item(`id(`graph), `icon(StorageIcons::graph_icon), _("Graph"), open(`graph))); + tree = add(tree, `item(`id(`mountgraph), `icon(StorageIcons::graph_icon), _("Mount Graph"), open(`mountgraph))); + } + // tree node label tree = add(tree, `item(`id(`summary), `icon(StorageIcons::summary_icon), _("Installation Summary"), open(`summary))); 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-storage-2.18.19/storage/src/include/ep-raid-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-raid-lib.ycp --- old/yast2-storage-2.18.19/storage/src/include/ep-raid-lib.ycp 2009-07-21 16:37:06.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/include/ep-raid-lib.ycp 2009-10-29 11:44:23.000000000 +0100 @@ -99,7 +99,7 @@ map<string, map> target_map = Storage::GetTargetMap(); map<string, any> data = Storage::GetPartition(target_map, device); - if (!isempty(data["used_by_device"]:"")) + if (!isempty(data["used_by"]:[])) { // error popup, %1 is replaced by device name e.g. /dev/md1 Popup::Error(sformat(_("The RAID %1 is in use. It cannot be @@ -139,7 +139,7 @@ return; } - if (!isempty(data["used_by_device"]:"")) + if (!isempty(data["used_by"]:[])) { // error popup, %1 is replaced by device name e.g. /dev/md1 Popup::Error(sformat(_("The RAID %1 is in use. It cannot be 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-storage-2.18.19/storage/src/inst_disk_proposal.ycp new/yast2-storage-2.19.0/storage/src/inst_disk_proposal.ycp --- old/yast2-storage-2.18.19/storage/src/inst_disk_proposal.ycp 2009-07-27 17:40:50.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/inst_disk_proposal.ycp 2009-11-16 14:13:33.000000000 +0100 @@ -68,7 +68,7 @@ ]; map seq = $[]; seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next: `next ]; - if( Arch::s390() || Mode::autoinst() ) + if (Mode::autoinst()) { Storage::SetPartMode("PROP_MODIFY"); seq["ws_start"] = "disk"; @@ -114,11 +114,6 @@ } -if( Arch::s390() ) - { - return Storage::GetExitKey(); - } - // Title for dialogue string title = _("Suggested Partitioning"); // Radiobutton for partition dialog 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-storage-2.18.19/storage/src/inst_target_selection.ycp new/yast2-storage-2.19.0/storage/src/inst_target_selection.ycp --- old/yast2-storage-2.18.19/storage/src/inst_target_selection.ycp 2009-07-21 16:37:07.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/inst_target_selection.ycp 2009-11-19 10:35:47.000000000 +0100 @@ -12,7 +12,7 @@ * "target_is":<devicename> (key to "targets" map) * if custom, set "target_is":"CUSTOM" * - * $Id: inst_target_selection.ycp 54125 2008-12-15 13:23:57Z aschnell $ + * $Id: inst_target_selection.ycp 59611 2009-11-19 09:36:39Z aschnell $ */ { textdomain "storage"; @@ -88,6 +88,8 @@ integer i = 1; foreach(string tname, map tdata, usable_target_map, { string tlinename = tdata["name"]:"?"; + if (haskey(tdata, "name")) + tlinename = tdata["proposal_name"]:"?"; if( tdata["type"]:`CT_UNKNOWN==`CT_DMRAID ) tlinename = "BIOS RAID " + tdata["name"]:"?"; string tline = "&" + i + ": " + tlinename; 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-storage-2.18.19/storage/src/modules/StorageFields.ycp new/yast2-storage-2.19.0/storage/src/modules/StorageFields.ycp --- old/yast2-storage-2.18.19/storage/src/modules/StorageFields.ycp 2009-08-14 12:46:48.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/modules/StorageFields.ycp 2009-10-29 14:30:07.000000000 +0100 @@ -29,12 +29,12 @@ global void IterateTargetMap(map<string, map> target_map, void(map<string, map>, map) callback) { const map disk_order = $[ `CT_DMRAID : 0, `CT_DMMULTIPATH : 1, `CT_DISK : 2, - `CT_MD : 3, `CT_LOOP : 4, `CT_LVM : 5, `CT_DM : 6, `CT_NFS : 8 ]; + `CT_MD : 3, `CT_LOOP : 4, `CT_LVM : 5, `CT_DM : 6, `CT_NFS : 7 ]; list<string> keys = maplist(string dev, map disk, target_map, { return dev; }); keys = sort(string a, string b, keys, { - integer oa = disk_order[target_map[a,"type"]:`CT_UNKNOWN]:8; - integer ob = disk_order[target_map[b,"type"]:`CT_UNKNOWN]:8; + integer oa = disk_order[target_map[a, "type"]:`CT_UNKNOWN]:8; + integer ob = disk_order[target_map[b, "type"]:`CT_UNKNOWN]:8; return (oa==ob) ? (a<b) : (oa<ob); }); @@ -56,22 +56,25 @@ } - string UsedByString(symbol used_by_type, string used_by_device) + string UsedByString(map<string, any> used_by) { - switch (used_by_type) + symbol type = used_by["type"]:`UB_NONE; + string device = used_by["device"]:""; + + switch (type) { case `UB_LVM: - return "LVM " + used_by_device; + return "LVM " + device; case `UB_DM: - return "DM " + used_by_device; + return "DM " + device; case `UB_DMRAID: - return "DM RAID " + used_by_device; + return "DM RAID " + device; case `UB_DMMULTIPATH: - return "DM Multipath " + used_by_device; + return "DM Multipath " + device; case `UB_MD: - return "RAID " + used_by_device; + return "RAID " + device; default: - return used_by_device; + return device; } } @@ -622,12 +625,16 @@ case `used_by: { - string value = UsedByString(data["used_by_type"]:`UB_NONE, data["used_by_device"]:""); if (style == `table) - return value; + return UsedByString(data["used_by", 0]:$[]); else - // row label, %1 is replace by used by device name e.g. /dev/system - return sformat(_("Used By: %1"), String::EscapeTags(value)); + { + integer n = size(data["used_by"]:[]); + return mergestring(maplist(integer i, Integer::Range(n == 0 ? 1 : n), { + // row label, %1 is replaced by number, %2 is replace by device name e.g. /dev/system + return sformat(_("Used By %1: %2"), i+1, String::EscapeTags(UsedByString(data["used_by", i]:$[]))); + }), HTML::Newline()); + } } case `uuid: @@ -1048,14 +1055,14 @@ { if (partition == nil) { - if (contains(devices, disk["used_by_device"]:"")) + if (find(map used_by, disk["used_by"]:[], { return contains(devices, used_by["device"]:""); }) != nil) return `showandfollow; else return `follow; } else { - if (contains(devices, partition["used_by_device"]:"")) + if (find(map used_by, partition["used_by"]:[], { return contains(devices, used_by["device"]:""); }) != nil) return `show; else return `ignore; 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-storage-2.18.19/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.19.0/storage/src/modules/StorageProposal.ycp --- old/yast2-storage-2.18.19/storage/src/modules/StorageProposal.ycp 2009-10-06 12:26:16.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/modules/StorageProposal.ycp 2009-11-16 14:13:22.000000000 +0100 @@ -287,8 +287,7 @@ boolean ignore_disk(string dev, map entry, boolean soft) { - boolean ret = !Storage::IsPartitionable( entry ) || - entry["readonly"]:false || Arch::s390(); + boolean ret = !Storage::IsPartitionable(entry) || entry["readonly"]:false; // GPT is not required for uEFI on x86_64 if( !ret && Arch::ia64() && entry["label"]:"gpt"!="gpt" ) { 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-storage-2.18.19/storage/src/modules/StorageSettings.ycp new/yast2-storage-2.19.0/storage/src/modules/StorageSettings.ycp --- old/yast2-storage-2.18.19/storage/src/modules/StorageSettings.ycp 2009-07-29 15:22:42.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/modules/StorageSettings.ycp 2009-11-27 17:09:22.000000000 +0100 @@ -34,6 +34,7 @@ modified = true; } + global void SetDisplayName(symbol new_display_name) { display_name = new_display_name; @@ -68,12 +69,8 @@ break; } - if (ret == "") - ret = data["device"]:""; - - integer pos = findlastof(ret, "/"); - if (pos != nil) - ret = substring(ret, pos + 1); + if (isempty(ret)) + ret = data["name"]:""; return ret; } 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-storage-2.18.19/storage/src/modules/StorageUpdate.ycp new/yast2-storage-2.19.0/storage/src/modules/StorageUpdate.ycp --- old/yast2-storage-2.18.19/storage/src/modules/StorageUpdate.ycp 2009-08-19 12:47:15.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/modules/StorageUpdate.ycp 2009-11-27 15:25:57.000000000 +0100 @@ -383,6 +383,10 @@ string cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto"; map bo = (map)SCR::Execute (.target.bash_output, cmd ); y2milestone( "Update bo %1", bo ); + + cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto-early"; + bo = (map)SCR::Execute (.target.bash_output, cmd ); + y2milestone( "Update bo %1", bo ); } // set flag -> it indicates that Update was already called called_update = true; 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-storage-2.18.19/storage/src/modules/Storage.ycp new/yast2-storage-2.19.0/storage/src/modules/Storage.ycp --- old/yast2-storage-2.18.19/storage/src/modules/Storage.ycp 2009-10-06 12:27:23.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/modules/Storage.ycp 2009-11-27 17:09:54.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 58951 2009-10-06 10:27:39Z aschnell $ + * $Id: Storage.ycp 59833 2009-11-27 16:10:46Z aschnell $ */ { module "Storage"; @@ -1202,6 +1202,8 @@ { p["used_by_type"] = toSymbol( conv_usedby, t ); p["used_by_device"] = LibStorage::VolumeInfo::swig_usedByDevice_get(vinfo); + p["used_by"] = [ $[ "type" : p["used_by_type"]:`UB_NONE, + "device" : p["used_by_device"]:"" ] ]; } tmp = LibStorage::VolumeInfo::swig_fstab_options_get(vinfo); if( size(tmp)>0 ) @@ -1530,9 +1532,9 @@ map toDiskMap( map disk, map cinfo ) { - list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", + list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", "name", "device", "max_logical", "max_primary", "type", "readonly", - "used_by_type", "used_by_device", "partitions", "dasdfmt", + "used_by", "used_by_type", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; foreach( string s, l, ``{ @@ -1561,6 +1563,8 @@ { c["used_by_type"] = toSymbol( conv_usedby, t ); c["used_by_device"] = LibStorage::ContainerInfo::swig_usedByDevice_get(info); + c["used_by"] = [ $[ "type" : c["used_by_type"]:`UB_NONE, + "device" : c["used_by_device"]:"" ] ]; } boolean b = LibStorage::ContainerInfo::swig_readonly_get(info); if( b ) @@ -3123,12 +3127,13 @@ ``{ disk = getDiskInfo( dev, disk ); integer s = disk["size_k"]:0 * 1024; - disk["name"] = disk["dname"]:"" + + string proposal_name = disk["dname"]:"" + Storage::ByteToHumanString( s ) + ", " + disk["device"]:"" + ", "; if( size( disk["vendor"]:"")>0 ) - disk["name"] = disk["name"]:"" + disk["vendor"]:"" + "-"; - disk["name"] = disk["name"]:"" + disk["model"]:""; + proposal_name = proposal_name + disk["vendor"]:"" + "-"; + proposal_name = proposal_name + disk["model"]:""; + disk["proposal_name"] = proposal_name; if( haskey( disk, "dname" )) disk = remove( disk, "dname" ); tmp[dev] = disk; @@ -3516,7 +3521,9 @@ ret["used_fs"] = Partitions::DefaultFs(); } if( ret["used_fs"]:`unknown == `unknown || - ret["used_fs"]:`unknown == `none ) + ret["used_fs"]:`unknown == `none || + ret["used_fs"]:`unknown == `hfs || + ret["used_fs"]:`unknown == `hfsplus ) ret["format"] = false; else ret["format"] = true; @@ -4802,7 +4809,11 @@ need_crypt, need_md, need_lvm, need_dmraid, need_dmmultipath ); if( need_crypt ) + { CallInsserv( true, "boot.crypto" ); + CallInsserv( true, "boot.crypto-early" ); + } + CallInsserv( need_md, "boot.md" ); CallInsserv( need_lvm, "boot.lvm" ); CallInsserv( need_dmraid, "boot.dmraid" ); @@ -5260,10 +5271,18 @@ } -global boolean SaveGraph(string filename) +global boolean SaveDeviceGraph(string filename) +{ + boolean ret = LibStorage::saveDeviceGraph(sint, filename); + y2milestone("SaveDeviceGraph filename:%1 ret:%2", filename, ret); + return ret; +} + + +global boolean SaveMountGraph(string filename) { - boolean ret = LibStorage::saveGraph(sint, filename); - y2milestone("SaveGraph filename:%1 ret:%2", filename, ret); + boolean ret = LibStorage::saveMountGraph(sint, filename); + y2milestone("SaveMountGraph filename:%1 ret:%2", filename, ret); return ret; } 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-storage-2.18.19/storage/src/proposal/partitions_proposal.ycp new/yast2-storage-2.19.0/storage/src/proposal/partitions_proposal.ycp --- old/yast2-storage-2.18.19/storage/src/proposal/partitions_proposal.ycp 2009-07-21 16:37:05.000000000 +0200 +++ new/yast2-storage-2.19.0/storage/src/proposal/partitions_proposal.ycp 2009-11-03 16:52:17.000000000 +0100 @@ -1,7 +1,7 @@ /** * Module: proposal_partitions.ycp * - * $Id: partitions_proposal.ycp 55587 2009-02-18 14:15:43Z aschnell $ + * $Id: partitions_proposal.ycp 59267 2009-11-02 10:58:59Z jsrain $ * * Author: Klaus Kaempf <kkaempf(a)suse.de> * @@ -25,6 +25,25 @@ y2milestone( "func:%1 param:%2", func, param ); + // check if /home partition keeps unformatted in order to warn for + // possible incorrectly set file ownership (fate#306325) + boolean home_not_formatted() { + map<string,map> tm = Storage::GetTargetMap(); + boolean ret = false; + foreach (string disk, map info, tm, { + list<map> partitions = info["partitions"]:[]; + foreach (map p, partitions, { + if (p["mount"]:"" == "/home" && ! p["format"]:false) + { + y2milestone ("The /home partition will not be formatted."); + ret = true; + break; + } + }); + }); + return ret; + } + if( func == "MakeProposal" && Mode::autoinst() ) { ret["preformatted_proposal"] = Storage::ChangeText(); @@ -65,6 +84,17 @@ !Storage::GetPartProposalActive() ) { ret["preformatted_proposal"] = Storage::ChangeText(); + // detect non-formated /home together with remote authentication - Fate#306325 + if (home_not_formatted()) + { + import "UsersSimple"; + if (UsersSimple::AfterAuth() != "users") + { + ret["warning"] = _("The /home partition will not be formatted. After installation, +ensure that the permissions to home directories are set properly."); + ret["warning_level"] = `warning; + } + } } else { 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-storage-2.18.19/VERSION new/yast2-storage-2.19.0/VERSION --- old/yast2-storage-2.18.19/VERSION 2009-10-05 17:50:51.000000000 +0200 +++ new/yast2-storage-2.19.0/VERSION 2009-10-29 11:59:13.000000000 +0100 @@ -1 +1 @@ -2.18.19 +2.19.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 libstorage for openSUSE:Factory
by root＠Hilbert.suse.de 02 Dec '09

02 Dec '09

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at Wed Dec 2 12:32:07 CET 2009. -------- --- libstorage/libstorage.changes 2009-10-19 12:09:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/libstorage/libstorage.changes 2009-12-02 11:27:14.000000000 +0100 @@ -1,0 +2,74 @@ +Wed Dec 02 11:17:46 CET 2009 - aschnell(a)suse.de + +- removed call to devmap_mknod.sh (which has disappeared) + +------------------------------------------------------------------- +Fri Nov 27 14:53:29 CET 2009 - aschnell(a)suse.de + +- adapted parser for multipath output + +------------------------------------------------------------------- +Wed Nov 25 14:21:37 CET 2009 - aschnell(a)suse.de + +- read testmode file for LVM VGs + +------------------------------------------------------------------- +Tue Nov 24 14:59:54 CET 2009 - fehr(a)suse.de + +- enabled to set "noauto" option for LUKS-encrypted volumes + +------------------------------------------------------------------- +Mon Nov 23 15:09:19 CET 2009 - aschnell(a)suse.de + +- improved parsing of dmsetup output + +------------------------------------------------------------------- +Fri Nov 20 18:02:05 CET 2009 - aschnell(a)suse.de + +- added mount graph +- 2.19.1 + +------------------------------------------------------------------- +Thu Nov 19 13:38:54 CET 2009 - fehr(a)suse.de + +- fixed freeCylindersAfterPartition when start of next partition + is on same cylinder than end of current (#465370) + +------------------------------------------------------------------- +Wed Nov 18 16:36:02 CET 2009 - aschnell(a)suse.de + +- run dmraid and multipath only once during detection + +------------------------------------------------------------------- +Tue Nov 17 11:24:08 CET 2009 - aschnell(a)suse.de + +- improved XEN VBD detection (bnc #365688) + +------------------------------------------------------------------- +Mon Nov 16 11:28:41 CET 2009 - aschnell(a)suse.de + +- use name instead of device as label in nodes of graph + +------------------------------------------------------------------- +Wed Nov 11 10:34:34 CET 2009 - aschnell(a)suse.de + +- fixed return value of function getContVolInfo + +------------------------------------------------------------------- +Mon Nov 9 18:34:22 CET 2009 - fehr(a)suse.de + +- preserve label when unsetting format flag (#537064) + +------------------------------------------------------------------- +Mon Nov 09 17:34:41 CET 2009 - aschnell(a)suse.de + +- always use ntfs-3g for NTFS volumes since ntfs is not supported + by the kernel anymore + +------------------------------------------------------------------- +Wed Oct 28 23:13:51 CET 2009 - aschnell(a)suse.de + +- converted usedby information to list (bnc #472812) +- 2.19.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libstorage-2.18.23.tar.bz2 New: ---- libstorage-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.n7sIg8/_old 2009-12-02 12:30:45.000000000 +0100 +++ /var/tmp/diff_new_pack.n7sIg8/_new 2009-12-02 12:30:45.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libstorage (Version 2.18.23) +# spec file for package libstorage (Version 2.19.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: libstorage -Version: 2.18.23 +Version: 2.19.1 Release: 1 License: GPL Group: System/Libraries ++++++ libstorage-2.18.23.tar.bz2 -> libstorage-2.19.1.tar.bz2 ++++++ ++++ 17575 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 emacs for openSUSE:Factory
by root＠Hilbert.suse.de 02 Dec '09

02 Dec '09

Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at Wed Dec 2 12:30:28 CET 2009. -------- --- emacs/emacs.changes 2009-11-26 14:55:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/emacs/emacs.changes 2009-12-01 15:24:18.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 1 15:18:04 CET 2009 - werner(a)suse.de + +- Fix a nasty bug were menus do not occure with GTK (bnc#558884) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- emacs-23.1-bnc558884.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.SEM5n9/_old 2009-12-02 12:28:52.000000000 +0100 +++ /var/tmp/diff_new_pack.SEM5n9/_new 2009-12-02 12:28:52.000000000 +0100 @@ -24,7 +24,7 @@ License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.1 -Release: 4 +Release: 5 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} @@ -55,6 +55,7 @@ Patch14: emacs-23.1-bnc556175.patch Patch15: emacs-22.2-iconic.patch Patch16: emacs-23.1-flyspell.patch +Patch17: emacs-23.1-bnc558884.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global bug_345669 0 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -234,6 +235,7 @@ %patch14 -p0 -b .loop %patch15 -p0 -b .iconic %patch16 -p0 -b .flyspell +%patch17 -p0 -b .gtkmenus %patch if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then install-mh -auto < /dev/null ++++++ emacs-23.1-bnc558884.patch ++++++ >From 3715ffe3e3b2c64d113bf26d94aab559f8559e83 Mon Sep 17 00:00:00 2001 From: Jan Djärv <jan.h.d(a)swipnet.se> Date: Wed, 02 Sep 2009 17:03:20 +0000 Subject: * xterm.h: Rename x_non_menubar_window_to_frame to x_menubar_window_to_frame * xterm.c: Remove declarations also in xterm.h (XTmouse_position): Do not return valid positions for clicks in the menubar and the toolbar for Gtk+. * xfns.c (x_any_window_to_frame): Assume less about Gtk+ internals, if the widget for the event has the same top level as a frame, return the frame. (x_menubar_window_to_frame): Detect menu bar even with Gtk+ internal windows, bug #4122. (x_non_menubar_window_to_frame): Remove. --- diff --git a/src/xfns.c b/src/xfns.c index ed068b1..49a9c50 100644 --- src/xfns.c +++ src/xfns.c @@ -377,10 +377,7 @@ x_any_window_to_frame (dpyinfo, wdesc) #ifdef USE_GTK GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc); if (gwdesc != 0 - && (gwdesc == x->widget - || gwdesc == x->edit_widget - || gwdesc == x->vbox_widget - || gwdesc == x->menubar_widget)) + && gtk_widget_get_toplevel (gwdesc) == x->widget) found = f; #else if (wdesc == XtWindow (x->widget) @@ -401,54 +398,6 @@ x_any_window_to_frame (dpyinfo, wdesc) return found; } -/* Likewise, but exclude the menu bar widget. */ - -struct frame * -x_non_menubar_window_to_frame (dpyinfo, wdesc) - struct x_display_info *dpyinfo; - int wdesc; -{ - Lisp_Object tail, frame; - struct frame *f; - struct x_output *x; - - if (wdesc == None) return 0; - - for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail)) - { - frame = XCAR (tail); - if (!FRAMEP (frame)) - continue; - f = XFRAME (frame); - if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo) - continue; - x = f->output_data.x; - /* This frame matches if the window is any of its widgets. */ - if (x->hourglass_window == wdesc) - return f; - else if (x->widget) - { -#ifdef USE_GTK - GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc); - if (gwdesc != 0 - && (gwdesc == x->widget - || gwdesc == x->edit_widget - || gwdesc == x->vbox_widget)) - return f; -#else - if (wdesc == XtWindow (x->widget) - || wdesc == XtWindow (x->column_widget) - || wdesc == XtWindow (x->edit_widget)) - return f; -#endif - } - else if (FRAME_X_WINDOW (f) == wdesc) - /* A tooltip frame. */ - return f; - } - return 0; -} - /* Likewise, but consider only the menu bar widget. */ struct frame * @@ -476,15 +425,14 @@ x_menubar_window_to_frame (dpyinfo, wdesc) if (x->menubar_widget) { GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc); - int found = 0; - BLOCK_INPUT; + /* This gives false positives, but the rectangle check in xterm.c + where this is called takes care of that. */ if (gwdesc != 0 && (gwdesc == x->menubar_widget - || gtk_widget_get_parent (gwdesc) == x->menubar_widget)) - found = 1; - UNBLOCK_INPUT; - if (found) return f; + || gtk_widget_is_ancestor (x->menubar_widget, gwdesc) + || gtk_widget_is_ancestor (gwdesc, x->menubar_widget))) + return f; } #else if (x->menubar_widget diff --git a/src/xterm.c b/src/xterm.c index e536d0d..1e13ae8 100644 --- src/xterm.c +++ src/xterm.c @@ -109,8 +109,6 @@ extern void xlwmenu_redisplay P_ ((Widget)); #if defined (USE_X_TOOLKIT) || defined (USE_GTK) extern void free_frame_menubar P_ ((struct frame *)); -extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, - int)); #endif #ifdef USE_X_TOOLKIT @@ -143,11 +141,6 @@ extern void _XEditResCheckMessages (); #endif /* USE_X_TOOLKIT */ -#if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) -#define x_any_window_to_frame x_window_to_frame -#define x_top_window_to_frame x_window_to_frame -#endif - #ifdef USE_X_TOOLKIT #include "widget.h" #ifndef XtNinitialState @@ -3908,7 +3901,14 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time) if (child == None || child == win) break; - +#ifdef USE_GTK + /* We don't wan't to know the innermost window. We + want the edit window. For non-Gtk+ the innermost + window is the edit window. For Gtk+ it might not + be. It might be the tool bar for example. */ + if (x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win)) + break; +#endif win = child; parent_x = win_x; parent_y = win_y; @@ -3925,8 +3925,14 @@ XTmouse_position (fp, insist, bar_window, part, x, y, time) parent_{x,y} are invalid, but that's okay, because we'll never use them in that case.) */ +#ifdef USE_GTK + /* We don't wan't to know the innermost window. We + want the edit window. */ + f1 = x_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win); +#else /* Is win one of our frames? */ f1 = x_any_window_to_frame (FRAME_X_DISPLAY_INFO (*fp), win); +#endif #ifdef USE_X_TOOLKIT /* If we end up with the menu bar window, say it's not diff --git a/src/xterm.h b/src/xterm.h index 0ab19fd..5e83ef8 100644 --- src/xterm.h +++ src/xterm.h @@ -378,7 +378,7 @@ extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); #if defined (USE_X_TOOLKIT) || defined (USE_GTK) extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); -extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int)); +extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, int)); extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); #endif -- cgit v0.8.2.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 02 Dec '09

02 Dec '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Wed Dec 2 12:28:31 CET 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-11-02 10:06:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2009-11-29 17:44:25.000000000 +0100 @@ -1,0 +2,15 @@ +Sun Nov 29 17:43:43 CET 2009 - sndirsch(a)suse.de + +- driver-autoconfig.diff: + * VIA chipsets: switched to "via" as first try since "via" is no + longer renamed to "chrome9" in -chrome9 driver package and + -unichrome driver package now disables the "via" wrapper + +------------------------------------------------------------------- +Fri Nov 27 22:14:24 CET 2009 - sndirsch(a)suse.de + +- missing_font_paths.diff + * added /usr/share/fonts/{URW,cyrillic} to font paths + (bnc #558915) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- missing_font_paths.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.jwDNM1/_old 2009-12-02 12:26:56.000000000 +0100 +++ /var/tmp/diff_new_pack.jwDNM1/_new 2009-12-02 12:26:56.000000000 +0100 @@ -33,8 +33,8 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 62 -License: GPL v2 or later ; MIT License (or similar) +Release: 63 +License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 %ifnarch s390 s390x @@ -141,6 +141,7 @@ Patch532341: bug532341.diff Patch202: 0001-Check-harder-for-primary-PCI-device.patch Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch +Patch204: missing_font_paths.diff %description This package contains the X.Org Server. @@ -148,7 +149,7 @@ %package extra -License: GPL v2 or later ; MIT License (or similar) +License: GPLv2+ ; MIT License (or similar) Summary: Additional Xservers (Xdmx, Xephyr, Xnest, Xvfb) Group: System/X11/Servers/XF86_4 Provides: xorg-x11-Xnest xorg-x11-Xvfb xorg-x11-server:/usr/bin/Xvfb @@ -162,7 +163,7 @@ %package sdk -License: GPL v2 or later ; MIT License (or similar) +License: GPLv2+ ; MIT License (or similar) Summary: X.Org Server SDK Group: System/Libraries Provides: xorg-x11-sdk @@ -178,7 +179,7 @@ %if %vnc %package -n xorg-x11-Xvnc -License: GPL v2 or later ; MIT License (or similar) +License: GPLv2+ ; MIT License (or similar) Summary: VNC Server for the X Window System Group: System/X11/Servers/XF86_4 Requires: xorg-x11-fonts-core xorg-x11 @@ -286,6 +287,7 @@ %patch532341 -p1 %patch202 -p1 %patch203 -p1 +%patch204 -p0 %build pushd xorg-docs-* ++++++ driver-autoconfig.diff ++++++ --- /var/tmp/diff_new_pack.jwDNM1/_old 2009-12-02 12:26:56.000000000 +0100 +++ /var/tmp/diff_new_pack.jwDNM1/_new 2009-12-02 12:26:56.000000000 +0100 @@ -36,7 +36,7 @@ case 0x100c: driverList[0] = "tseng"; break; - case 0x1106: driverList[0] = "openchrome"; break; + case 0x1106: -+ driverList[0] = "chrome9"; ++ driverList[0] = "via"; + driverList[1] = "openchrome"; + driverList[2] = "unichrome"; + break; ++++++ missing_font_paths.diff ++++++ --- configure.ac.orig 2009-11-27 21:59:22.000000000 +0100 +++ configure.ac 2009-11-27 22:03:59.000000000 +0100 @@ -466,7 +466,7 @@ AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), [ FONTDIR="$withval" ], [ FONTDIR="${libdir}/X11/fonts" ]) -DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" +DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/truetype/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled,${FONTDIR}/URW,${FONTDIR}/cyrillic" case $host_os in darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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