August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-storage
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package yast2-storage checked in at Sat Aug 30 02:17:11 CEST 2008. -------- --- yast2-storage/yast2-storage.changes 2008-08-27 17:06:59.000000000 +0200 +++ yast2-storage/yast2-storage.changes 2008-08-29 16:54:48.040833000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 27 17:34:10 CEST 2008 - aschnell(a)suse.de + +- fixed documentation in StorageInterface.h +- version 2.17.23 + +------------------------------------------------------------------- Old: ---- yast2-storage-2.17.22.tar.bz2 New: ---- yast2-storage-2.17.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.A11781/_old 2008-08-30 02:16:11.000000000 +0200 +++ /var/tmp/diff_new_pack.A11781/_new 2008-08-30 02:16:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.17.22) +# spec file for package yast2-storage (Version 2.17.23) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-storage -Version: 2.17.22 +Version: 2.17.23 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.17.22.tar.bz2 +Source0: yast2-storage-2.17.23.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup @@ -57,7 +57,7 @@ Arvin Schnell <aschnell(a)suse.de> %prep -%setup -n yast2-storage-2.17.22 +%setup -n yast2-storage-2.17.23 %build %{prefix}/bin/y2tool y2autoconf @@ -181,6 +181,9 @@ %doc %{prefix}/share/doc/packages/yast2-storage/libstorage %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog +* Wed Aug 27 2008 aschnell(a)suse.de +- fixed documentation in StorageInterface.h +- version 2.17.23 * Tue Aug 26 2008 aschnell(a)suse.de - fixed udev data for multipath and dmraid - version 2.17.22 ++++++ yast2-storage-2.17.22.tar.bz2 -> yast2-storage-2.17.23.tar.bz2 ++++++ ++++ 8017 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.17.22/configure.in new/yast2-storage-2.17.23/configure.in --- old/yast2-storage-2.17.22/configure.in 2008-08-27 16:36:22.000000000 +0200 +++ new/yast2-storage-2.17.23/configure.in 2008-08-29 16:52:57.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.17.22, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.17.23, 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.17.22" +VERSION="2.17.23" 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.17.22/libstorage/src/Storage.cc new/yast2-storage-2.17.23/libstorage/src/Storage.cc --- old/yast2-storage-2.17.22/libstorage/src/Storage.cc 2008-08-25 15:50:40.000000000 +0200 +++ new/yast2-storage-2.17.23/libstorage/src/Storage.cc 2008-08-29 16:00:40.000000000 +0200 @@ -4348,27 +4348,25 @@ } -string Storage::getAllUsedFs() const - { - list<FsType> fs; +list<string> Storage::getAllUsedFs() const +{ + set<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 ); + if (t!=FSUNKNOWN && t!=FSNONE) + fs.insert(t); + } + list<string> ret; + for( set<FsType>::const_iterator i=fs.begin(); i!=fs.end(); ++i ) + { + ret.push_back(Volume::fsTypeString(*i)); } + y2mil( "ret:" << ret ); + return ret; +} + bool Storage::getFsCapabilities (FsType fstype, FsCapabilities& fscapabilities) const 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.17.22/libstorage/src/Storage.h new/yast2-storage-2.17.23/libstorage/src/Storage.h --- old/yast2-storage-2.17.22/libstorage/src/Storage.h 2008-08-27 15:17:37.000000000 +0200 +++ new/yast2-storage-2.17.23/libstorage/src/Storage.h 2008-08-29 15:59:12.000000000 +0200 @@ -293,7 +293,7 @@ bool getFsCapabilities( storage::FsType fstype, storage::FsCapabilities& fscapabilities) const; - string getAllUsedFs() const; + list<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 --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.17.22/libstorage/src/StorageInterface.h new/yast2-storage-2.17.23/libstorage/src/StorageInterface.h --- old/yast2-storage-2.17.22/libstorage/src/StorageInterface.h 2008-08-27 15:17:37.000000000 +0200 +++ new/yast2-storage-2.17.23/libstorage/src/StorageInterface.h 2008-08-29 16:03:41.000000000 +0200 @@ -861,9 +861,8 @@ /** * Get list of filesystem types present on any block devices. - * List elements are separated by blanks. */ - virtual string getAllUsedFs() const = 0; + virtual list<string> getAllUsedFs() const = 0; /** * Print all detected entities to a stream. @@ -1563,7 +1562,7 @@ * Remove a LVM logical volume snapshot * * @param vg name of volume group - * @param device name of logical volume snapshot + * @param name name of logical volume snapshot * @return zero if all is ok, a negative number to indicate an error */ virtual int removeLvmLvSnapshot(const string& vg, const string& name) = 0; @@ -1573,7 +1572,8 @@ * * @pre This can only be done after the snapshot has been created on disk. * - * @param name name of snapshot + * @param vg name of volume group + * @param name name of logical volume snapshot * @param info record that gets filled with snapshot special data * @return zero if all is ok, a negative number to indicate an error */ 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.17.22/storage/src/include/custom_part_check_generated.ycp new/yast2-storage-2.17.23/storage/src/include/custom_part_check_generated.ycp --- old/yast2-storage-2.17.22/storage/src/include/custom_part_check_generated.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/custom_part_check_generated.ycp 2008-08-29 15:02:17.000000000 +0200 @@ -24,7 +24,7 @@ * ************************************************************* - $Id: custom_part_check_generated.ycp 49681 2008-08-05 09:22:23Z aschnell $ + $Id: custom_part_check_generated.ycp 50483 2008-08-29 13:02:17Z aschnell $ */ { @@ -341,8 +341,7 @@ }); - whole_disk = whole_disk || diskinfo["type"]:`CT_UNKNOWN==`CT_LVM || - diskinfo["type"]:`CT_UNKNOWN==`CT_EVMS; + whole_disk = whole_disk || diskinfo["type"]:`CT_UNKNOWN==`CT_LVM; diskinfo = add( diskinfo, "whole_disk", whole_disk ); all_whole_disk = all_whole_disk && whole_disk; targetMap = add( targetMap, disk, diskinfo ); @@ -742,11 +741,6 @@ if( !tg["/dev/"+p["used_by"]:"","create"]:false ) ppl = add( ppl, p ); } - else if( p["used_by_type"]:`UB_NONE==`UB_EVMS ) - { - if( !tg["/dev/evms/"+p["used_by"]:"","create"]:false ) - ppl = add( ppl, p ); - } }); pl = ppl; } @@ -788,13 +782,6 @@ Remove it from the volume group before editing it. "),curr_part["used_by"]:"" )); } - else if( used == `UB_EVMS ) - { - // popup text %1 is replaced by a name e.g. system - Popup::Message(sformat(_("The selected device is used by EVMS volume (%1). -Remove the EVMS volume before editing it. -"), curr_part["used_by"]:"" )); - } else if( used != `UB_NONE ) { // popup text %1 is replaced by a name e.g. system @@ -847,17 +834,9 @@ Remove it from the RAID before deleting it. "), curr_part["used_by"]:"", part_name )); } - - else if( used == `UB_EVMS) - { - // popup text %2 is a device name, %1 is the EVMS name - Popup::Message(sformat(_("The device (%2) is used by EVMS object (%1). -Remove the EVMS object before deleting it. -"), curr_part["used_by"]:"", part_name )); - } else { - // popup text %2 is a device name, %1 is the EVMS name + // popup text, %1 and %2 are device names Popup::Message(sformat(_("The device (%2) is used by %1. Remove %1 before deleting it. "), curr_part["used_by"]:"", part_name )); @@ -929,7 +908,7 @@ } if( !ok ) { - // popup text %2 is a device name, %1 is the EVMS name + // popup text, %1 is a device name Popup::Message(sformat(_("The device (%1) cannot be removed Since it is a logical partition and another logical partition with higher number is in use. @@ -1023,15 +1002,6 @@ deleting the extended partition. ")); } - else if( used == `UB_EVMS ) - { - // popup text, Do not translate EVMS. - Popup::Message(_(" -The selected extended partition contains at least one partition -that is used by an EVMS volume. Remove the EVMS volume -before deleting the extended partition. -")); - } else if( used != `UB_NONE ) { // popup text, Do not translate RAID. 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.17.22/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.17.23/storage/src/include/custom_part_dialogs.ycp --- old/yast2-storage-2.17.22/storage/src/include/custom_part_dialogs.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/custom_part_dialogs.ycp 2008-08-29 15:02:17.000000000 +0200 @@ -16,7 +16,7 @@ * ************************************************************* - $Id: custom_part_dialogs.ycp 49585 2008-08-01 13:55:43Z aschnell $ + $Id: custom_part_dialogs.ycp 50483 2008-08-29 13:02:17Z aschnell $ */ { @@ -1610,15 +1610,6 @@ deleting the device. ")); } - else if( used == `UB_EVMS ) - { - // popup text, Do not translate EVMS. - Popup::Message(_(" -The selected device contains at least one partition -that is used by an EVMS device. Delete the EVMS device -before deleting the device. -")); - } else if( used != `UB_NONE ) { // popup text 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.17.22/storage/src/include/custom_part_helptexts.ycp new/yast2-storage-2.17.23/storage/src/include/custom_part_helptexts.ycp --- old/yast2-storage-2.17.22/storage/src/include/custom_part_helptexts.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/custom_part_helptexts.ycp 2008-08-29 15:02:17.000000000 +0200 @@ -20,7 +20,7 @@ * ************************************************************* - $Id: custom_part_helptexts.ycp 42953 2007-12-11 11:52:35Z fehr $ + $Id: custom_part_helptexts.ycp 50483 2008-08-29 13:02:17Z aschnell $ */ @@ -311,7 +311,7 @@ "); // helptext expert partitioning. 19 help_text = help_text + _(" -Used By tells if a device is used by LVM, RAID or EVMS. If you do not use such +Used By tells if a device is used by LVM or RAID. If you do not use such things, it is perfectly normal for this column to be empty. "); 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.17.22/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.17.23/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.17.22/storage/src/include/custom_part_lib.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/custom_part_lib.ycp 2008-08-29 10:35:17.000000000 +0200 @@ -13,7 +13,7 @@ * ************************************************************* * - $Id: custom_part_lib.ycp 45104 2008-02-28 16:02:02Z fehr $ + $Id: custom_part_lib.ycp 50460 2008-08-28 14:07:16Z aschnell $ * */ @@ -412,7 +412,7 @@ { allowed = false; // error popup text - Popup::Error(_("Invalid character in mount point. Dont use \"`'!\"%#\" in a mount point.")); + Popup::Error(_("Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point.")); } // check if the mount point is a system mount point 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.17.22/storage/src/include/ep-all.ycp new/yast2-storage-2.17.23/storage/src/include/ep-all.ycp --- old/yast2-storage-2.17.22/storage/src/include/ep-all.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/ep-all.ycp 2008-08-28 14:36:51.000000000 +0200 @@ -24,13 +24,32 @@ UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( `VBox( + // dialog heading, %1 is replaced with hostname `IconAndHeading(sformat(_("Available Storage on %1"), short_hostname), all_icon), `Table(`id(`table), `opt(`keepSorting, `notify), table_header, table_contents) )) ); - string helptext = _("Help about view with all devices TODO."); + // helptext + string helptext = _("This view shows all storage devices +available."); + + map display_info = UI::GetDisplayInfo(); + + if (!display_info["TextMode"]:false) + { + // helptext + helptext = helptext + _("By double clicking on a table entry +you can navigate to the view with detailed information about the +device."); + } + else + { + // helptext + helptext = helptext + _("By selecting a table entry you can +navigate to the view with detailed information about the device."); + } Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } 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.17.22/storage/src/include/ep-dm.ycp new/yast2-storage-2.17.23/storage/src/include/ep-dm.ycp --- old/yast2-storage-2.17.22/storage/src/include/ep-dm.ycp 2008-08-15 18:13:06.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/ep-dm.ycp 2008-08-28 15:18:10.000000000 +0200 @@ -38,7 +38,10 @@ ) ); - string helptext = _("DM TODO"); + // helptext + string helptext = _("This view shows all Device Mapper devices +except for those already included in some other view. Thus Multipath Disks, +BIOS RAIDs and LVM logical volumes are not shown here."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -66,7 +69,9 @@ ) ); - string helptext = _("DM TODO"); + // helptext + string helptext = _("This view shows detailed information about the +selected Device Mapper device."); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } @@ -111,7 +116,9 @@ ) ); - string helptext = _("DM TODO"); + // helptext + string helptext = _("This view shows all devices used by the +selected Device Mapper device."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } 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.17.22/storage/src/include/ep-hd-dialogs.ycp new/yast2-storage-2.17.23/storage/src/include/ep-hd-dialogs.ycp --- old/yast2-storage-2.17.22/storage/src/include/ep-hd-dialogs.ycp 2008-08-13 15:35:57.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/ep-hd-dialogs.ycp 2008-08-28 16:01:14.000000000 +0200 @@ -139,7 +139,7 @@ } else if (size_k < min_size_k || size_k > max_size_k) { - Popup::Error(sformat(_("The size entered is invalid. Enter a size beteen %1 and %2."), + Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), Storage::KByteToHumanString(min_size_k), Storage::KByteToHumanString(max_size_k))); widget = `again; 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.17.22/storage/src/include/ep-hd.ycp new/yast2-storage-2.17.23/storage/src/include/ep-hd.ycp --- old/yast2-storage-2.17.22/storage/src/include/ep-hd.ycp 2008-08-18 16:50:01.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/ep-hd.ycp 2008-08-28 16:26:33.000000000 +0200 @@ -98,7 +98,9 @@ ) ); - string helptext = _("HD TODO"); + // helptext + string helptext = _("This view shows all hard disks including +iSCSI disks, BIOS RAIDs and Multipath disks and their partitions."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -217,7 +219,9 @@ ) ); - string helptext = _("HD TODO"); + // helptext + string helptext = _("This view shows detailed information about the +selected hard disk."); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } @@ -291,7 +295,9 @@ ) )); - string helptext = _("HD TODO"); + // helptext + string helptext = _("This view shows all partitions of the selected +hard disk."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -355,7 +361,10 @@ ) ); - string helptext = _("Disk TODO"); + // helptext + string helptext = _("This view shows all devices used by the +selected hard disk. The table is non-empty only for BIOS RAIDs and Multipath +Disks."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -427,7 +436,9 @@ ) ); - string helptext = _("HD TODO"); + // helptext + string helptext = _("This view shows detailed information about the +selected partition."); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } 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.17.22/storage/src/include/ep-log.ycp new/yast2-storage-2.17.23/storage/src/include/ep-log.ycp --- old/yast2-storage-2.17.22/storage/src/include/ep-log.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/ep-log.ycp 2008-08-28 14:58:57.000000000 +0200 @@ -24,7 +24,10 @@ ) )); - Wizard::RestoreHelp("Log help TODO"); + // helptext, %1 is replaced by a filename + string helptext = sformat(_("This view shows the content of %1."), file); + + Wizard::RestoreHelp(helptext); LogViewCore::Start(`id(`log), $[ "file" : file ]); } 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.17.22/storage/src/include/ep-lvm-dialogs.ycp new/yast2-storage-2.17.23/storage/src/include/ep-lvm-dialogs.ycp --- old/yast2-storage-2.17.22/storage/src/include/ep-lvm-dialogs.ycp 2008-08-13 15:35:57.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/ep-lvm-dialogs.ycp 2008-08-28 16:01:10.000000000 +0200 @@ -389,7 +389,7 @@ } else if (size_k < min_size_k || size_k > max_size_k) { - Popup::Error(sformat(_("The size entered is invalid. Enter a size beteen %1 and %2."), + Popup::Error(sformat(_("The size entered is invalid. Enter a size between %1 and %2."), Storage::KByteToHumanString(min_size_k), Storage::KByteToHumanString(max_size_k))); widget = `again; 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.17.22/storage/src/include/ep-lvm.ycp new/yast2-storage-2.17.23/storage/src/include/ep-lvm.ycp --- old/yast2-storage-2.17.22/storage/src/include/ep-lvm.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/ep-lvm.ycp 2008-08-28 16:23:07.000000000 +0200 @@ -42,7 +42,9 @@ ) ); - string helptext = _("LVM TODO"); + // helptext + string helptext = _("This view shows all LVM volume groups and +their logical volumes."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -80,7 +82,9 @@ ) ); - string helptext = _("LVM TODO"); + // helptext + string helptext = _("This view shows detailed information about the +selected volume group."); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } @@ -135,7 +139,9 @@ ) ); - string helptext = _("LVM TODO"); + // helptext + string helptext = _("This view shows all logical volumes of the +selected volume group."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -191,7 +197,9 @@ ) ); - string helptext = _("LVM TODO"); + // helptext + string helptext = _("This view shows all physical volumes used by +the selected volume group."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -255,7 +263,9 @@ ) ); - string helptext = _("LVM TODO"); + // helptext + string helptext = _("This view shows detailed information about the +selected logical volume."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } 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.17.22/storage/src/include/ep-raid.ycp new/yast2-storage-2.17.23/storage/src/include/ep-raid.ycp --- old/yast2-storage-2.17.22/storage/src/include/ep-raid.ycp 2008-08-08 22:31:53.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/ep-raid.ycp 2008-08-28 16:26:10.000000000 +0200 @@ -42,7 +42,8 @@ ) ); - string helptext = _("RAID TODO"); + // helptext + string helptext = _("This view shows all RAIDs except of BIOS RAIDs."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } @@ -84,7 +85,9 @@ ) ); - string helptext = _("RAID TODO"); + // helptext + string helptext = _("This view shows detailed information about the +selected RAID."); Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields)); } @@ -135,7 +138,9 @@ ) ); - string helptext = _("RAID TODO"); + // helptext + string helptext = _("This view shows all devices used by the +selected RAID."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } 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.17.22/storage/src/include/ep-unused.ycp new/yast2-storage-2.17.23/storage/src/include/ep-unused.ycp --- old/yast2-storage-2.17.22/storage/src/include/ep-unused.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/ep-unused.ycp 2008-08-28 15:16:04.000000000 +0200 @@ -53,7 +53,10 @@ )) ); - string helptext = _("Unused TODO"); + // helptext + string helptext = _("This view shows devices that have no mount +point assigned to them, disks that are unpartitioned and logical volumes that +have no logical volumes."); Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields)); } 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.17.22/storage/src/include/target_modify.ycp new/yast2-storage-2.17.23/storage/src/include/target_modify.ycp --- old/yast2-storage-2.17.22/storage/src/include/target_modify.ycp 2008-08-05 17:57:09.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/include/target_modify.ycp 2008-08-29 14:34:02.000000000 +0200 @@ -9,7 +9,7 @@ * * * - * $Id: target_modify.ycp 24036 2005-07-14 12:16:17Z arvin $ + * $Id: target_modify.ycp 50480 2008-08-29 12:34:01Z aschnell $ */ { @@ -21,6 +21,7 @@ import "Partitions"; import "Storage"; +/* define void RemoveUsedNonEvmsDm( map<string,map> target ) ``{ boolean ret = true; @@ -54,7 +55,9 @@ y2milestone( "RemoveUsedNonEvmsDm %1", SCR::Execute( .target.bash_output, "/sbin/dmsetup ls" )); } +*/ +/* define map<integer,map> HandleDeletedVgs( map<string,map> tg, map<integer,map> modify_targets ) ``{ @@ -77,5 +80,6 @@ y2milestone( "HandleDeletedVgs ret %1", modify_targets ); return( modify_targets ); } +*/ } 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.17.22/storage/src/inst_disk_proposal.ycp new/yast2-storage-2.17.23/storage/src/inst_disk_proposal.ycp --- old/yast2-storage-2.17.22/storage/src/inst_disk_proposal.ycp 2008-08-27 16:55:41.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/inst_disk_proposal.ycp 2008-08-28 16:04:59.000000000 +0200 @@ -241,7 +241,7 @@ To make only small adjustments to the proposed setup (like e.g. changing filesystem types), choose %1 and do these modification in the expert -partioner dialog. +partitioner dialog. "), deletechars(modify_str,"&")); // help text continued 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.17.22/storage/src/modules/Storage.ycp new/yast2-storage-2.17.23/storage/src/modules/Storage.ycp --- old/yast2-storage-2.17.22/storage/src/modules/Storage.ycp 2008-08-27 16:59:47.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/modules/Storage.ycp 2008-08-29 16:51:19.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 50418 2008-08-27 14:59:47Z aschnell $ + * $Id: Storage.ycp 50490 2008-08-29 14:51:19Z aschnell $ */ { @@ -220,6 +220,7 @@ * @param string dev * @return string EvmsDevDisk */ +/* global string EvmsDevDisk( string dev ) { string ret = "/dev/" + substring( dev, 10 ); @@ -233,16 +234,13 @@ ret = String::Replace( ret, "|", "/" ); return( ret ); } - +*/ /* Storage = TargetMap /* Storage = $[ "targets" : $[], - "lvm_view_all_mnt" : true, "whole_disk" : false, "must_reread_partitions" : false, "win_device" : false, - "raidtab_created" : false, - "use_lvm" : false, "testsuite" : false, "do_resize" : "", "part_proposal_mode" : "", @@ -253,18 +251,12 @@ map StorageMap = $[]; - map<integer,map> StorageMaps = $[]; /* stringkeys for access to the Storage map */ - string lvm_view_all_mnt_key = "lvm_view_all_mnt"; string targets_key = "targets"; - string targets_backup_key = "targets_backup"; - string targets_backup_l_key = "targets_l_backup"; - string targets_backup_m_key = "targets_m_backup"; string part_mode_key = "part_mode"; string part_disk_key = "part_disk"; string whole_disk_key = "whole_disk"; - string raidtab_created_key = "raidtab_created"; string testsuite_key = "testsuite"; string do_resize_key = "do_resize"; string win_device_key = "win_device"; @@ -272,13 +264,7 @@ string part_proposal_mode_key = "part_proposal_mode"; string part_proposal_first_key = "part_proposal_first"; string part_proposal_active_key = "part_proposal_active"; - string use_lvm_key = "use_lvm"; - string storage_map_key = "storage_map"; - string storage_type_key = "storage_type"; - string storage_doc_key = "storage_doc"; - symbol record_key = `record; - symbol custom_key = `custom; boolean probe_done = false; symbol exit_key = `next; any sint = nil; @@ -408,9 +394,7 @@ global define map<string,map> GetTargetMap(); -/** -* -*/ + define list<map> GetDiskPartitionTg( string device, map<string,map> tg ) ``{ @@ -2131,22 +2115,6 @@ StorageMap = add( StorageMap, testsuite_key, value ); } - global define boolean GetLvmViewAllMnt()``{ - return StorageMap[lvm_view_all_mnt_key]:true; - } - - global define void SetLvmViewAllMnt( boolean value ) ``{ - StorageMap = add( StorageMap, lvm_view_all_mnt_key, value ); - } - - global define boolean GetRaidtabCreated()``{ - return StorageMap[raidtab_created_key]:false; - } - - global define void SetRaidtabCreated( boolean value ) ``{ - StorageMap = add( StorageMap, raidtab_created_key, value ); - } - global define string GetDoResize()``{ return StorageMap[do_resize_key]:"NO"; } @@ -2188,118 +2156,6 @@ } - - - /* StorageMaps = [ - 1: $[ storage_map_key : $[ Storage_01], - storage_type_key : `record, - ], - 2, $[ storage_map_key : $[ Storage_02], - storage_type_key : `custom, - storage_doc_key : "create partition /dev/hda2" - ], - 3: $[ storage_map_key : $[ Storage_03 ], - storage_type_key : `custom, - storage_doc_key : "delete partition /dev/hda1" - ], - 4: $[ storage_map_key : $[ Storage_04 ], - storage_type_key : `record - ] - ]; - */ - - - - /* Record - Rollback - Commit */ - /* update focus and Storage - StorageStack */ - - /* Find the next free position in the map StorageMaps - * @return integer - */ - define integer NextStorageMapsPos() ``{ - return (size( StorageMaps) + 1); - } - - - define integer FindLastRecordEntry() ``{ - map<integer,any> all_record_entries = (map<integer,any>)filter (integer key, map entry , StorageMaps, ``( entry[storage_type_key]:custom_key == record_key )); - list<integer> all_record_keys = (list<integer>) maplist(integer key, any entry , all_record_entries, ``( key )); - - if( size( all_record_entries ) > 0 ) - return sort(integer x, integer y, all_record_keys , ``(y < x))[0]:1; - else return 0; - } - - - define void Rollback2Pos(integer pos ) ``{ - StorageMap = StorageMaps[pos,storage_map_key]:$[]; - StorageMaps = filter(integer key, map entry, StorageMaps, ``( key < pos )); - } - - - define void AddEntry2StorageMaps(symbol type_key, string doc )``{ - map storage_maps_entry = $[]; - - storage_maps_entry = add(storage_maps_entry, storage_map_key , StorageMap ); - storage_maps_entry = add(storage_maps_entry, storage_type_key , type_key ); - - if( doc != "" ) - storage_maps_entry = add(storage_maps_entry, storage_type_key , doc ); - - StorageMaps = add( StorageMaps, NextStorageMapsPos(), storage_maps_entry ); - } - - - /** - * - * @return boolean - */ -/* - global define void Record()``{ - AddEntry2StorageMaps( record_key, ""); - } -*/ - - /** - * - * @return boolean - */ -/* - global define boolean Rollback()``{ - integer last_record_entry = FindLastRecordEntry(); - if( last_record_entry != 0 ) - { - Rollback2Pos( last_record_entry ); - return true; - } - else - { - return false; - } - } -*/ - - /** - * - * @return boolean - */ -/* -global define boolean Commit() - ``{ - integer last_record_entry = FindLastRecordEntry(); - if( last_record_entry != 0 ) - { - StorageMaps = filter( integer key, map entry, StorageMaps, - ``( key < last_record_entry )); - return true; - } - else - { - return false; - } - } -*/ - global define void InstallCallbacks() { StorageClients::InstallCallbacks(); @@ -2311,9 +2167,6 @@ ``{ map m = (map)SCR::Execute(.target.bash_output, "date +%s.%N" ); y2milestone( "constructor Storage() time:%1", m["stdout"]:"" ); - StorageMap[targets_backup_key] = $[]; - StorageMap[targets_backup_l_key] = $[]; - StorageMap[targets_backup_m_key] = $[]; if( Mode::normal() ) { Storage::SetPartMode( "CUSTOM" ); @@ -2377,117 +2230,6 @@ symbol extended_type_key= `extended; - - - -global define map<string,map> RemoveAllPartEntry( map<string,map> tg, string skey, string value ) - ``{ - map<string,map> new_tg = tg; - - foreach(string dev, map disk, tg, - ``{ - boolean changed = false; - list new_partitions = []; - foreach (map partition, disk["partitions"]:[], - ``{ - if( partition[skey]:"" == value ) - { - partition = filter(string key, any value_inner, (map<string,any>)partition, ``( key != skey)); - changed = true; - } - new_partitions = add( new_partitions , partition); - }); - - if( changed ) - { - disk["partitions"] = new_partitions; - new_tg[dev] = disk; - } - }); - return( new_tg ); - }; - -global define list<map> RenumberS390Partitions( string dname, - list<map> partitions ) - ``{ - integer cnt = 1; - partitions = sort( map a, map b, partitions, - ``(a["region",0]:0<b["region",0]:0)); - partitions = maplist( map p, partitions, - ``{ - if( p["nr"]:0 != cnt ) - { - if( !haskey( p, "ori_nr" ) ) - { - p["ori_nr"] = p["nr"]:0; - } - p["nr"] = cnt; - p["device"] = GetDeviceName( dname, cnt ); - } - cnt = cnt+1; - return( p ); - }); - y2milestone( "RenumberS390Partions %1", partitions ); - return( partitions ); - } - -global define map<string, map> -RenameTgDevices( map<string, map> tg, map<string, string> ren ) - ``{ - y2milestone( "RenameTgDevices ren:%1", ren ); - foreach( string dev, map co, tg, - ``{ - if( search( dev, "/dev/evms/" ) == 0 ) - { - y2milestone( "RenameTgDevices before added:%1 removed:%2", - co["added"]:[], co["removed"]:[] ); - if( size(co["added"]:[])>0 ) - { - co["added"] = - maplist( string d, co["added"]:[], - ``(haskey( ren, d )?(ren[d]:""):d)); - } - if( size(co["removed"]:[])>0 ) - { - co["removed"] = - maplist( string d, co["removed"]:[], - ``(haskey( ren, d )?(ren[d]:""):d)); - } - y2milestone( "RenameTgDevices after added:%1 removed:%2", - co["added"]:[], co["removed"]:[] ); - tg[dev] = co; - } - }); - return( tg ); - } - -global define map<integer, map> -RenameMtDevices( map<integer, map> mt, map<string, string> ren ) - ``{ - y2milestone( "RenameMtDevices ren:%1", ren ); - foreach( integer num, map entry, mt, - ``{ - if( entry["type"]:""=="create_vg" && size(entry["devices"]:[])>0 ) - { - y2milestone( "RenameMtDevices before entry:%1", entry ); - entry["devices"] = - maplist( string d, entry["devices"]:[], - ``(haskey( ren, d )?(ren[d]:""):d)); - y2milestone( "RenameMtDevices after entry:%1", entry ); - mt[num] = entry; - } - if( (entry["type"]:""=="create_pv" || entry["type"]:""=="remove_pv") && - haskey( ren, entry["device"]:"" )) - { - y2milestone( "RenameMtDevices before entry:%1", entry ); - entry["device"] = ren[entry["device"]:""]:""; - y2milestone( "RenameMtDevices after entry:%1", entry ); - mt[num] = entry; - } - }); - return( mt ); - } - global map NextPartition( string disk, symbol ptype ) { y2milestone( "NextPartition disk:%1 ptype:%2", disk, ptype ); @@ -4434,15 +4176,6 @@ }; - /* Functions for testing */ - - global define void DebugStorage()``{ - - y2milestone("StorageMaps: %1",StorageMaps); - y2milestone("Storage:%1",StorageMap); - } - - /** * Check if a disk is a real disk and not RAID or LVM * @@ -4726,76 +4459,49 @@ return( ret ); } -global define list<string> AddPackageList() - ``{ + +global list<string> AddPackageList() +{ list<string> pl = hw_packages; - boolean mount_lvm = false; - boolean need_evms = false; + map<string,map> tg = GetTargetMap(); - map<string,map> tt = filter( string k, map e, tg, - ``(e["type"]:`CT_UNKNOWN==`CT_LVM )); - boolean have_lvm = size(tt)>0; - if( have_lvm ) - { - list<map> part = []; - foreach( string k, map e, tt, - ``{ - part = (list<map>)merge( part, e["partitions"]:[]); - }); - mount_lvm = size(filter( map p, part, ``(size(p["mount"]:"")>0)))>0; - } - tt = filter( string k, map e, tg, ``(k=="/dev/evms"||search(k, "/dev/evms/")==0)); - if( size(filter( string k, map e, tg, ``(e["is_container"]:false && - search(e["name"]:"","lvm/")!=0 && - search(e["name"]:"","lvm2/")!=0)))>0) - { - y2milestone( "non lvm evms container" ); - need_evms = true; - } - if( !need_evms ) - { - list<map> part = []; - foreach( string k, map e, tt, - ``{ - part = (list<map>)merge( part, e["partitions"]:[]); - }); - need_evms = size(filter( map p, part, ``(size(p["mount"]:"")>0)))>0; - } - y2milestone( "AddPackageList have_lvm %1 mount_lvm %2 need_evms %3", - have_lvm, mount_lvm, need_evms ); - if( have_lvm && (mount_lvm||!need_evms)) - { - pl = add( pl, "lvm2" ); - } - if( need_evms ) - { - pl = add( pl, "evms" ); - pl = add( pl, "yast2-storage-evms" ); - } + + boolean need_lvm = false; boolean need_quota = false; boolean need_crypt = false; - foreach( string k, map e, tg, - ``{ + + foreach( string k, map e, tg, { + if (e["type"]:`CT_UNKNOWN == `CT_LVM) + need_lvm = true; if( size(filter( map p, e["partitions"]:[], ``(FileSystems::HasQuota(p))))>0 ) need_quota = true; if( size(filter( map p, e["partitions"]:[], ``(p["enc_type"]:`none != `none)))>0 ) need_crypt = true; - }); + }); + + y2milestone("AddPackageList need lvm:%1 quota:%2 crypt:%3", need_lvm, need_quota, need_crypt); + + if (need_lvm) + { + pl = add(pl, "lvm2"); + } if( need_quota ) - { + { pl = add( pl, "quota" ); - } + } if( need_crypt ) - { + { pl = add( pl, "cryptsetup" ); pl = add( pl, "pam_mount" ); - } - y2milestone( "AddPackageList ret %1", pl ); - return( pl ); } + y2milestone("AddPackageList ret %1", pl); + return pl; +} + + global define list GetForeignPrimary() ``{ list ret = []; @@ -4893,66 +4599,6 @@ return( pt ); } -//----------------------------------------------------- -// -// change an entry in /etc/fstab -// -global define void ChangeLineFstab( map entry ) - ``{ - string tabpath = PathToDestdir( "/etc/fstab" ); - if( Installation::scr_destdir != "/" ) - { - if( SCR::Read( .target.size, tabpath )>= 0 ) - SCR::Execute( .target.remove, tabpath ); - } - map fstab = Partitions::GetFstab( tabpath ); - list lines = Storage::FindFstabLines( fstab, entry["mount"]:"", - entry["spec"]:"", "x", "x" ); - list fstlist = [ entry["spec"]:"", entry["mount"]:"", - entry["vfstype"]:"", entry["mntops"]:"", - sformat("%1",entry["freq"]:0), - sformat("%1",entry["passno"]:0) ]; - y2milestone( "lines %1", lines ); - if( size(lines)==0 ) - { - AsciiFile::AppendLine( fstab, fstlist ); - } - else - { - integer field = 0; - while( field<4 ) - { - AsciiFile::ChangeLineField( fstab, lines[0]:-1, field, - fstlist[field]:"" ); - field = field+1; - } - } - string dir = entry["mount"]:""; - if( substring( dir, 0, 1 )== "/" ) - { - dir = PathToDestdir( dir ); - if( SCR::Read( .target.size, dir )<=0 ) - { - SCR::Execute( .target.mkdir, dir ); - } - } - AsciiFile::RewriteFile( fstab, tabpath ); - }; - -global define map MakeCdromFstabEntry( map cd ) - ``{ - map entry = FileSystems::GetFstabDefaultMap( "cdrom" ); - string cdmount = cd["linkname"]:""; - entry["spec"] = cdmount; - entry["mount"] = "/media/"+substring(cdmount,5); - string enc = FileSystems::LangTypicalEncoding(); - if( !contains( [ "iso8859-1", "iso8859-15", "" ], enc )) - { - entry["mntops"] = entry["mntops"]:"" + ",iocharset=" + enc; - } - y2milestone( "ret %1", entry ); - return( entry ); - }; define void HandleModulesOnBoot( map<string,map> targetMap ) ``{ @@ -5036,33 +4682,6 @@ y2milestone( "return" ); } -void UpdateBootFstabEvms() - { - string tabpath = PathToDestdir( "/etc/fstab" ); - y2milestone( "UpdateBootFstabEvms %1", - SCR::Execute( .target.bash_output, "grep /boot " + tabpath )); - map fstab = Partitions::GetFstab( tabpath ); - list lines = AsciiFile::FindLineField( fstab, 1, Partitions::BootMount() ); - y2milestone( "UpdateBootFstabEvms lines %1", lines ); - map l = AsciiFile::GetLine( fstab, lines[0]:-1 ); - if( search( l["fields",0]:"", "/dev/evms" )!=0 ) - { - map<string,map> tg = filter( string k, map e, GetTargetMap(), - ``(IsRealDisk( e )) ); - map p = GetPartition( tg, l["fields",0]:"" ); - y2milestone( "UpdateBootFstabEvms p %1", p ); - if( size(p)>0 ) - { - AsciiFile::ChangeLineField( fstab, lines[0]:-1, 0, - "/dev/evms/"+substring(p["device"]:"",5)); - AsciiFile::RewriteFile( fstab, tabpath ); - } - } - y2milestone( "UpdateBootFstabEvms %1", - SCR::Execute( .target.bash_output, "grep /boot " + tabpath )); - } - -global define boolean BootEvms(); /** * Writes fstab to the disk @@ -5091,8 +4710,6 @@ Storage::AddFstabEntry( m ); num = num+1; }); - if( BootEvms() ) - UpdateBootFstabEvms(); HandleModulesOnBoot( GetTargetMap() ); } @@ -5164,56 +4781,6 @@ return( tg ); } -global define list<list<string> > AutodetectMultipathRaid( map<string,map> tg ) - ``{ - list<list<string> > ret = []; - map<string, list> disks = (map<string, list>) $[]; - foreach(string dev, map disk, tg, - ``{ - string id = disk["unique"]:""; - integer pos = search( id, "." ); - if( pos != nil ) - { - id = substring( id, pos+1 ); - if( haskey( disks, id ) ) - { - disks[id] = add( disks[id]:[], dev ); - } - else - { - disks[id] = [ dev ]; - } - } - }); - disks = (map<string, list>) filter(string key, list entry, disks, ``(size(entry)>=2) ); - y2milestone( "disks %1", disks ); - foreach( string key, list entry, disks, - ``{ - foreach(map p, tg[entry[0]:"","partitions"]:[], - ``{ - boolean ok = true; - list<string> dl = []; - foreach(string disk, (list<string>)entry, - ``{ - string dev = p["device"]:""; - map p1 = GetPartition( tg, dev ); - if( p1["type"]:`primary == `extended || - p1["used_by_type"]:`UB_NONE!=`UB_NONE || - size(p1["mount"]:"")>0 ) - { - ok = false; - } - dl = add( dl, dev ); - }); - if( ok ) - { - ret = add( ret, dl ); - } - }); - }); - y2milestone( "ret %1", ret ); - return( ret ); - } global define boolean PerformLosetup( map& loop, boolean format ) ``{ @@ -5842,6 +5409,7 @@ return( ret ); } +/* global define list GetUsedLvmGroups( map<string,map> tg ) ``{ list groups = []; @@ -5860,6 +5428,7 @@ y2milestone( "GetUsedLvmGroups ret %1", groups ); return( groups ); }; +*/ /** * Get used real disks @@ -5868,6 +5437,7 @@ * @param boolean ignore boot * @return list <string> disks List of disks */ +/* global define list<string> GetUsedRealDisksNew( map<string,map> tg, boolean ignore_boot ) ``{ @@ -5899,12 +5469,16 @@ ignore_boot, disks ); return( disks ); }; +*/ +/* global define list<string> GetUsedRealDisks( map<string,map> tg ) { return( GetUsedRealDisksNew( tg, false )); }; +*/ +/* global define list<string> GetEvmsRealDisk( map<string,map> tg, map p ) ``{ list<string> rdisk = []; @@ -5962,7 +5536,9 @@ y2milestone( "GetEvmsRealDisk %1 is %2", p["device"]:"", rdisk ); return( rdisk ); } +*/ +/* global define list<string> GetUsedEvmsDisks( map<string,map> tg ) ``{ list<string> disks = []; @@ -6007,8 +5583,9 @@ y2milestone( "GetUsedEvmsDisks ret %1", disks ); return( disks ); }; +*/ - +/* global list<map> GetPrepBoot( map<string,map> tg ) { list<map> ret = []; @@ -6024,6 +5601,7 @@ y2milestone( "GetPrepBoot ret:%1", ret ); return( ret ); } +*/ void CallInsserv( boolean on, string name ) { @@ -6041,13 +5619,16 @@ } } -global define void FinishInstall() - ``{ - y2milestone( "FinishInstall initial:%1", Stage::initial() ); +global void FinishInstall() +{ + y2milestone("FinishInstall initial:%1", Stage::initial()); + map<string,map> tg = GetTargetMap(); + if( Stage::initial() ) { HandleModulesOnBoot( tg ); +/* list evms = GetUsedEvmsDisks( tg ); y2milestone( "FinishInstall evms %1", evms ); if( size(evms)>0 ) @@ -6099,14 +5680,16 @@ i = i+1; } } +*/ } + boolean need_crypt = false; boolean need_md = false; boolean need_lvm = false; boolean need_dmraid = false; boolean need_dmmultipath = false; - foreach( string k, map e, tg, - ``{ + + foreach( string k, map e, tg, { if( size(filter( map p, e["partitions"]:[], ``(p["enc_type"]:`none != `none)))>0 ) need_crypt = true; @@ -6118,19 +5701,20 @@ need_dmraid = true; if( e["type"]:`CT_UNKNOWN==`CT_DMMULTIPATH ) need_dmmultipath = true; - }); + }); + y2milestone( "FinishInstall need crypto:%1 md:%2 lvm:%3 dmraid:%4 dmmultipath:%5", need_crypt, need_md, need_lvm, need_dmraid, need_dmmultipath ); - string cmd = ""; - map bo = $[]; + if( need_crypt ) CallInsserv( true, "crypto" ); CallInsserv( need_md, "md" ); CallInsserv( need_lvm, "lvm" ); CallInsserv( need_dmraid, "dmraid" ); // activation of multipath is task of yast2-multipath - y2milestone( "FinishInstall done" ); - } + + y2milestone("FinishInstall done"); +} global define map GetEntryForMountpoint( string mp ) ``{ @@ -6671,10 +6255,7 @@ global boolean BootEvms() { - map cfg = GetControlCfg(); - boolean ret = cfg["evms_boot"]:false; - y2milestone( "BootEvms ret %1", ret ); - return( ret ); + return false; } global string ProposalVM() @@ -6805,50 +6386,26 @@ return( ret ); } -global string GetUsedFs() + +global list<string> GetUsedFs() { if (!InitLibstorage(false)) return nil; - string r = LibStorage::StorageInterface::getAllUsedFs( sint ); - list<string> lr = sort(splitstring(r," \t")); - r = mergestring( lr, " " ); - y2milestone( "GetUsedFs ret:%1", r ); - return( r ); + list<string> r = LibStorage::StorageInterface::getAllUsedFs(sint); + 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" ); - } - } +{ + y2milestone("SaveUsedFs"); + SCR::Write(.sysconfig.storage.USED_FS_LIST, mergestring(GetUsedFs(), " ")); +} + -global boolean Storage::IsPersistent( map p ) +global boolean IsPersistent( map p ) { boolean ret = contains( [ `lvm, `sw_raid, `dm ], p["type"]:`unknown ); if( !ret && contains( [ `evms, `primary, `logical, `extended ], 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.17.22/storage/src/storage_finish.ycp new/yast2-storage-2.17.23/storage/src/storage_finish.ycp --- old/yast2-storage-2.17.22/storage/src/storage_finish.ycp 2008-08-05 17:57:10.000000000 +0200 +++ new/yast2-storage-2.17.23/storage/src/storage_finish.ycp 2008-08-29 10:35:17.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: storage_finish.ycp 49562 2008-08-01 08:57:04Z aschnell $ + * $Id: storage_finish.ycp 50466 2008-08-28 19:53:30Z aschnell $ * */ @@ -59,13 +59,6 @@ if( !Mode::update () ) { SCR::Execute (.target.mkdir, Installation::sourcedir); - - // copy /etc/raidtab to target if it was created - - if (Storage::GetRaidtabCreated()) - { - InjectFile ("/etc/raidtab"); - } Storage::FinishInstall (); } 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.17.22/VERSION new/yast2-storage-2.17.23/VERSION --- old/yast2-storage-2.17.22/VERSION 2008-08-26 13:43:30.000000000 +0200 +++ new/yast2-storage-2.17.23/VERSION 2008-08-29 16:52:30.000000000 +0200 @@ -1 +1 @@ -2.17.22 +2.17.23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-printer
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package yast2-printer checked in at Sat Aug 30 02:15:59 CEST 2008. -------- --- yast2-printer/yast2-printer.changes 2008-08-27 16:29:59.000000000 +0200 +++ yast2-printer/yast2-printer.changes 2008-08-29 14:50:16.488015000 +0200 @@ -1,0 +2,14 @@ +Fri Aug 29 14:45:28 CEST 2008 - jsmeix(a)suse.de + +- Some code cleanup. +- 2.17.7 + +------------------------------------------------------------------- +Thu Aug 28 18:19:32 CEST 2008 - jsmeix(a)suse.de + +- Fixed build (new scripts were not packaged). +- The 'Printing via Network' dialog UI should now work correctly + but writing the values to the system is not yet implemented. +- 2.17.6 + +------------------------------------------------------------------- Old: ---- yast2-printer-2.17.5.tar.bz2 New: ---- yast2-printer-2.17.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.Is4273/_old 2008-08-30 02:12:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Is4273/_new 2008-08-30 02:12:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.17.5) +# spec file for package yast2-printer (Version 2.17.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,12 +20,12 @@ Url: http://en.opensuse.org/YaST/Modules/Printer Name: yast2-printer -Version: 2.17.5 +Version: 2.17.7 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.17.5.tar.bz2 +Source0: yast2-printer-2.17.7.tar.bz2 Prefix: /usr BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Recommends: netcat @@ -64,7 +64,7 @@ Michal Zugec <mzugec(a)suse.cz> %prep -%setup -n yast2-printer-2.17.5 +%setup -n yast2-printer-2.17.7 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,8 @@ %{prefix}/lib/YaST2/bin/autodetect_printers %{prefix}/lib/YaST2/bin/create_printer_ppd_database %{prefix}/lib/YaST2/bin/determine_printer_driver_options +%{prefix}/lib/YaST2/bin/cups_client_only +%{prefix}/lib/YaST2/bin/modify_cupsd_conf #Documentation %dir %{prefix}/share/doc/packages/yast2-printer %{prefix}/share/doc/packages/yast2-printer/COPYING @@ -117,6 +119,14 @@ %exclude %{prefix}/share/doc/packages/yast2-printer/COPYING %exclude %{prefix}/share/doc/packages/yast2-printer/README %changelog +* Fri Aug 29 2008 jsmeix(a)suse.de +- Some code cleanup. +- 2.17.7 +* Thu Aug 28 2008 jsmeix(a)suse.de +- Fixed build (new scripts were not packaged). +- The 'Printing via Network' dialog UI should now work correctly + but writing the values to the system is not yet implemented. +- 2.17.6 * Wed Aug 27 2008 jsmeix(a)suse.de - Enhanced scripts in the tools directory to make them safe for a client-only setup and two new scripts ++++++ yast2-printer-2.17.5.tar.bz2 -> yast2-printer-2.17.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/configure new/yast2-printer-2.17.7/configure --- old/yast2-printer-2.17.5/configure 2008-08-27 16:24:21.000000000 +0200 +++ new/yast2-printer-2.17.7/configure 2008-08-29 14:46:13.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-printer 2.17.5. +# Generated by GNU Autoconf 2.61 for yast2-printer 2.17.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-printer' PACKAGE_TARNAME='yast2-printer' -PACKAGE_VERSION='2.17.5' -PACKAGE_STRING='yast2-printer 2.17.5' +PACKAGE_VERSION='2.17.7' +PACKAGE_STRING='yast2-printer 2.17.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-printer 2.17.5 to adapt to many kinds of systems. +\`configure' configures yast2-printer 2.17.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-printer 2.17.5:";; + short | recursive ) echo "Configuration of yast2-printer 2.17.7:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-printer configure 2.17.5 +yast2-printer configure 2.17.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-printer $as_me 2.17.5, which was +It was created by yast2-printer $as_me 2.17.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-printer' - VERSION='2.17.5' + VERSION='2.17.7' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.5" +VERSION="2.17.7" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-printer $as_me 2.17.5, which was +This file was extended by yast2-printer $as_me 2.17.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-printer config.status 2.17.5 +yast2-printer config.status 2.17.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/configure.in new/yast2-printer-2.17.7/configure.in --- old/yast2-printer-2.17.5/configure.in 2008-08-27 16:24:17.000000000 +0200 +++ new/yast2-printer-2.17.7/configure.in 2008-08-29 14:46:09.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-printer, 2.17.5, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.17.7, http://bugs.opensuse.org/, yast2-printer) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.5" +VERSION="2.17.7" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)novell.com>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/src/basicmodify.ycp new/yast2-printer-2.17.7/src/basicmodify.ycp --- old/yast2-printer-2.17.5/src/basicmodify.ycp 2008-08-26 13:09:40.000000000 +0200 +++ new/yast2-printer-2.17.7/src/basicmodify.ycp 2008-08-29 12:29:31.000000000 +0200 @@ -446,10 +446,13 @@ Wizard::EnableNextButton(); } else - { Popup::TimedMessage( // Message of a Popup where %1 will be replaced by the queue name: - sformat( _("Nothing changed for queue %1."), name ), - 2 + { Popup::ShowFeedback( // No title for such a simple feedback message: + "", + // Message of a Popup::ShowFeedback when nothing was changed: + _("Nothing changed.") ); + sleep( 1000 ); + Popup::ClearFeedback(); } // Exit this dialog in any case: break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/src/dialogs.ycp new/yast2-printer-2.17.7/src/dialogs.ycp --- old/yast2-printer-2.17.5/src/dialogs.ycp 2008-08-26 15:00:25.000000000 +0200 +++ new/yast2-printer-2.17.7/src/dialogs.ycp 2008-08-28 12:52:25.000000000 +0200 @@ -262,8 +262,10 @@ "NETWORKPRINTING" : $[ "widget" : `custom, "custom_widget" : widgetNetworkPrinting, + "init" : initNetworkPrinting, "handle" : handleNetworkPrinting, - "help" : HELPS["printing_via_network_dialog"]:"" + "store" : storeNetworkPrinting, + "help" : HELPS["printing_via_network_dialog"]:"" ], "SHARING" : $[ "widget" : `custom, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/src/overview.ycp new/yast2-printer-2.17.7/src/overview.ycp --- old/yast2-printer-2.17.5/src/overview.ycp 2008-08-26 13:09:40.000000000 +0200 +++ new/yast2-printer-2.17.7/src/overview.ycp 2008-08-29 11:16:45.000000000 +0200 @@ -87,14 +87,11 @@ // By default there is no /etc/cups/client.conf file at all // and usually there is no ServerName entry in a /etc/cups/client.conf file. // Therefore client_only is only true if there is a /etc/cups/client.conf file - // with an active ServerName entry: + // with an active ServerName entry which is not "localhost" or "127.0.0.1". if( Printerlib::client_only ) - { // YCP string quoting: A double backslash '\\' results a single backslash '\' in the string. - // At least the trailing newline character must be removed. - - if( Printerlib::client_conf_server_name == "localhost" ) - { - local_content_selected = true; + { if( Printerlib::client_conf_server_name == "localhost" + || Printerlib::client_conf_server_name == "127.0.0.1" ) + { local_content_selected = true; remote_content_selected = true; } else @@ -104,11 +101,9 @@ } } if( local_cupsd_required && ! local_cupsd_accessible ) - { - Popup::ErrorDetails( _("Start local running CUPS daemon"), - _("A local running CUPS daemon is needed for your setup.") - ); - + { Popup::ErrorDetails( _("Start local running CUPS daemon"), + _("A local running CUPS daemon is needed for your setup.") + ); if( ! Service::Start("cups") ) { Report::Error( // Message of a Report::Error. // Only a simple message because this error does not happen on a normal system @@ -180,21 +175,20 @@ _("Do not delete it"), `focus_no )) - { - // To be safe invalidate Printer::selected_queues_index in any case: - Printer::selected_queues_index = -1; - y2milestone( "To be deleted:'%1', selected_queue_index = %2", queue_name, selected_queue_index ); - if( ! Printer::DeleteQueue( queue_name ) ) - { Popup::Error( // Message of a Popup::Error - // where %1 will be replaced by the queue name. - // Only a simple message because before the function Printer::DeleteQueue - // was called and this function would have shown more specific messages. - sformat( _("Failed to delete queue %1."), queue_name ) - ); - } - // Re-run the OverviewDialog (with a re-created list of queues) via the sequencer: - return `delete; - } + { // To be safe invalidate Printer::selected_queues_index in any case: + Printer::selected_queues_index = -1; + y2milestone( "To be deleted:'%1', selected_queue_index = %2", queue_name, selected_queue_index ); + if( ! Printer::DeleteQueue( queue_name ) ) + { Popup::Error( // Message of a Popup::Error + // where %1 will be replaced by the queue name. + // Only a simple message because before the function Printer::DeleteQueue + // was called and this function would have shown more specific messages. + sformat( _("Failed to delete queue %1."), queue_name ) + ); + } + // Re-run the OverviewDialog (with a re-created list of queues) via the sequencer: + return `delete; + } } if (event["EventReason"]:"" == "Activated" && event["ID"]:nil == `test){ @@ -226,11 +220,12 @@ return nil; } if( "local" == Printer::queues[selected_queue_index,"config"]:"remote" ) - Printer::selected_queues_index = selected_queue_index; + { Printer::selected_queues_index = selected_queue_index; + } if( ! Printerlib::ExecuteBashCommand( "/usr/bin/lp -d '" - + queue_name - + "' -o page-label=\"Testprint:$(hostname)\" /usr/share/cups/data/testprint.ps" - ) + + queue_name + + "' -o page-label=\"Testprint:$(hostname)\" /usr/share/cups/data/testprint.ps" + ) ) { Popup::Error( // Message of a Popup::Error // where %1 will be replaced by the queue name. @@ -251,18 +246,20 @@ if (event["EventReason"]:"" == "Activated" && event["ID"]:nil == `add){ // client only - if( Printerlib::client_only && Printerlib::client_conf_server_name != "localhost" ) + if( Printerlib::client_only + && Printerlib::client_conf_server_name != "localhost" + && Printerlib::client_conf_server_name != "127.0.0.1" ) { if( ! Popup::YesNoHeadline( "Disable remote CUPS server setting", "A remote CUPS server setting conflicts with adding a print queue." ) ) return nil; - // Disable the 'ServerName' entry in /etc/cups/client.conf: - if( ! Printerlib::ExecuteBashCommand( "sed -i.yast2.save -e 's/^[Se][Ee][Rr][Vv][Ee][Rr][Nn][Aa][Mm][Ee]/#ServerName/' /etc/cups/client.conf" ) ) + // Remove the 'ServerName' entry in /etc/cups/client.conf: + if( ! Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "cups_client_only none" ) ) { Report::Error( // Message of a Report::Error. // Only a simple message because this error does not happen on a normal system // (i.e. a system which is not totally broken or totally messed up). - _("Failed to disable the 'ServerName' entry in /etc/cups/client.conf") + _("Failed to remove the 'ServerName' entry in /etc/cups/client.conf") ); return nil; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/src/Printerlib.ycp new/yast2-printer-2.17.7/src/Printerlib.ycp --- old/yast2-printer-2.17.5/src/Printerlib.ycp 2008-08-26 14:53:09.000000000 +0200 +++ new/yast2-printer-2.17.7/src/Printerlib.ycp 2008-08-29 12:54:14.000000000 +0200 @@ -1,20 +1,14 @@ + { + module "Printerlib"; textdomain "printer"; -global boolean client_only = false; -global string client_conf_server_name = ""; - -// By default there is "Browsing On" in /etc/cups/cupsd.conf -// which is even the fallback if there is no "Browsing" entry at all -// or when the "Browsing" entry is deactivated by a leading '#' character. -// Therefore browsing_on is only false if "Browsing Off" or "Browsing No" -// is explicitely set in /etc/cups/cupsd.conf. -global boolean browsing_on = true; - -// By default there is no "BrowseDeny" entry in /etc/cups/cupsd.conf -// but there can be such entries of the form "BrowseDeny .*" or "BrowseDeny from .*": -global string cupsd_conf_browse_deny = ""; +// Fortunately the tools are for all architectures always +// installed in /usr/lib/YaST2/bin/ (i.e. no "lib64"). +// I tested this on Thu Aug 28 2008 using the command +// rpm -qlp /work/CDs/all/full-sle10-sp2*/suse/*/yast2-printer.rpm | grep '/YaST2/bin/' | grep -v '/usr/lib/YaST2/bin/' +global string yast_bin_dir = "/usr/lib/YaST2/bin/"; // The result map is used as a simple common local store for whatever additional results // (in particular commandline exit code, stdout, stderr, and whatever messages) @@ -47,26 +41,107 @@ return true; } +// By default there is no active "ServerName" entry in /etc/cups/client.conf: +global string client_conf_server_name = ""; +global boolean client_only = false; + +global boolean DetermineClientOnly() +{ // Determine the 'ServerName' value in /etc/cups/client.conf: + if( ExecuteBashCommand( yast_bin_dir + "cups_client_only" ) ) + { client_conf_server_name = result["stdout"]:""; + if( "" != client_conf_server_name + && "localhost" != client_conf_server_name + && "127.0.0.1" != client_conf_server_name ) + { // Note that even 'localhost' or '127.0.0.1' is a valid ServerName value + // which is used to force client tools (e.g. lpadmin, lpinfo, lpstat) + // to ask the local cupsd via the IPP port on localhost (127.0.0.1:631) + // and not via the domain socket (/var/run/cups/cups.sock) because + // the latter failed in the past for certain third-party clients (e.g. Java). + // If the ServerName value in /etc/cups/client.conf is 'localhost' + // it is actually no client-only config because the local cupsd is used. + client_only = true; + } + else + { client_only = false; + } + } + else + { client_conf_server_name = ""; + client_only = false; + } + // Ignore when it fails: + return true; +} + +// By default there is "Browsing On" in /etc/cups/cupsd.conf +// which is even the fallback if there is no "Browsing" entry at all +// or when the "Browsing" entry is deactivated by a leading '#' character. +// Therefore browsing_on is only false if "Browsing Off" or "Browsing No" +// is explicitely set in /etc/cups/cupsd.conf. +global boolean browsing_on = true; + +global boolean DetermineBrowsing() +{ // Determine the 'Browsing [ On | Off ]' value in /etc/cups/cupsd.conf: + if( ExecuteBashCommand( yast_bin_dir + "modify_cupsd_conf Browsing" ) ) + { string browsing = tolower( result["stdout"]:"On" ); + if( "off" == browsing || "no" == browsing ) + { browsing_on = false; + } + else + { browsing_on = true; + } + } + // Ignore when it fails: + return true; +} + +// By default there is "BrowseAllow all" in /etc/cups/cupsd.conf +// which is even the fallback if there is no "BrowseAllow" entry at all +// or when the "BrowseAllow" entries are deactivated by a leading '#' character. +// Multiple BrowseAllow lines are allowed, e.g.: +// BrowseAllow from @LOCAL +// BrowseAllow from 192.168.200.1 +// BrowseAllow from 192.168.100.0/255.255.255.0 +// so that each BrowseAllow line value is stored as one string +// in the cupsd_conf_browse_allow list of strings: +global list< string > cupsd_conf_browse_allow = [ "all" ]; + +global boolean DetermineBrowseAllow() +{ // Determine the 'BrowseAllow [ all | none | @LOCAL | IP-address[/netmask] ]' values in /etc/cups/cupsd.conf: + if( ExecuteBashCommand( yast_bin_dir + "modify_cupsd_conf BrowseAllow" ) ) + { // The command outputs a line where multiple BrowseAllow values are separated by space + // but possible duplicate BrowseAllow values are not removed in the command output: + cupsd_conf_browse_allow = toset( splitstring( Printerlib::result["stdout"]:"all", " " ) ); + } + else + { cupsd_conf_browse_allow = [ "all" ]; + } + // Ignore when it fails: + return true; +} + global map<string, any> operation_policy = $[]; global map<string, any> cups_autoconfig = $[]; -global void Read(){ - client_only = ExecuteBashCommand( "egrep -i '^ServerName[[:space:]]+[[:alnum:]]' /etc/cups/client.conf" ); - if( ExecuteBashCommand( "sed -n -e 's/^[Se][Ee][Rr][Vv][Ee][Rr][Nn][Aa][Mm][Ee][[:space:]][[:space:]]*\$.*\$$/\\1/p' /etc/cups/client.conf | tr -d '[:space:]'" ) ) - client_conf_server_name = result["stdout"]:""; - - if( Printerlib::ExecuteBashCommand( "egrep -i '^Browsing[[:space:]]+Off|^Browsing[[:space:]]+No' /etc/cups/cupsd.conf" ) ) - browsing_on = false; - string commandline = "egrep -i '^BrowseDeny[[:space:]]+|^BrowseDeny[[:space:]]+from[[:space:]]+' /etc/cups/cupsd.conf | sed -e 's/[Ff][Rr][Oo][Mm]//' | tr -s '[:space:]' | cut -d ' ' -f 2 | tr '[:space:]' ' '"; - if( Printerlib::ExecuteBashCommand( commandline ) ) cupsd_conf_browse_deny = Printerlib::result["stdout"]:""; - // read cups-autoconfiguration settings - cups_autoconfig = (map<string, any>)SCR::Read(.etc.cups-auto.all); -y2internal("read cups-auto %1", cups_autoconfig); -} - -global void Write(){ - y2milestone("Writing cups-autoconfig.conf\n%1", cups_autoconfig); - SCR::Write(.etc.cups-auto.all, cups_autoconfig); +global void Read() +{ // Determine the 'Browsing [ On | Off ]' value in /etc/cups/cupsd.conf and ignore when it fails: + DetermineBrowsing(); + // Determine the 'BrowseAllow [ all | none | @LOCAL | IP-address[/netmask] ]' + // values in /etc/cups/cupsd.conf and ignore when it fails: + DetermineBrowseAllow(); + // Determine the 'ServerName' value in /etc/cups/client.conf and ignore when it fails: + DetermineClientOnly(); + // Read cups-autoconfiguration settings: + cups_autoconfig = (map<string, any>)SCR::Read(.etc.cups-auto.all); + y2internal("read cups-auto %1", cups_autoconfig); } + +global void Write() +{ // Write cups-autoconfiguration settings: + y2milestone("Writing cups-autoconfig.conf\n%1", cups_autoconfig); + SCR::Write(.etc.cups-auto.all, cups_autoconfig); } + +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/src/printingvianetwork.ycp new/yast2-printer-2.17.7/src/printingvianetwork.ycp --- old/yast2-printer-2.17.5/src/printingvianetwork.ycp 2008-08-26 13:56:48.000000000 +0200 +++ new/yast2-printer-2.17.7/src/printingvianetwork.ycp 2008-08-29 13:07:20.000000000 +0200 @@ -41,111 +41,260 @@ include "printer/helps.ycp"; -term widgetNetworkPrinting = - `VBox( `VStretch(), - `Frame( _("Use CUPS to Print Via Network"), - `RadioButtonGroup( `id(`browsing_or_client_only_check_boxs), - `VBox( `Left( `RadioButton( `id(`cupsd_conf_browsing_off_radio_button), - `opt(`notify), - _("&Do not Receive Printer Information from Remote CUPS servers"), - ! Printerlib::client_only && ! Printerlib::browsing_on - ) - ), - `Left( `RadioButton( `id(`cupsd_conf_browsing_on_radio_button), - `opt(`notify), - _("&Receive Printer Information from Remote CUPS servers"), - ! Printerlib::client_only && Printerlib::browsing_on - ) - ), - `HBox( `HSpacing( 3 ), - `TextEntry( `id(`cupsd_conf_browse_deny_input), - _("&Show Printers Published by CUPS Servers Except the Following (separated by spaces)"), - Printerlib::cupsd_conf_browse_deny - ) - ), - `VSpacing( 1 ), - `Left( `RadioButton( `id(`client_only_check_box), - `opt(`notify), - _("Do All Your Printing Directly via One Remote &CUPS Server"), - Printerlib::client_only - ) - ), - `HBox( `HSpacing( 3 ), - `HWeight( 2, - `TextEntry( `id(`client_conf_server_name_input), - _("&Hostname / IP Address"), - Printerlib::client_conf_server_name - ) - ), - `HWeight( 1, - `PushButton( `id(`test_client_conf_server), - _("&Test Server") - ) - ), - `HStretch() - ) - ) - ) - ), - `VStretch(), - `Frame( _("Use Another Print Server or Use a Network Printer Directly"), - `Left( `PushButton( `id(`connection_wizard), - _("&Connection Wizard") - ) - ) - ), - `VStretch() +boolean something_has_changed = false; +boolean cupsd_restart_required = false; +boolean cupsd_start_required = false; +boolean cupsd_stop_required = false; + +boolean ApplyNetworkPrintingSettings() +{ if( ! something_has_changed ) + { y2milestone( "Nothing changed in 'Printing via Network' dialog." ); + Popup::ShowFeedback( // No title for such a simple feedback message: + "", + // Message of a Popup::ShowFeedback when nothing was changed: + _("Nothing changed.") ); + sleep( 1000 ); + Popup::ClearFeedback(); + return true; + } + y2milestone( "Writing 'NetworkPrinting' settings to the system." ); + // Nothing implemented yet: + Popup::AnyMessage( // Header of a Popup::AnyMessage when "ApplyNetworkPrintingSettings" is called: + _("Not yet implemented"), + // Body of a Popup::AnyMessage when the "ApplyNetworkPrintingSettings" is called: + _("Writing the settings to the system is not yet implemented.") + ); + return false; +} +term widgetNetworkPrinting = `VBox + ( `VStretch(), + `Frame + ( _("Use CUPS to Print Via Network"), + `RadioButtonGroup + ( `id(`browsing_or_client_only_check_boxs), + `VBox + ( `Left + ( `RadioButton + ( `id(`cupsd_conf_browsing_off_radio_button), + `opt(`notify), + _("&Do not Receive Printer Information from Remote CUPS servers") + ) + ), + `Left + ( `RadioButton + ( `id(`cupsd_conf_browsing_on_radio_button), + `opt(`notify), + _("Receive Printer &Information from Remote CUPS servers") + ) + ), + `HBox + ( `HSpacing( 3 ), + `VBox + ( `Left + ( `Label + ( `id(`cupsd_conf_browse_allow_label), + _("Accept Information from the Following Servers") + ) + ), + `Left + ( `ComboBox + ( `id(`cupsd_conf_browse_allow_combo_box), + _("Usual &General Setting"), + [ `item( `id(`browse_allow_local), "hosts in the local network" ), + `item( `id(`browse_allow_all), "all hosts" ) + ] + ) + ), + `Left + ( `TextEntry + ( `id(`cupsd_conf_browse_allow_input), + _("Specific IP Addresses or &Network/Netmask (separated by space)") + ) + ) + ) + ), + `VSpacing( 1 ), + `Left + ( `RadioButton + ( `id(`client_only_radio_button), + `opt(`notify), + _("Do All Your Printing Directly via &One Remote CUPS Server") + ) + ), + `HBox + ( `HSpacing( 3 ), + `HWeight + ( 2, + `TextEntry + ( `id(`client_conf_server_name_input), + _("&Hostname / IP Address") + ) + ), + `HWeight + ( 1, + `PushButton + ( `id(`test_client_conf_server), + _("&Test Server") + ) + ), + `HStretch() + ) + ) + ) + ), + `VStretch(), + `Frame + ( _("Use Another Print Server or Use a Network Printer Directly"), + `Left + ( `PushButton + ( `id(`connection_wizard), + _("&Connection Wizard") + ) + ) + ), + `VStretch(), + `Right + ( `PushButton + ( `id(`apply), + _("Apply") + ) + ) + ); -symbol handleNetworkPrinting(string key, map event){ - if( Printerlib::browsing_on ) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, true ); - UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); - UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); - UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); - } - else - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, false ); - UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); - UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); - UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); - } +void initNetworkPrinting( string key ) +{ y2milestone( "entering initNetworkPrinting with key '%1'", key ); + // Determine the 'Browsing [ On | Off ]' value in /etc/cups/cupsd.conf and ignore when it fails: + Printerlib::DetermineBrowsing(); + // Determine the 'BrowseAllow [ all | none | @LOCAL | IP-address[/netmask] ]' + // values in /etc/cups/cupsd.conf and ignore when it fails: + Printerlib::DetermineBrowseAllow(); + // Determine the 'ServerName' value in /etc/cups/client.conf and ignore when it fails: + Printerlib::DetermineClientOnly(); + // Have all widgets disabled initially + // but nevertheless fill in the values of the current settings in the system: + UI::ChangeWidget( `id(`cupsd_conf_browsing_off_radio_button), `Value, false ); + UI::ChangeWidget( `id(`cupsd_conf_browsing_on_radio_button), `Value, false ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_label), `Enabled, false ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_combo_box), `Enabled, false ); + // When by accident "all" and "@LOCAL" were set as BrowseAllow values, + // the "@LOCAL" entry is preselected in cupsd_conf_browse_allow_combo_box + // because this is the more secure setting: + if( contains( Printerlib::cupsd_conf_browse_allow, "all" ) ) + { UI::ChangeWidget( `id(`cupsd_conf_browse_allow_combo_box), `Value, `id(`browse_allow_all) ); + } + if( contains( Printerlib::cupsd_conf_browse_allow, "@LOCAL" ) ) + { UI::ChangeWidget( `id(`cupsd_conf_browse_allow_combo_box), `Value, `id(`browse_allow_local) ); + } + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, false ); + // The preset entry in cupsd_conf_browse_allow_input field + // should not contain "all" or "@LOCAL" because those are + // already selectable via cupsd_conf_browse_allow_combo_box + // and it should also not contain "none" because this setting + // is implicitely done via cupsd_conf_browsing_off_radio_button: + string cupsd_conf_browse_allow_input_value = mergestring( filter( string value, + Printerlib::cupsd_conf_browse_allow, + { value = tolower( value ) ; + return( "all" != value + && "@local" != value + && "none" != value + ); + } + ), + " " + ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Value, cupsd_conf_browse_allow_input_value ); + UI::ChangeWidget( `id(`client_only_radio_button), `Value, false ); + UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); + UI::ChangeWidget( `id(`client_conf_server_name_input), `Value, Printerlib::client_conf_server_name ); + UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); + UI::ChangeWidget( `id(`connection_wizard), `Enabled, false ); + // Enable those widgets which match to the current settings in the system: + // If there is 'Browsing On' in /etc/cups/cupsd.conf + // but there is also an active ServerName (!="localhost") in /etc/cups/client.conf + // have only the client-only widgets avtivated because client-only has topmost priority: if( Printerlib::client_only ) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, false ); + { UI::ChangeWidget( `id(`client_only_radio_button), `Value, true ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, true ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, true ); - UI::ChangeWidget( `id(`connection_wizard), `Enabled, false ); } + else + { UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); + // If "none" is present as a BrowseAllow value, no 'Browsing On' widget is enabled: + if( Printerlib::browsing_on + && ! contains( Printerlib::cupsd_conf_browse_allow, "none" ) + ) + { UI::ChangeWidget( `id(`cupsd_conf_browsing_on_radio_button), `Value, true ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_label), `Enabled, true ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_combo_box), `Enabled, true ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, true ); + } + else + { UI::ChangeWidget( `id(`cupsd_conf_browsing_off_radio_button), `Value, true ); + } + } + y2milestone( "leaving initNetworkPrinting" ); +} - if ( event["EventReason"]:"" == "ValueChanged" ){ - if( event["ID"]:nil == `cupsd_conf_browsing_on_radio_button ) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, true ); +symbol handleNetworkPrinting( string key, map event ) +{ y2milestone( "entering handleNetworkPrinting with key '%1'\nand event '%2'", key, event ); + if( "ValueChanged" == event["EventReason"]:"" ) + { if( `cupsd_conf_browsing_on_radio_button == event["ID"]:nil ) + { UI::ChangeWidget( `id(`cupsd_conf_browse_allow_label), `Enabled, true ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_combo_box), `Enabled, true ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, true ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); } - if( event["ID"]:nil == `cupsd_conf_browsing_off_radio_button ) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, false ); + if( `cupsd_conf_browsing_off_radio_button == event["ID"]:nil ) + { UI::ChangeWidget( `id(`cupsd_conf_browse_allow_label), `Enabled, false ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_combo_box), `Enabled, false ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, false ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, false ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, false ); UI::ChangeWidget( `id(`connection_wizard), `Enabled, true ); } - if( event["ID"]:nil == `client_only_check_box) - { UI::ChangeWidget( `id(`cupsd_conf_browse_deny_input), `Enabled, false ); + if( `client_only_radio_button == event["ID"]:nil ) + { UI::ChangeWidget( `id(`cupsd_conf_browse_allow_label), `Enabled, false ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_combo_box), `Enabled, false ); + UI::ChangeWidget( `id(`cupsd_conf_browse_allow_input), `Enabled, false ); UI::ChangeWidget( `id(`client_conf_server_name_input), `Enabled, true ); UI::ChangeWidget( `id(`test_client_conf_server), `Enabled, true ); UI::ChangeWidget( `id(`connection_wizard), `Enabled, false ); } } - - if (event["EventReason"]:""=="Activated" && event["ID"]:nil==`connection_wizard) return `connection_wizard; - - y2internal("event %1", event); - return nil; + if( "Activated" == event["EventReason"]:"" ) + { if( `apply == event["ID"]:nil ) + { if( ! ApplyNetworkPrintingSettings() ) + { Report::Error( // Message of a Report::Error. + // Only a simple message because this error does not happen on a normal system + // (i.e. a system which is not totally broken or totally messed up). + _("Failed to apply the settings to the system.") + ); + } + } + if( `connection_wizard == event["ID"]:nil ) + { return `connection_wizard; + } + } + y2internal("event %1", event); + y2milestone( "leaving handleNetworkPrinting" ); + return nil; } - +void storeNetworkPrinting( string key, map event ) +{ y2milestone( "entering storeNetworkPrinting with key '%1'\nand event '%2'", key, event ); + if( ! ApplyNetworkPrintingSettings() ) + { Report::Error( // Message of a Report::Error. + // Only a simple message because this error does not happen on a normal system + // (i.e. a system which is not totally broken or totally messed up). + _("Failed to apply the settings to the system.") + ); + } + y2milestone( "leaving storeNetworkPrinting" ); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/tools/cups_client_only new/yast2-printer-2.17.7/tools/cups_client_only --- old/yast2-printer-2.17.5/tools/cups_client_only 2008-08-27 14:21:43.000000000 +0200 +++ new/yast2-printer-2.17.7/tools/cups_client_only 2008-08-29 10:40:18.000000000 +0200 @@ -9,15 +9,18 @@ export LANG="POSIX" umask 022 -SERVERNAME="$1" +# When 'localhost' or its IP-address is to be set, +# it is unified so that only 'localhost' or '127.0.0.1' are set +# (but not stuff like 'LocalHost' or '127.000.000.001'). +SERVERNAME="$( echo $1 | sed -e 's/localhost/localhost/i' -e 's/127\.0*0\.0*0\.0*1/127.0.0.1/' )" if test -n "$SERVERNAME" then # When a SERVERNAME is specified, set it in /etc/cups/client.conf # if SERVERNAME is not the magic word 'none' which # is used to only remove all active ServerName entries. - # Note that even 'localhost' is a valid entry there + # Note that even 'localhost' or '127.0.0.1' is a valid entry there # which is used to force client tools (e.g. lpadmin, lpinfo, lpstat) - # to ask the local cupsd via the IPP port on localhost (localhost:631) + # to ask the local cupsd via the IPP port on localhost (127.0.0.1:631) # and not via the domain socket (/var/run/cups/cups.sock) because # the latter failed in the past for certain third-party clients (e.g. Java). # Note that (according to Michael Sweet) it is not a supported configuration @@ -45,7 +48,10 @@ # the output is the empty string (i.e. nothing at all - not even a '\n' character). # The 'tr ... [:blank:]' makes sure that all active ServerName entries # are found if there is more than one which is a broken config. -SERVERNAME="$( grep -i '^ServerName ' /etc/cups/client.conf | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 )" +# Trailing spaces are removed and when 'localhost' or its IP-address is set, +# it is unified so that YaST only needs to test for 'localhost' and '127.0.0.1' +# (but not for stuff like 'LocalHost' or '127.000.000.001'). +SERVERNAME="$( grep -i '^ServerName ' /etc/cups/client.conf | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 | tr -s '\n' ' ' | sed -e 's/ *$//' -e 's/localhost/localhost/i' -e 's/127\.0*0\.0*0\.0*1/127.0.0.1/' )" echo -n "$SERVERNAME" # For a nicer output on a terminal where stdout and stderr is mixed up, # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/tools/modify_cupsd_conf new/yast2-printer-2.17.7/tools/modify_cupsd_conf --- old/yast2-printer-2.17.5/tools/modify_cupsd_conf 2008-08-27 16:01:29.000000000 +0200 +++ new/yast2-printer-2.17.7/tools/modify_cupsd_conf 2008-08-29 10:41:19.000000000 +0200 @@ -17,7 +17,12 @@ echo "Without a new value, the current value is reported." 1>&2 echo "Supported keywords and possible new values are:" 1>&2 echo "Browsing [ On | Off ]" 1>&2 - echo "BrowseAllow [ all | none | @LOCAL | IP-address ]" 1>&2 + echo "BrowseAllow [ all | none | @LOCAL | IP-address[/netmask] ]" 1>&2 + echo "E.g.: BrowseAllow '@LOCAL 192.168.100.1 192.168.200.0/255.255.255.0'" 1>&2 + echo "There is a strict syntax for keywords and values:" 1>&2 + echo "Case matters." 1>&2 + echo "Neither leading nor trailing nor in-between spaces are allowed." 1>&2 + echo "Multiple values for a keyword must be separated by exactly one space." 1>&2 exit 1 fi @@ -34,7 +39,7 @@ { if test -n "$VALUE" then # If a value was specified, only 'On' or 'Off' (case sensitive) are allowed: if ! test "On" = "$VALUE" -o "Off" = "$VALUE" - then echo "Only '$KEY [ On | Off ]' is allowed." 1>&2 + then echo "Only '$KEY [ On | Off ]' is supported." 1>&2 exit 4 fi # Try to substitute an existing Browsing line (ignore case): @@ -54,7 +59,8 @@ # Report the resulting setting in any case: # The 'tr ... [:blank:]' makes sure that all active Browsing entries # are found if there is more than one which is a broken config. - RESULT="$( grep -i "^$KEY " $CUPSDCONF | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 )" + # Remove trailing spaces (needed for the test below). + RESULT="$( grep -i "^$KEY " $CUPSDCONF | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 | tr -s '\n' ' ' | sed -e 's/ *$//' )" echo -n "$RESULT" # For a nicer output on a terminal where stdout and stderr is mixed up, # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt @@ -67,20 +73,23 @@ fi } -# Function to deal with 'BrowseAllow [ all | none | @LOCAL | IP-address ]' +# Function to deal with 'BrowseAllow [ all | none | @LOCAL | IP-address[/netmask] ]' BrowseAllow() { if test -n "$VALUE" then # If a value was specified, only 'all' or 'none' or '@LOCAL' (case sensitive) - # or a single IP-address is allowed: - if ! test "all" = "$VALUE" -o "none" = "$VALUE" -o "@LOCAL" = "$VALUE" - then # Test if value matches to IP-address syntax: - if ! echo $VALUE | egrep -q '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$' - then echo "Only '$KEY [ all | none | @LOCAL | IP-address ]' is allowed." 1>&2 - exit 4 - fi - fi + # or one or more IP-addresses are allowed: + for V in $VALUE + do if ! test "all" = "$V" -o "none" = "$V" -o "@LOCAL" = "$V" + then # Test if value matches to IP-address syntax: + if ! echo "$V" | egrep -q '^([0-9]{1,3}\.){3}[0-9]{1,3}(/([0-9]{1,2})|/(([0-9]{1,3}\.){3}[0-9]{1,3}))?$' + then echo "Only '$KEY [ all | none | @LOCAL | IP-address[/netmask] ]' is supported." 1>&2 + exit 4 + fi + fi + done # Set 'BrowseOrder allow,deny' to deny browse packets by default - # and then allow them from certain sources via a BrowseAllow entry. + # and then allow them from certain sources via BrowseAllow entries + # and finally deny from certain sources via BrowseDeny entries. # All existing BrowseOrder lines are removed (ignore case). sed -i.yast2save -e '/^BrowseOrder.*/Id' $CUPSDCONF # Append the new BrowseOrder line below the last 'Brows' line (ignore case) @@ -91,16 +100,22 @@ then sed -i -e "${LAST_BROWSE_LINE}aBrowseOrder allow,deny" $CUPSDCONF else echo -en "\nBrowseOrder allow,deny\n\n" >>$CUPSDCONF fi - # All existing BrowseAllow lines are removed (ignore case): + # All existing active BrowseAllow lines are removed (ignore case): sed -i -e '/^BrowseAllow.*/Id' $CUPSDCONF - # Append a BrowseAllow line below the BrowseOrder line - # to have the new BrowseAllow line at the matching place: - sed -i -e "/^BrowseOrder /a$KEY from $VALUE" $CUPSDCONF + # All existing active BrowseDeny lines are deactivated (ignore case): + sed -i -e 's/^$BrowseDeny.*$$/#\1/i' $CUPSDCONF + # Insert BrowseAllow lines before the BrowseOrder line + # to have the new BrowseAllow lines at the matching place + # and in the ordering of the values (needed for the test below): + for V in $VALUE + do sed -i -e "/^BrowseOrder /i$KEY from $V" $CUPSDCONF + done fi # Report the resulting setting in any case: # The 'tr ... [:blank:]' makes sure that all active BrowseAllow entries # are found if there is more than one which is allowed. - RESULT="$( grep -i "^$KEY " $CUPSDCONF | tr -s '[:blank:]' ' ' | cut -s -d' ' -f3 )" + # Remove trailing spaces (needed for the test below). + RESULT="$( grep -i "^$KEY " $CUPSDCONF | sed -e 's/from//I' | tr -s '[:blank:]' ' ' | cut -s -d' ' -f2 | tr -s '\n' ' ' | sed -e 's/ *$//' )" echo -n "$RESULT" # For a nicer output on a terminal where stdout and stderr is mixed up, # output a '\n' on stderr to get subsequent stuff (e.g. the shell prompt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.5/VERSION new/yast2-printer-2.17.7/VERSION --- old/yast2-printer-2.17.5/VERSION 2008-08-27 16:22:22.000000000 +0200 +++ new/yast2-printer-2.17.7/VERSION 2008-08-29 14:45:23.000000000 +0200 @@ -1 +1 @@ -2.17.5 +2.17.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-nis-server
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package yast2-nis-server checked in at Sat Aug 30 02:12:41 CEST 2008. -------- --- yast2-nis-server/yast2-nis-server.changes 2008-05-16 21:55:53.000000000 +0200 +++ yast2-nis-server/yast2-nis-server.changes 2008-08-28 14:20:33.400381000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 28 14:16:47 CEST 2008 - jsuchome(a)suse.cz + +- adapted to recent changes in nis-client (no check for DHCP) +- DHCLIENT_SET_DOMAINNAME replaced with NETCONFIG_NIS_SETDOMAINNAME +- 2.17.0 + +------------------------------------------------------------------- Old: ---- yast2-nis-server-2.16.4.tar.bz2 New: ---- yast2-nis-server-2.17.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nis-server.spec ++++++ --- /var/tmp/diff_new_pack.g19205/_old 2008-08-30 02:09:01.000000000 +0200 +++ /var/tmp/diff_new_pack.g19205/_new 2008-08-30 02:09:01.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-nis-server (Version 2.16.4) +# spec file for package yast2-nis-server (Version 2.17.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-nis-server -Version: 2.16.4 -Release: 14 +Version: 2.17.0 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-nis-server-2.16.4.tar.bz2 +Source0: yast2-nis-server-2.17.0.tar.bz2 Prefix: /usr BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-nis-client yast2-testsuite Requires: yast2-network yast2-nis-client @@ -44,7 +51,7 @@ Authors: -------- - Daniel Vesely <dan(a)suse.cz> + Daniel Vesely Martin Vidner <mvidner(a)suse.cz> %description devel-doc @@ -54,11 +61,11 @@ Authors: -------- - Daniel Vesely <dan(a)suse.cz> + Daniel Vesely Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-nis-server-2.16.4 +%setup -n yast2-nis-server-2.17.0 %build %{prefix}/bin/y2tool y2autoconf @@ -109,6 +116,10 @@ %exclude %{prefix}/share/doc/packages/yast2-nis-server/COPYING %exclude %{prefix}/share/doc/packages/yast2-nis-server/README %changelog +* Thu Aug 28 2008 jsuchome(a)suse.cz +- adapted to recent changes in nis-client (no check for DHCP) +- DHCLIENT_SET_DOMAINNAME replaced with NETCONFIG_NIS_SETDOMAINNAME +- 2.17.0 * Fri May 16 2008 jsrain(a)suse.cz - added categories Settings and System into desktop file (bnc #382778) ++++++ yast2-nis-server-2.16.4.tar.bz2 -> yast2-nis-server-2.17.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/aclocal.m4 new/yast2-nis-server-2.17.0/aclocal.m4 --- old/yast2-nis-server-2.16.4/aclocal.m4 2008-05-16 22:27:40.000000000 +0200 +++ new/yast2-nis-server-2.17.0/aclocal.m4 2008-04-21 12:02:17.000000000 +0200 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.1 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,12 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61],, -[m4_warning([this file was generated for autoconf 2.61. -You have another version of autoconf. It may work, but is not guaranteed to. -If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,7 +31,7 @@ [am__api_version='1.10' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.1], [], +m4_if([$1], [1.10], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,10 +47,8 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -146,13 +141,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 12 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -257,17 +252,16 @@ # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. -_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $_am_arg | $_am_arg:* ) + $1 | $1:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -504,7 +498,7 @@ # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/agents/Makefile.in new/yast2-nis-server-2.17.0/agents/Makefile.in --- old/yast2-nis-server-2.16.4/agents/Makefile.in 2008-05-16 22:27:42.000000000 +0200 +++ new/yast2-nis-server-2.17.0/agents/Makefile.in 2008-04-21 12:02:19.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/config.guess new/yast2-nis-server-2.17.0/config.guess --- old/yast2-nis-server-2.16.4/config.guess 2008-05-16 22:27:42.000000000 +0200 +++ new/yast2-nis-server-2.17.0/config.guess 2008-04-21 12:02:19.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2008-01-08' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -56,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -171,7 +171,6 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -340,7 +339,7 @@ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -542,7 +541,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -791,7 +790,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - *:MINGW*:*) + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -801,18 +800,12 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -846,17 +839,10 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu - else - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi - fi + echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu @@ -974,9 +960,6 @@ x86_64:Linux:*:*) echo x86_64-${VENDOR}-linux-gnu exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu - exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -1235,15 +1218,6 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/config.sub new/yast2-nis-server-2.17.0/config.sub --- old/yast2-nis-server-2.16.4/config.sub 2008-05-16 22:27:42.000000000 +0200 +++ new/yast2-nis-server-2.17.0/config.sub 2008-04-21 12:02:19.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2008-01-16' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -72,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -245,12 +245,12 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ + | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -324,7 +324,7 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ @@ -369,14 +369,10 @@ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -447,14 +443,6 @@ basic_machine=ns32k-sequent os=-dynix ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; c90) basic_machine=c90-cray os=-unicos @@ -487,8 +475,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16) - basic_machine=cr16-unknown + cr16c) + basic_machine=cr16c-unknown os=-elf ;; crds | unos) @@ -680,14 +668,6 @@ basic_machine=m68k-isi os=-sysv ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -703,10 +683,6 @@ basic_machine=i386-pc os=-mingw32 ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) basic_machine=m68000-convergent ;; @@ -833,14 +809,6 @@ basic_machine=i860-intel os=-osf ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; pbd) basic_machine=sparc-tti ;; @@ -957,9 +925,6 @@ basic_machine=sh-hitachi os=-hms ;; - sh5el) - basic_machine=sh5le-unknown - ;; sh64) basic_machine=sh64-unknown ;; @@ -1049,10 +1014,6 @@ basic_machine=tic6x-unknown os=-coff ;; - tile*) - basic_machine=tile-unknown - os=-linux-gnu - ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1258,7 +1219,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1453,9 +1414,6 @@ m68*-cisco) os=-aout ;; - mep-*) - os=-elf - ;; mips*-cisco) os=-elf ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/configure.in new/yast2-nis-server-2.17.0/configure.in --- old/yast2-nis-server-2.16.4/configure.in 2008-05-16 22:27:38.000000000 +0200 +++ new/yast2-nis-server-2.17.0/configure.in 2008-04-21 12:02:14.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-nis-server dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-nis-server, 2.16.4, http://bugs.opensuse.org/, yast2-nis-server) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/doc/autodocs/Makefile.in new/yast2-nis-server-2.17.0/doc/autodocs/Makefile.in --- old/yast2-nis-server-2.16.4/doc/autodocs/Makefile.in 2008-05-16 22:27:42.000000000 +0200 +++ new/yast2-nis-server-2.17.0/doc/autodocs/Makefile.in 2008-04-21 12:02:19.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/doc/images/Makefile.in new/yast2-nis-server-2.17.0/doc/images/Makefile.in --- old/yast2-nis-server-2.16.4/doc/images/Makefile.in 2008-05-16 22:27:42.000000000 +0200 +++ new/yast2-nis-server-2.17.0/doc/images/Makefile.in 2008-04-21 12:02:19.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/doc/Makefile.in new/yast2-nis-server-2.17.0/doc/Makefile.in --- old/yast2-nis-server-2.16.4/doc/Makefile.in 2008-05-16 22:27:42.000000000 +0200 +++ new/yast2-nis-server-2.17.0/doc/Makefile.in 2008-04-21 12:02:19.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -317,8 +317,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -343,8 +343,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -354,12 +354,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/install-sh new/yast2-nis-server-2.17.0/install-sh --- old/yast2-nis-server-2.16.4/install-sh 2008-05-16 22:27:42.000000000 +0200 +++ new/yast2-nis-server-2.17.0/install-sh 2008-04-21 12:02:19.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2006-10-14.15 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} +doit="${DOITPROG-}" if test -z "$doit"; then doit_exec=exec else @@ -58,49 +58,34 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" +posix_glob= posix_mkdir= # Desired mode of installed file. mode=0755 -chgrpcmd= chmodcmd=$chmodprog chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" +chgrpcmd= stripcmd= - +rmcmd="$rmprog -f" +mvcmd="$mvprog" src= dst= dir_arg= -dst_arg= - -copy_on_change=false +dstarg= no_target_directory= -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -110,55 +95,65 @@ In the 4th, create DIRECTORIES. Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG " while test $# -ne 0; do case $1 in - -c) ;; - - -C) copy_on_change=true;; + -c) shift + continue;; - -d) dir_arg=true;; + -d) dir_arg=true + shift + continue;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift + shift + continue;; --help) echo "$usage"; exit $?;; -m) mode=$2 + shift + shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac - shift;; + continue;; -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; --version) echo "$0 $scriptversion"; exit $?;; @@ -170,22 +165,21 @@ *) break;; esac - shift done -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do - if test -n "$dst_arg"; then + if test -n "$dstarg"; then # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" + set fnord "$@" "$dstarg" shift # fnord fi shift # arg - dst_arg=$arg + dstarg=$arg done fi @@ -230,7 +224,7 @@ do # Protect names starting with `-'. case $src in - -*) src=./$src;; + -*) src=./$src ;; esac if test -n "$dir_arg"; then @@ -248,22 +242,22 @@ exit 1 fi - if test -z "$dst_arg"; then + if test -z "$dstarg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg + dst=$dstarg # Protect names starting with `-'. case $dst in - -*) dst=./$dst;; + -*) dst=./$dst ;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 + echo "$0: $dstarg: Is a directory" >&2 exit 1 fi dstdir=$dst @@ -384,19 +378,26 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; esac - eval "$initialize_posix_glob" + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac oIFS=$IFS IFS=/ - $posix_glob set -f + $posix_glob && set -f set fnord $dstdir shift - $posix_glob set +f + $posix_glob && set +f IFS=$oIFS prefixes= @@ -458,54 +459,41 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ + || { + echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + } || exit 1 trap '' 0 fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/Makefile.in new/yast2-nis-server-2.17.0/Makefile.in --- old/yast2-nis-server-2.16.4/Makefile.in 2008-05-16 22:27:43.000000000 +0200 +++ new/yast2-nis-server-2.17.0/Makefile.in 2008-04-21 12:02:20.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -391,8 +391,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ mkid -fID $$unique tags: TAGS @@ -417,8 +417,8 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -428,12 +428,13 @@ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ + here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -506,10 +507,6 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) - dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -536,8 +533,6 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -694,10 +689,10 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ + dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ install-data-local install-dvi install-dvi-am install-exec \ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-pdf install-pdf-am \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/src/Makefile.in new/yast2-nis-server-2.17.0/src/Makefile.in --- old/yast2-nis-server-2.16.4/src/Makefile.in 2008-05-16 22:27:42.000000000 +0200 +++ new/yast2-nis-server-2.17.0/src/Makefile.in 2008-04-21 12:02:19.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/src/NisServer.ycp new/yast2-nis-server-2.17.0/src/NisServer.ycp --- old/yast2-nis-server-2.16.4/src/NisServer.ycp 2008-04-21 12:16:11.000000000 +0200 +++ new/yast2-nis-server-2.17.0/src/NisServer.ycp 2008-08-28 14:15:34.000000000 +0200 @@ -276,7 +276,8 @@ remote = true; } }); - if (remote || Nis::dhcp_wanted) + if (remote || + (Nis::policy != "" && !issubstring (Nis::policy, "STATIC"))) { start_ypbind = false; nisclient_local = false; @@ -301,7 +302,7 @@ // won't be replaced by dhcp (#28727) NetworkInterfaces::Read (); if (size (NetworkInterfaces::Locate("BOOTPROTO", "dhcp")) > 0 && - SCR::Read (.sysconfig.network.dhcp.DHCLIENT_SET_DOMAINNAME) == "yes") + SCR::Read (.sysconfig.network.config.NETCONFIG_NIS_SETDOMAINNAME) != "no") { dhcp_changes_domain = true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/testsuite/Makefile.in new/yast2-nis-server-2.17.0/testsuite/Makefile.in --- old/yast2-nis-server-2.16.4/testsuite/Makefile.in 2008-05-16 22:27:42.000000000 +0200 +++ new/yast2-nis-server-2.17.0/testsuite/Makefile.in 2008-04-21 12:02:19.000000000 +0200 @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nis-server-2.16.4/VERSION new/yast2-nis-server-2.17.0/VERSION --- old/yast2-nis-server-2.16.4/VERSION 2008-04-21 12:16:11.000000000 +0200 +++ new/yast2-nis-server-2.17.0/VERSION 2008-08-27 08:56:43.000000000 +0200 @@ -1 +1 @@ -2.16.4 +2.17.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 yast2-ldap-client
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package yast2-ldap-client checked in at Sat Aug 30 02:08:52 CEST 2008. -------- --- yast2-ldap-client/yast2-ldap-client.changes 2008-08-13 09:29:35.000000000 +0200 +++ yast2-ldap-client/yast2-ldap-client.changes 2008-08-29 13:03:42.531600000 +0200 @@ -1,0 +2,14 @@ +Fri Aug 29 12:58:03 CEST 2008 - jsuchome(a)suse.cz + +- added missing Read function to autoYaST client (bcn#421375) +- 2.17.5 + +------------------------------------------------------------------- +Fri Aug 29 11:20:24 CEST 2008 - jsuchome(a)suse.cz + +- pwdMustChange true by default (bnc#421327) +- fixed reading password policies (bnc#420010, bnc#419978) +- applied patch from mc(a)suse.de to work correctly with Kerberos +- 2.17.4 + +------------------------------------------------------------------- Old: ---- yast2-ldap-client-2.17.3.tar.bz2 New: ---- yast2-ldap-client-2.17.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.cuh872/_old 2008-08-30 02:05:38.000000000 +0200 +++ /var/tmp/diff_new_pack.cuh872/_new 2008-08-30 02:05:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-client (Version 2.17.3) +# spec file for package yast2-ldap-client (Version 2.17.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ldap-client -Version: 2.17.3 +Version: 2.17.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.17.3.tar.bz2 +Source0: yast2-ldap-client-2.17.5.tar.bz2 Prefix: /usr BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-pam yast2-testsuite PreReq: %fillup_prereq @@ -54,7 +54,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-ldap-client-2.17.3 +%setup -n yast2-ldap-client-2.17.5 %build %{prefix}/bin/y2tool y2autoconf @@ -94,6 +94,14 @@ %doc %{prefix}/share/doc/packages/yast2-ldap-client /var/adm/fillup-templates/sysconfig.ldap %changelog +* Fri Aug 29 2008 jsuchome(a)suse.cz +- added missing Read function to autoYaST client (bcn#421375) +- 2.17.5 +* Fri Aug 29 2008 jsuchome(a)suse.cz +- pwdMustChange true by default (bnc#421327) +- fixed reading password policies (bnc#420010, bnc#419978) +- applied patch from mc(a)suse.de to work correctly with Kerberos +- 2.17.4 * Wed Aug 13 2008 jsuchome(a)suse.cz - ask DNS for availability of LDAP server (fate#301340) - 2.17.3 ++++++ yast2-ldap-client-2.17.3.tar.bz2 -> yast2-ldap-client-2.17.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.17.3/src/ldap_auto.ycp new/yast2-ldap-client-2.17.5/src/ldap_auto.ycp --- old/yast2-ldap-client-2.17.3/src/ldap_auto.ycp 2006-07-26 14:58:48.000000000 +0200 +++ new/yast2-ldap-client-2.17.5/src/ldap_auto.ycp 2008-08-29 12:55:31.000000000 +0200 @@ -67,6 +67,9 @@ else if (func == "Export") { ret = Ldap::Export(); } +else if (func == "Read") { + ret = Ldap::Read (); +} /** * Return if configuration was changed * return boolean diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.17.3/src/LdapPopup.ycp new/yast2-ldap-client-2.17.5/src/LdapPopup.ycp --- old/yast2-ldap-client-2.17.3/src/LdapPopup.ycp 2008-07-21 15:40:07.000000000 +0200 +++ new/yast2-ldap-client-2.17.5/src/LdapPopup.ycp 2008-08-29 11:37:49.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Additional user interface functions: special edit popups * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: LdapPopup.ycp 49288 2008-07-21 13:42:02Z jsuchome $ + * $Id: LdapPopup.ycp 50468 2008-08-29 09:37:48Z jsuchome $ * * Popups for editing the values of LDAP configuration tables. */ @@ -42,7 +42,6 @@ `HBox ( `HSpacing (), `ReplacePoint (`id (`reptree), `Tree (`id(`tree), root_dn, [])), - `ReplacePoint (`id (`repbuttons), `Empty ()), `HSpacing () ), `HBox ( @@ -64,7 +63,7 @@ list<term> items = []; list<string> out = (list<string>) SCR::Read (.ldap.search, $[ "base_dn" : root_dn, - "scope" : 1, + "scope" : root_dn != "" ? 0 : 1, "dn_only" : true, "not_found_ok" : true ] ); @@ -81,6 +80,8 @@ UI::ReplaceWidget (`id (`reptree), textmode ? `Tree (`id(`tree), root_dn, items) : `Tree (`id(`tree), `opt(`notify), root_dn, items)); + // no item is selected + UI::ChangeWidget (`tree, `CurrentItem, nil); } else if (root_dn == "") { @@ -674,7 +675,7 @@ `Left (`CheckBox (`id ("pwdMustChange"), // checkbox label _("U&ser Must Change Password after Reset"), - ppolicy["pwdMustChange"]:false)), + ppolicy["pwdMustChange"]:true)), `VSpacing (0.2), `Left (`CheckBox (`id ("pwdAllowUserChange"), // checkbox label @@ -754,7 +755,9 @@ `VSpacing (0.2), `IntField (`id ("pwdGraceAuthNLimit"), // IntField label - _("Allowed Uses of an Expired Password"), 0, max, 0) + _("Allowed Uses of an Expired Password"), 0, max, + tointeger (ppolicy["pwdGraceAuthNLimit"]:"0") + ) ), `HSpacing (0.5))); UI::ReplaceWidget (`tabContents, tab_cont); return; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.17.3/src/Ldap.ycp new/yast2-ldap-client-2.17.5/src/Ldap.ycp --- old/yast2-ldap-client-2.17.3/src/Ldap.ycp 2008-08-07 15:48:16.000000000 +0200 +++ new/yast2-ldap-client-2.17.5/src/Ldap.ycp 2008-08-26 12:56:23.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: Ldap.ycp 49288 2008-07-21 13:42:02Z jsuchome $ + * $Id: Ldap.ycp 50368 2008-08-26 10:56:22Z jsuchome $ */ { @@ -2376,7 +2376,17 @@ if (!oes) { // pam settigs - Pam::Add ("ldap"); + if (Pam::Enabled("krb5")) + { + // If kerberos is used for authentication we configure + // pam_ldap in a way that we use only the account checking. + // Other configuration would mess up password changing + Pam::Add ("ldap-account_only"); + } + else + { + Pam::Add ("ldap"); + } // modify sources in /etc/nsswitch.conf Nsswitch::WriteDb ("passwd", ["compat"]); Nsswitch::WriteDb ("passwd_compat", (list<string>) @@ -2425,7 +2435,14 @@ Nsswitch::Write (); - Pam::Remove ("ldap"); + if (Pam::Enabled("ldap")) + { + Pam::Remove ("ldap"); + } + else if(Pam::Enabled("ldap-account_only")) + { + Pam::Remove ("ldap-account_only"); + } WriteLdapConfEntry ("tls_checkpeer", nil); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.17.3/src/ui.ycp new/yast2-ldap-client-2.17.5/src/ui.ycp --- old/yast2-ldap-client-2.17.3/src/ui.ycp 2008-07-21 15:40:07.000000000 +0200 +++ new/yast2-ldap-client-2.17.5/src/ui.ycp 2008-08-29 11:37:49.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: ui.ycp 49288 2008-07-21 13:42:02Z jsuchome $ + * $Id: ui.ycp 50468 2008-08-29 09:37:48Z jsuchome $ * * All user interface functions. */ @@ -637,6 +637,7 @@ list ppolicy_list = []; + boolean ppolicies_enabled = false; map<string,map> ppolicies = $[]; map<string,map> ppolicies_orig= $[]; list<string> ppolicies_deleted = []; // list of DN @@ -654,12 +655,17 @@ ]) ) { + ppolicies_enabled = (boolean) SCR::Execute (.ldap.ppolicy, $[ + "hostname" : Ldap::GetFirstServer (Ldap::server), + "bind_dn" : Ldap::GetBaseDN () + ]); + list schemas = (list)SCR::Read (.ldap.search, $[ "base_dn": "", - "attrs": [ "subschemasubentry" ], + "attrs": [ "subschemaSubentry" ], "scope": 0, ]); - string schema_dn = schemas[0,"subschemasubentry",0]:""; + string schema_dn = schemas[0,"subschemaSubentry",0]:""; if (schemas != nil && schema_dn != "" && SCR::Execute (.ldap.schema, $[ "schema_dn": schema_dn ])== true) { @@ -832,12 +838,9 @@ if (Mode::config ()) UI::ChangeWidget (`id(`configure), `Enabled, false); - if (size (ppolicies) < 1) - { - foreach (symbol s, [ `ppolicy_table, `add, `edit, `delete ], { - UI::ChangeWidget (`id (s), `Enabled, false); - }); - } + foreach (symbol s, [ `ppolicy_table, `add, `edit, `delete ], { + UI::ChangeWidget (`id (s), `Enabled, ppolicies_enabled); + }); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-client-2.17.3/VERSION new/yast2-ldap-client-2.17.5/VERSION --- old/yast2-ldap-client-2.17.3/VERSION 2008-08-13 09:23:10.000000000 +0200 +++ new/yast2-ldap-client-2.17.5/VERSION 2008-08-29 12:58:52.000000000 +0200 @@ -1 +1 @@ -2.17.3 +2.17.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-dns-server
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package yast2-dns-server checked in at Sat Aug 30 02:04:14 CEST 2008. -------- --- yast2-dns-server/yast2-dns-server.changes 2008-08-11 13:17:16.000000000 +0200 +++ yast2-dns-server/yast2-dns-server.changes 2008-08-28 15:04:52.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Aug 28 15:04:26 CEST 2008 - locilka(a)suse.cz + +- Dropped dead code (widgets.ycp). +- 2.17.7 + +------------------------------------------------------------------- +Wed Aug 20 14:12:59 CEST 2008 - sschober(a)suse.de + +- fixed rnc file for autoyast + +------------------------------------------------------------------- Old: ---- yast2-dns-server-2.17.6.tar.bz2 New: ---- yast2-dns-server-2.17.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.H25358/_old 2008-08-30 02:02:00.000000000 +0200 +++ /var/tmp/diff_new_pack.H25358/_new 2008-08-30 02:02:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-dns-server (Version 2.17.6) +# spec file for package yast2-dns-server (Version 2.17.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-dns-server -Version: 2.17.6 +Version: 2.17.7 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dns-server-2.17.6.tar.bz2 +Source0: yast2-dns-server-2.17.7.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-testsuite # requires DnsServerAPI::GetReverseIPforIPv6 @@ -59,7 +59,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-dns-server-2.17.6 +%setup -n yast2-dns-server-2.17.7 %build %{prefix}/bin/y2tool y2autoconf @@ -102,6 +102,11 @@ /usr/share/YaST2/schema/autoyast/rnc/dns-server.rnc %doc %{prefix}/share/doc/packages/yast2-dns-server %changelog +* Thu Aug 28 2008 locilka(a)suse.cz +- Dropped dead code (widgets.ycp). +- 2.17.7 +* Wed Aug 20 2008 sschober(a)suse.de +- fixed rnc file for autoyast * Mon Aug 11 2008 locilka(a)suse.cz - Using netconfig to configure DNS forwarders (patch created by sschober(a)suse.de) (FATE #303386). ++++++ yast2-dns-server-2.17.6.tar.bz2 -> yast2-dns-server-2.17.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.6/src/dialog-main.ycp new/yast2-dns-server-2.17.7/src/dialog-main.ycp --- old/yast2-dns-server-2.17.6/src/dialog-main.ycp 2008-08-11 12:34:58.000000000 +0200 +++ new/yast2-dns-server-2.17.7/src/dialog-main.ycp 2008-08-28 15:05:08.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <lukas.ocilka(a)suse.cz> * - * $Id: dialog-main.ycp 49923 2008-08-11 10:34:57Z locilka $ + * $Id: dialog-main.ycp 50454 2008-08-28 13:05:07Z locilka $ */ { @@ -1864,6 +1864,28 @@ ], ]; + /** + * Ask for exit without saving + * @return event that should be handled, nil if user canceled the exit + */ + global define boolean confirmAbort () ``{ + return Popup::YesNo ( + // Yes-No popup +_("All changes will be lost. +Really leave the DNS server configuration without saving?")); + } + + /** + * Check whether settings were changed and if yes, ask for exit + * without saving + * @return event that should be handled, nil if user canceled the exit + */ + global define boolean confirmAbortIfChanged () ``{ + if (! DnsServer::WasModified ()) + return true; + return confirmAbort (); + } + global map<symbol,any> functions = $[ `abort : confirmAbort, ]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.6/src/dialogs.ycp new/yast2-dns-server-2.17.7/src/dialogs.ycp --- old/yast2-dns-server-2.17.6/src/dialogs.ycp 2008-07-14 14:08:09.000000000 +0200 +++ new/yast2-dns-server-2.17.7/src/dialogs.ycp 2008-08-28 15:05:08.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: dialogs.ycp 49043 2008-07-14 12:08:08Z locilka $ + * $Id: dialogs.ycp 50454 2008-08-28 13:05:07Z locilka $ */ { @@ -21,6 +21,7 @@ import "SuSEFirewall"; import "Punycode"; import "DnsServer"; + import "Confirm"; /** * Ask user if exit without saving diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.6/src/dns-server.rnc new/yast2-dns-server-2.17.7/src/dns-server.rnc --- old/yast2-dns-server-2.17.6/src/dns-server.rnc 2008-07-23 13:45:42.000000000 +0200 +++ new/yast2-dns-server-2.17.7/src/dns-server.rnc 2008-08-25 14:13:28.000000000 +0200 @@ -8,11 +8,21 @@ element start_service { "1" | "0" }? & element use_ldap { "1" | "0" }? & + dns-allowed_interfaces? & + dns-server_logging? & dns-server_options? & dns-server_zones? } +dns-allowed_interfaces = + element allowed_interfaces { + LIST, + dns-allowed_interface* +} + +dns-allowed_interface = element allowed_interface { text } + dns-server_logging = element logging { LIST, dns-server_logging_entry* @@ -45,6 +55,8 @@ element ttl { text }? & element type { text }? & element zone { text }? & + element file { text }? & + element this_zone_had_NS_record_at_start { text }? & element connected_with { text }? & zone_options? & diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.6/src/DnsServerUI.ycp new/yast2-dns-server-2.17.7/src/DnsServerUI.ycp --- old/yast2-dns-server-2.17.6/src/DnsServerUI.ycp 2007-05-18 10:43:31.000000000 +0200 +++ new/yast2-dns-server-2.17.7/src/DnsServerUI.ycp 2008-08-28 15:05:08.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for configuration of dns-server, input and output functions. * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: DnsServerUI.ycp 26793 2006-01-05 07:26:44Z locilka $ + * $Id: DnsServerUI.ycp 50454 2008-08-28 13:05:07Z locilka $ * * Representation of the configuration of dns-server. * Input and output routines. @@ -61,12 +61,12 @@ */ global map popups = InitPopups (); - include "dns-server/widgets.ycp"; +// include "dns-server/widgets.ycp"; /** * Map of widgets for CWM */ - global map widgets = InitWidgets (); +// global map widgets = InitWidgets (); include "dns-server/dialogs.ycp"; include "dns-server/dialog-main.ycp"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.6/src/Makefile.am new/yast2-dns-server-2.17.7/src/Makefile.am --- old/yast2-dns-server-2.17.6/src/Makefile.am 2008-07-23 11:30:52.000000000 +0200 +++ new/yast2-dns-server-2.17.7/src/Makefile.am 2008-08-28 15:01:11.000000000 +0200 @@ -15,7 +15,6 @@ wizards.ycp \ dialogs.ycp \ misc.ycp \ - widgets.ycp \ options.ycp \ dialog-masterzone.ycp \ dialog-main.ycp \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.6/src/Makefile.in new/yast2-dns-server-2.17.7/src/Makefile.in --- old/yast2-dns-server-2.17.6/src/Makefile.in 2008-08-11 13:18:31.000000000 +0200 +++ new/yast2-dns-server-2.17.7/src/Makefile.in 2008-08-28 15:01:14.000000000 +0200 @@ -196,7 +196,6 @@ wizards.ycp \ dialogs.ycp \ misc.ycp \ - widgets.ycp \ options.ycp \ dialog-masterzone.ycp \ dialog-main.ycp \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.6/src/widgets.ycp new/yast2-dns-server-2.17.7/src/widgets.ycp --- old/yast2-dns-server-2.17.6/src/widgets.ycp 2008-07-21 14:29:18.000000000 +0200 +++ new/yast2-dns-server-2.17.7/src/widgets.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,1422 +0,0 @@ -/** - * File: include/dns-server/widgets.ycp - * Package: Configuration of dns-server - * Summary: Widgets used by DNS server configuration - * Authors: Jiri Srain <jsrain(a)suse.cz> - * Lukas Ocilka <locilka(a)suse.cz> - * - * $Id: widgets.ycp 49271 2008-07-21 12:29:17Z locilka $ - */ - -{ - - textdomain "dns-server"; - - import "Label"; - import "Popup"; - import "LogView"; - import "CWM"; - import "DnsServer"; - import "TablePopup"; - import "Confirm"; - -global define symbol chrootHandle (string id, map event); -global define symbol zonesHandle (string key, map event); -define symbol advMenubuttonHandle (string id, map event); - -// start service widget - -/** - * Initialize the widget - * @param id any widget id - */ -global define void startInit (string id) ``{ - boolean ss = DnsServer::GetStartService(); - UI::ChangeWidget (`id ("start"), `Value, ss); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void startStore (string id, map event) ``{ - boolean ss = (boolean)UI::QueryWidget (`id ("start"), `Value); - DnsServer::SetStartService (ss); -} - -/** - * Handle function of the widget - * @param id string widget id - * @param event map event that caused storing process - * @return symbol always nil - */ -global define symbol startHandle (string id, map event) ``{ - boolean start = (boolean)UI::QueryWidget (`id ("start"), `Value); - if (start != DnsServer::GetStartService ()) - DnsServer::SetModified (); - return nil; -} - -/** - * Get the widget description map - * @return list of items for the table - */ -global define map getStartWidget () ``{ - return $[ - "widget" : `checkbox, - // check box - "label" : _("&Start DNS Server"), - "help" : HELPS["start"]:"", - "init" : startInit, - "handle" : startHandle, - "store" : startStore, - "opt" : [`notify], - ]; -} - -// chroot widget - -/** - * Initialize the widget - * @param id any widget id - */ -global define void chrootInit (string id) ``{ - boolean ss = DnsServer::GetChrootJail(); - chrootHandle (id, $[ "ID" : "start" ]); - UI::ChangeWidget (`id (id), `Value, ss); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void chrootStore (string id, map event) ``{ - boolean ss = (boolean)UI::QueryWidget (`id (id), `Value); - DnsServer::SetChrootJail (ss); -} - -/** - * Handle function of the widget - * @param id string widget id - * @param event map event that caused storing process - * @return symbol always nil - */ -global define symbol chrootHandle (string id, map event) ``{ - if (event["ID"]:nil == "start") - { - boolean en = (boolean)UI::QueryWidget (`id ("start"), `Value); - UI::ChangeWidget (`id (id), `Enabled, en); - return nil; - } - boolean start = (boolean)UI::QueryWidget (`id (id), `Value); - if (start != DnsServer::GetChrootJail ()) - DnsServer::SetModified (); - return nil; -} - -/** - * Get the widget description map - * @return list of items for the table - */ -global define map getChrootWidget () ``{ - return $[ - "widget" : `checkbox, - // check box - "label" : _("&Run DNS Server in Chroot Jail"), - "help" : HELPS["chroot"]:"", - "init" : chrootInit, - "handle" : chrootHandle, - "handle_events" : [ "start", "chroot" ], - "store" : chrootStore, - ]; -} - -// zone direction widget (forward/reverse) - -/** - * Initialize the widget - * @param id any widget id - */ -global define void zoneDirectionInit (string id) ``{ - string zone = current_zone["zone"]:""; - UI::ChangeWidget (`id (id), `CurrentButton, - issubstring (zone, "in-addr.arpa") ? "reverse" : "forward"); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void zoneDirectionStore (string id, map event) ``{ - string zone = current_zone["zone"]:""; - string current = (string)UI::QueryWidget (`id (id), `CurrentButton); - if (current == "forward" && issubstring (zone, "in-addr.arpa")) - zone = ""; - else if (current == "reverse" && ! issubstring (zone, "in-addr.arpa")) - zone = "in-addr.arpa"; - current_zone["zone"] = zone; -} - -/** - * Get the widget description map - * @return list of items for the table - */ -define map getZoneDirectionWidget () ``{ - return $[ - "widget" : `radio_buttons, - "items" : [ - // radio button, type of zone - ["forward", _("For&ward")], - // radio button, type of zone - ["reverse", _("Re&verse")], - ], - "vspacing" : 1, - // frame containing radio buttons group - "label" : _("Zone Direction"), - "help" : HELPS["zone_direction"]:"", - "init" : zoneDirectionInit, - "store" : zoneDirectionStore, - ]; -} - -// zone type widget (master/slave/...) - -/** - * Initialize the widget - * @param id any widget id - */ -global define void zoneTypeInit (string id) ``{ - string type = current_zone["type"]:"master"; - UI::ChangeWidget (`id (id), `CurrentButton, type); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void zoneTypeStore (string id, map event) ``{ - string type = (string)UI::QueryWidget (`id (id), `CurrentButton); - current_zone["type"] = type; -} - -/** - * Get the widget description map - * @return list of items for the table - */ -define map getZoneTypeWidget () ``{ - return $[ - "widget" : `radio_buttons, - "items" : [ - // radio button, type of zone - ["master", _("&Master")], - // radio button, type of zone - ["slave", _("&Slave")], - // radio button, type of zone - ["stub", _("S&tub")], - ], - "vspacing" : 1, - // frame containing radio buttons group - "label" : _("Type"), - "help" : HELPS["zone_type"]:"", - "init" : zoneTypeInit, - "store" : zoneTypeStore, - ]; -} - -// zone name widget - -/** - * Initialize the widget - * @param id any widget id - */ -global define void zoneNameInit (string id) ``{ - string name = current_zone["zone"]:""; - UI::ChangeWidget (`id (id), `Value, name); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void zoneNameStore (string id, map event) ``{ - string name = (string)UI::QueryWidget (`id (id), `Value); - current_zone["zone"] = name; -} - -/** - * Get the widget description map - * @return list of items for the table - */ -global define map getZoneNameWidget () ``{ - return $[ - "widget" : `inputfield, - // text entry - "label" : _("Zone"), - "init" : zoneNameInit, - "store" : zoneNameStore, - "help" : HELPS["zone_name"]:"", - ]; -} - -// soa widget - -/** - * Initialize the widget - * @param id any widget id - */ -global define void soaInit (string id) ``{ - foreach (string r, - ["serial", "refresh", "retry", "expiry", "minimum", "server"], - ``{ - UI::ChangeWidget (`id (r), `Value, current_zone["soa", r]:""); - }); - string mail = current_zone["soa", "mail"]:""; - if (regexpmatch (mail, "^[^@\.]+\..*$")) - mail = regexpsub (mail, "^([^(a)\.]+)\.(.*)$", "\\1@\\2"); - UI::ChangeWidget (`id ("mail"), `Value, mail); - UI::ChangeWidget (`id ("ttl"), `Value, current_zone["ttl"]:""); - UI::SetFocus (`id ("ttl")); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void soaStore (string id, map event) ``{ - current_zone["soa"] = current_zone["soa"]:$[]; - foreach (string r, - ["serial", "refresh", "retry", "expiry", "minimum", "server"], - ``{ - current_zone["soa", r] = UI::QueryWidget (`id (r), `Value); - }); - string mail = (string)UI::QueryWidget (`id ("mail"), `Value); - if (regexpmatch (mail, "^[^@]+@.*$")) - { - mail = regexpsub (mail, "^([^@]+)@(.*)$", "\\1.\\2"); - } - if (regexpmatch (mail, "^.*[^\.]$")) - { - mail = sformat ("%1.", mail); - } - current_zone["soa", "mail"] = mail; - string server = (string)UI::QueryWidget (`id ("server"), `Value); - if (regexpmatch (mail, "^.*[^\.]$")) - { - mail = sformat ("%1.", mail); - } - current_zone["soa", "server"] = server; - current_zone["ttl"] = UI::QueryWidget (`id ("ttl"), `Value); - current_zone["soa_modified"] = 1; -} - -/** - * Get the widget description map - * @return map widget description map - */ -define map getSoaWidget () ``{ - return $[ - "widget" : `custom, - "init" : soaInit, - "store" : soaStore, - "custom_widget" : `VBox ( - `HBox ( - `VBox ( - `VWeight (1, - // text entry - `InputField (`id ("ttl"), `opt (`hstretch), _("$TT&L"))), - `VWeight (2, `VStretch ()), - `VWeight (1, - // text entry - `InputField (`id ("server"), `opt (`hstretch), _("Primary &Source"))), - `VWeight (1, - // text entry - `InputField (`id ("mail"), `opt (`hstretch), _("&Administrator's Mail"))) - ), - `HSpacing (1), - `VBox ( - `VWeight (1, - // text entry - `InputField (`id ("serial"), `opt (`hstretch), _("Serial"))), - `VWeight (1, - // text entry - `InputField (`id ("refresh"), `opt (`hstretch), _("Re&fresh"))), - `VWeight (1, - // text entry - `InputField (`id ("retry"), `opt (`hstretch), _("Re&try"))), - `VWeight (1, - // text entry - `InputField (`id ("expiry"), `opt (`hstretch), _("E&xpiration"))), - `VWeight (1, - // text entry - `InputField (`id ("minimum"), `opt (`hstretch), _("Mi&nimum"))) - ) - ) - ), - "help" : HELPS["soa"]:"", - ]; -} - - -// soa button - -/** - * Initialize the widget - * @param key any widget id - */ -define void soaButtonInit (string key) ``{ - // push button - UI::ReplaceWidget (`_tp_table_repl, `PushButton (`id(key), _("Edit &SOA"))); -} - -/** - * Handle function of a widget - * @param key any widget key of widget that is processed - * @param event map event that occured - * @return symbol symbol for ws or nil - */ -define symbol soaButtonHandle (string key, map event) ``{ -/* if (0 == current_zone["soa_modified"]:0) - { - if (! Popup::YesNo (_("If you edit SOA record of the zone and -it will be modified from outside, YaST will -rewrite the chanegs. Continue?"))) - { - return nil; - } - }*/ - return `soa; -} - -/** - * Get the widget description map - * @return map widget description map - */ -define map getSoaButton () ``{ - return $[ - "widget" : `custom, - "custom_widget" : `VBox (), - // push button - "label" : _("Edit &SOA"), - "init" : soaButtonInit, - "handle" : soaButtonHandle, - "handle_events" : [ "soa_button" ], - "help" : HELPS["soa_button"]:"", - ]; -} - -/** - * Handle function of a widget - * @param key any widget key of widget that is processed - * @param event map event that occured - * @return symbol symbol for ws or nil - */ -define symbol NsMxButtonHandle (string key, map event) ``{ - return `ns_mx; -} - -/** - * Get the widget description map - * @return map widget description map - */ -define map getNsMxButton () ``{ - return $[ - "widget" : `push_button, - // push button - "label" : _("Edit &NS and MX Records"), - "handle" : NsMxButtonHandle, - "handle_events" : [ "ns_mx_button" ], - ]; -} -// global table widget - -/** - * Function for getting contents of the global table - * @param descr map description map of the table - * @return list of items for the table - */ -global define list getGlobalTableContents (map descr) ``{ - list options = DnsServer::GetGlobalOptions (); - integer index = -1; - return maplist (any o, current_section, ``{ - index = index + 1; - return index; - }); -} - -/** - * Translate option id to option key - * @param descr map table description map - * @param id any option id - * @return string option key - */ -define string globalTableId2Key (map descr, any id) ``{ - integer iid = (integer)id; - return current_section[iid, "key"]:""; -} - -/** - * Initialize function of a widget - * @param id any widget key of widget that is processed - */ -global define void globalTableInit (string id) ``{ - current_section = DnsServer::GetGlobalOptions (); - TablePopup::TableInitWrapper (id); -} - -/** - * Store function of a widget - * @param widget any widget key of widget that is processed - * @param event map event that occured - */ -global define void globalTableStore (string widget, map event) ``{ - DnsServer::SetGlobalOptions (current_section); -} - -/** - * Delete function of the global table - * @param opt_id any option id of selected option - * @param opt_key any option key of selected option - * @return boolean true if was really deleted - */ -global define boolean globalTableEntryDelete (any opt_id, any opt_key) ``{ - integer oid = (integer)opt_id; - if (! Confirm::DeleteSelected()) { - return false; - } - current_section[oid] = $[]; - current_section = filter (map<string,any> o, current_section, ``(o != $[])); - return true; -} - -/** - * Get map of widget - * @return map of widget - */ -global define map getGlobalTableWidget () ``{ - map ret = TablePopup::CreateTableDescr ($[ - "add_delete_buttons" : true, - "up_down_buttons" : false, - "unique_keys" : true, - ], $[ - "init" : globalTableInit, - "store" : globalTableStore, - "options" : DnsServerUI::popups, - "ids" : getGlobalTableContents, - "id2key" : globalTableId2Key, - "fallback" : $[ - "init" : globalPopupInit, - "store" : globalPopupStore, - "summary" : globalTableEntrySummary, - ], - "option_delete" : globalTableEntryDelete, - "add_items" : [ "hostname", "version", "directory", "named-xfer", - "dump-file", "memstatistics-file", "pid-file", - "statistics-file", "auth-nxdomain", "deallocate-on-exit", - "dialup", "fake-iquery", "fetch-glue", "has-old-clients", - "host-statistics", "host-statistics-max", "multiple-cnames", - "notify", "suppress-initial-notify", "recursion", - "rfc2308-type1", "use-id-pool", "treat-cr-as-space", - "also-notify", "forward", "forwarders", "check-names", - "allow-query", "allow-recursion", "allow-transfer", - "blackhole", "listen-on", "query-source", "lame-ttl", - "max-transfer-time-in", "max-ncache-ttl", "min-roots", - "serial-queries", "transfer-format", "transfers-in", - "transfers-out", "transfers-per-ns", "transfer-source", - "maintain-ixfr-base", "max-ixfr-log-size", "coresize", - "datasize", "files", "stacksize", "cleaning-interval", - "heartbeat-interval", "interface-interval", - "statistics-interval", "topology", "sortlist", "rrset-order", - "preferred-glue", "listen-on-v6", - ], - ]); - return ret; -} - -// list of zones widget - -/** - * Initialize function of a widget - * @param key any widget key of widget that is processed - */ -global define void zonesInit (string key) ``{ - integer index = -1; - list items = maplist (map z, DnsServer::FetchZones(), ``{ - index = index + 1; - string zone_name = z["zone"]:""; - if (zone_name == "." || zone_name == "0.0.127.in-addr.arpa" - || zone_name == "localhost") - { - return `item (); - } - return `item (`id (index), zone_name, z["type"]:"master"); - }); - items = filter (any i, items, ``(i != `item ())); - UI::ChangeWidget (`id (`zones), `Items, items); - UI::SetFocus (`id (`zones)); - zonesHandle (key, $[ "ID" : "start" ]); -} - -/** - * handle function of a widget - * @param key any widget key of widget that is processed - * @param event map event that occured - * @return symbol symbol for ws or nil - */ -global define symbol zonesHandle (string key, map event) ``{ - if (event["ID"]:nil == "start") - { - boolean en = (boolean)UI::QueryWidget (`id ("start"), `Value); - UI::ChangeWidget (`id (`zones), `Enabled, en); - UI::ChangeWidget (`id (`add), `Enabled, en); - UI::ChangeWidget (`id (`edit), `Enabled, en); - UI::ChangeWidget (`id (`delete), `Enabled, en); - return nil; - } - UI::SetFocus (`id (`zones)); - integer current = (integer)UI::QueryWidget (`id (`zones), `CurrentItem); - if (event["ID"]:nil == `add || event["ID"]:nil == `edit - || event["ID"]:nil == `zones) - { - if (event["ID"]:nil == `add) - { - DnsServer::SelectZone(-1); - current_zone = DnsServer::FetchCurrentZone(); - y2milestone ("New zone: %1", current_zone); - return `add; - } - else - { - if (current == nil) - { - // popup error message - Popup::Message (_("No zone is selected.")); - return nil; - } - DnsServer::SelectZone(current); - current_zone = DnsServer::FetchCurrentZone(); - y2milestone ("Fetched zone: %1", current_zone); - return `edit; - } - } - else if (event["ID"]:nil == `delete) - { - if (current == nil) - { - // popup error message - Popup::Message (_("No zone is selected.")); - return nil; - } - // yes-no popup - if (Popup::YesNo (_("Delete selected zone?"))) - { - DnsServer::RemoveZone (current, false); - zonesInit (key); - } - } - return nil; -} - -/** - * Get map of widget - * @return map of widget - */ -global define map getZoneListWidget () ``{ - return $[ - "widget" : `custom, - "custom_widget" : `VBox ( - `Table (`id (`zones), `opt (`notify), `header ( - // table header - _("Zone"), - // table header - _("Type") - ), []), - `HBox ( - `PushButton (`id (`add), `opt (`key_F3), - Label::AddButton ()), - `PushButton (`id (`edit), `opt (`key_F4), - Label::EditButton ()), - `PushButton (`id (`delete), `opt (`key_F5), - Label::DeleteButton ()), - `HStretch (), - `ReplacePoint (`id (`zones_rp), `VBox ()) - ) - ), - "init" : zonesInit, - "handle" : zonesHandle, - "help" : HELPS["zones"]:"", - ]; -} - -// global menu button - -/** - * Initialize function of a widget - * @param id string widget key of widget that is processed - */ -define void advMenubuttonInit (string id) ``{ - UI::ReplaceWidget (`zones_rp, `MenuButton (`id (`adv_menubutton), - // menu button - _("Ad&vanced"), [ - // menubutton item - `item (`id (`global_options), _("&Edit Global Options")), - // menubutton item - `item (`id (`firewall), _("&Firewall Configuration")), - // menubutton item - `item (`id (`ddns), _("Manage &TSIG Keys")), - // menubutton item - `item (`id (`show_log), _("&Display Log")), - ])); - advMenubuttonHandle (id, $["ID" : "start"]); -} - -/** - * handle function of a widget - * @param id string widget key of widget that is processed - * @param event map event that occured - * @return symbol symbol for ws or nil - */ -define symbol advMenubuttonHandle (string id, map event) ``{ - if (event["ID"]:nil == "start") - { - boolean en = (boolean)UI::QueryWidget (`id ("start"), `Value); - UI::ChangeWidget (`id (`adv_menubutton), `Enabled, en); - return nil; - } - symbol e = (symbol)(event["ID"]:nil); - if (e == `show_log) - { - LogView::Display ($[ - "file" : "/var/log/messages", - "grep" : "named", - "save" : true, - "actions" : [ - // menubutton entry, try to keep short - [ _("Reload DNS Server"), - RestartDnsDaemon ], - // menubutton entry, try to keep short - [ _("Save Settings and Reload DNS Server"), - DnsServer::Write ], - ], - ]); - return nil; - } - return e; -} - -/** - * Get map of widget - * @return map of widget - */ -define map getAdvancedMenubutton () ``{ - return $[ - "init" : advMenubuttonInit, - "help" : HELPS["adv_mbutton"]:"", - "handle" : advMenubuttonHandle, - "handle_events" : [ `global_options, `show_log, `firewall, `ddns, - "start" ], - "widget" : `custom, // support for non-displayed widgets would be better - "custom_widget" : `VBox (), - ]; -} - -// name servers widget - -/** - * handle function of a widget - * @param id string widget key of widget that is processed - * @param event map event that occured - * @return symbol symbol for ws or nil - */ -global define symbol nsHandle (string id, map event) ``{ - if (event["ID"]:nil == `ns_add) - { - string new = nil; - UI::OpenDialog (`VBox ( - `InputField (`id (`address), `opt (`hstretch), _("&Name Server")), - `HBox ( - `HStretch (), - `PushButton (`id (`ok), Label::OKButton ()), - `PushButton (`id (`cancel), Label::CancelButton ()), - `HStretch () - ) - )); - any ret = nil; - while (ret == nil) - { - ret = UI::UserInput (); - if (ret == `ok) - new = (string)UI::QueryWidget (`id (`address), `Value); - } - UI::CloseDialog (); - if (new == nil) - return nil; - current_zone_ns = add (current_zone_ns, new); - } - else if (event["ID"]:nil == `ns_delete) - { - string selected = (string) - UI::QueryWidget (`id (`ns_addresses), `CurrentItem); - if (selected == nil) - { - // popup message - Popup::Message (_("No name server selected.")); - return nil; - } - current_zone_ns = filter (string s, current_zone_ns, ``( - s != selected)); - } - UI::ReplaceWidget (`ns_addresses_rp, `SelectionBox (`id (`ns_addresses), - // selection box label - _("&Name Servers"), - current_zone_ns)); - return nil; -} - -/** - * Initialize function of a widget - * @param id string widget key of widget that is processed - */ -global define void nsInit (string id) ``{ - string zone_name = current_zone["zone"]:""; - list<map> records = filter (map r, (list<map>)(current_zone["records"]:[]), ``( - r["type"]:"" == "NS" - && (r["key"]:"" == sformat ("%1.", zone_name) - || r["key"]:"" == zone_name) - )); - current_zone_ns = maplist (map r, records, ``(r["value"]:"")); - current_zone_ns = filter (string z, current_zone_ns, ``(z != "")); - nsHandle (id, $[]); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void nsStore (string id, map event) ``{ - string zone_name = current_zone["zone"]:""; - list records = filter (map r, current_zone["records"]:[], ``( - ! (r["type"]:"" == "NS" - && (r["key"]:"" == sformat ("%1.", zone_name) - || r["key"]:"" == zone_name)) - )); - list new_rec = maplist (string a, current_zone_ns, ``( - $[ - "key" : sformat ("%1.", zone_name), - "type" : "NS", - "value" : a, - ] - )); - current_zone["records"] = merge (new_rec, records); -} - -/** - * Get map of widget - * @return map of widget - */ -define map getNameServersWidget () ``{ - return $[ - "widget" : `custom, - "custom_widget" : `VBox ( - `ReplacePoint (`id (`ns_addresses_rp), - `SelectionBox (`id (`ns_addresses), - // selection box label - _("&Name Servers"), []) - ), - `HBox ( - `HStretch (), - `PushButton (`id (`ns_add), `opt (`key_F3), - Label::AddButton ()), - `PushButton (`id (`ns_delete), `opt(`key_F5), - Label::DeleteButton ()), - `HStretch () - ) - ), - "init" : nsInit, - "handle" : nsHandle, - "store" : nsStore, - "handle_events" : [ `ns_add, `ns_delete ], - ]; -} - -// mail relays widget - -/** - * handle function of a widget - * @param id any widget key of widget that is processed - * @param event map event that occured - * @return symbol symbol for ws or nil - */ -global define symbol mxHandle (string id, map event) ``{ - if (event["ID"]:nil == `mx_add) - { - string new = nil; - UI::OpenDialog (`VBox ( - // text entry - `InputField (`id (`address), `opt (`hstretch), _("&Mail Relay")), - // int field - `IntField (`id (`priority), _("&Priority"), 0, 100, 10), - `HBox ( - `HStretch (), - `PushButton (`id (`ok), Label::OKButton ()), - `PushButton (`id (`cancel), Label::CancelButton ()), - `HStretch () - ) - )); - any ret = nil; - integer priority = 0; - while (ret == nil) - { - ret = UI::UserInput (); - if (ret == `ok) - new = (string)UI::QueryWidget (`id (`address), `Value); - } - priority = (integer)UI::QueryWidget (`id (`priority), `Value); - UI::CloseDialog (); - if (new == nil) - return nil; - new = sformat ("%1 %2", priority, new); - current_zone_mx = add (current_zone_mx, new); - } - else if (event["ID"]:nil == `mx_delete) - { - string selected = (string) - UI::QueryWidget (`id (`mx_addresses), `CurrentItem); - if (selected == nil) - { - // popup message - Popup::Message (_("No name server selected.")); - return nil; - } - current_zone_mx = filter (string s, current_zone_mx, ``( - s != selected)); - } - UI::ReplaceWidget (`mx_addresses_rp, `SelectionBox (`id (`mx_addresses), - // selection box label - _("&Mail Relays"), - current_zone_mx)); - return nil; -} - -/** - * Initialize function of a widget - * @param id any widget key of widget that is processed - */ -global define void mxInit (string id) ``{ - string zone_name = current_zone["zone"]:""; - list<map> records = filter (map r, (list<map>)(current_zone["records"]:[]), ``( - r["type"]:"" == "MX" - && (r["key"]:"" == sformat ("%1.", zone_name) - || r["key"]:"" == zone_name) - )); - current_zone_mx = maplist (map r, records, ``(r["value"]:"")); - current_zone_mx = filter (string z, current_zone_mx, ``(z != "")); - mxHandle (id, $[]); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void mxStore (string id, map event) ``{ - string zone_name = current_zone["zone"]:""; - list records = filter (map r, current_zone["records"]:[], ``( - ! (r["type"]:"" == "MX" - && (r["key"]:"" == sformat ("%1.", zone_name) - || r["key"]:"" == zone_name)) - )); - list new_rec = maplist (string a, current_zone_mx, ``( - $[ - "key" : sformat ("%1.", zone_name), - "type" : "MX", - "value" : a, - ] - )); - current_zone["records"] = merge (new_rec, records); - return; -} - -/** - * Get map of widget - * @return map of widget - */ -define map getMailRelaysWidget () ``{ - return $[ - "widget" : `custom, - "custom_widget" : `VBox ( - `ReplacePoint (`id (`mx_addresses_rp), - `SelectionBox (`id (`mx_addresses), - `opt (`notify, `immediate), - // selection box label - _("&Mail Relays"), []) - ), - `HBox ( - `HStretch (), - // push button - `PushButton (`id (`priority), _("Set &Priority")), - `HStretch () - ), - `HBox ( - `HStretch (), - `PushButton (`id (`mx_add), `opt (`key_F3), - Label::AddButton ()), - `PushButton (`id (`mx_delete), `opt(`key_F5), - Label::DeleteButton ()), - `HStretch () - ) - ), - "init" : mxInit, - "handle" : mxHandle, - "store" : mxStore, - ]; -} - -// master domain options - -/** - * Convert id to key - * @param table map widget description map - * @param opt_id any option id - * @return any option key - */ -global define any masterId2Key (map table, any opt_id) ``{ - integer index = (integer)opt_id; - return current_zone["records", index, "type"]:"A"; -} - -/** - * Delete function of the master table - * @param opt_id any option id of selected option - * @param opt_key any option key of selected option - * @return boolean true if was really deleted - */ -global define boolean masterTableEntryDelete (any opt_id, string opt_key) ``{ - integer index = (integer)opt_id; - // message popup - if (! Popup::YesNo (_("Delete selected resource record?"))) - return false; - current_zone_upd_ops = add (current_zone_upd_ops, $[ - "operation" : "delete", - "type" : current_zone["records", index, "type"]:"", - "key" : current_zone["records", index, "key"]:"", - "value" : current_zone["records", index, "value"]:"", - ]); - current_zone["records", index] = $[]; - current_zone["records"] = filter (map r, current_zone["records"]:[], - ``(r != $[])); - return true; -} - -/** - * Function for getting contents of the master table - * @param descr map description map of the table - * @return list items for the table - */ -global define list getMasterTableContents (map descr) ``{ - string zone_name = current_zone["zone"]:""; - integer index = -1; - list<integer> ret = maplist (map m, current_zone["records"]:[], ``{ - index = index + 1; - if (m["type"]:"" == "TTL" || m["type"]:"" == "ORIGIN") - return -1; -/* if ((m["type"]:"" == "NS" || m["type"]:"" == "MX") - && (m["key"]:"" == sformat ("%1.", zone_name) - || m["key"]:"" == zone_name)) - { - return nil; - }*/ - return index; - }); - ret = filter (integer r, ret, ``(r != nil && r != -1)); - return ret; -} - -/** - * Initialize the widget - * @param key any widget id - */ -define void MasterTableInit (string key) ``{ - current_zone_upd_ops = current_zone["update_actions"]:[]; - TablePopup::TableInitWrapper (key); -} - -/** - * Store settings of the widget - * @param key string widget id - * @param event map event that caused storing process - */ -define symbol MasterTableStore (string key, map event) ``{ - current_zone["update_actions"] = maplist (map m, current_zone_upd_ops, ``{ - m["zone"] = current_zone["zone"]:""; - return m; - }); - return nil; -} - -/** - * Handle function of the widget - * @param key string widget id - * @param event map event that caused storing process - * @return symbol always nil - */ -global define symbol MasterTableHandle (string key, map event) ``{ - map<string, any> widget = CWM::GetProcessedWidget (); - if (regexpmatch (current_zone["zone"]:"", "in-addr\\.arpa\\.?$") || regexpmatch (current_zone["zone"]:"", "\\.ip6\\.arpa\\.?$")) - widget["add_items"] = [ "PTR", "NS" ]; - else - widget["add_items"] = [ "A", "AAAA", "CNAME", "NS", "MX" ]; - return TablePopup::TableHandle(widget, key, event); -} - -/** - * Get map of widget - * @return map of widget - */ -global define map getMasterTableWidget () ``{ - map ret = TablePopup::CreateTableDescr ($[ - "add_delete_buttons" : true, - "up_down_buttons" : false - ], $[ - "init" : MasterTableInit, - "store" : MasterTableStore, - "handle" : MasterTableHandle, - "options" : DnsServerUI::popups, - "ids" : getMasterTableContents, - "id2key" : masterId2Key, - "fallback" : $[ - "init" : masterPopupInit, - "store" : masterPopupStore, - "summary" : masterTableEntrySummary, - "label_func" : masterTableLabelFunc, - ], - "option_delete" : masterTableEntryDelete, - "add_items" : [ "AAAA", "A", "CNAME", "PTR", "NS", "MX" ], - "add_items_keep_order" : true, - "add_unlisted" : false, - "help" : HELPS["master_zone"]:"", - ]); - return ret; -} - -// list of zone masters - -/** - * Handle function of the widget - * @param key string widget id - * @param event map event that caused storing process - * @return symbol always nil - */ -global define symbol zoneMastersHandle (string key, map event) ``{ - if (event["ID"]:nil == `master_add) - { - string new = nil; - UI::OpenDialog (`VBox ( - // text entry - `InputField (`id (`address), `opt (`hstretch), _("Address of &Master")), - `HBox ( - `HStretch (), - `PushButton (`id (`ok), Label::OKButton ()), - `PushButton (`id (`cancel), Label::CancelButton ()), - `HStretch () - ) - )); - any ret = nil; - while (ret == nil) - { - ret = UI::UserInput (); - if (ret == `ok) - new = (string)UI::QueryWidget (`id (`address), `Value); - } - UI::CloseDialog (); - if (new == nil) - return nil; - current_zone_masters = add (current_zone_masters, new); - } - else if (event["ID"]:nil == `master_delete) - { - string selected = (string) - UI::QueryWidget (`id (`masters), `CurrentItem); - if (selected == nil) - { - // popup message - Popup::Message (_("No name server selected.")); - return nil; - } - current_zone_masters = filter (string s, current_zone_masters, ``( - s != selected)); - } - UI::ReplaceWidget (`masters_rp, `SelectionBox ( - `id (`masters), - // selection box - _("Master Name Servers"), - current_zone_masters - )); - return nil; -} - -/** - * Initialize the widget - * @param key any widget id - */ -global define void zoneMastersInit (string key) ``{ - string zm = current_zone["masters"]:""; - integer i = findfirstof (zm, "{"); - if (i != nil) - zm = substring (zm, i + 1); - i = findfirstof (zm, "}"); - if (i != nil) - zm = substring (zm, 0, i); - current_zone_masters = splitstring (zm, ";"); - current_zone_masters = maplist (string m, current_zone_masters, ``( - mergestring (splitstring (m, " "), "") - )); - current_zone_masters = filter (string m, current_zone_masters, ``( - m != "")); - zoneMastersHandle (key, $[]); -} - -/** - * Store settings of the widget - * @param key string widget id - * @param event map event that caused storing process - */ -global define void zoneMastersStore (string key, map event) ``{ - current_zone["masters"] = sformat ("{ %1; }", - mergestring (current_zone_masters, "; ")); -} - -/** - * Get the widget description map - * @return map widget description map - */ -define map getZoneMastersWidget () ``{ - return $[ - "widget" : `custom, - "custom_widget" : `VBox ( - `ReplacePoint (`id (`masters_rp), `SelectionBox ( - `id (`masters), - // selection box - _("Master Name Servers"), - [] - )), - `HBox ( - `PushButton (`id (`master_add), Label::AddButton ()), - `PushButton (`id (`master_delete), Label::DeleteButton ()), - `HStretch () - ) - ), - "init" : zoneMastersInit, - "handle" : zoneMastersHandle, - "handle_events" : [`master_add, `master_delete], - "store" : zoneMastersStore, - "help" : HELPS["zone_masters"]:"", - ]; -} - -// select interface classes to allow access - -/** - * Initialize the widget - * @param id any widget id - */ -global define void IfacesInit (string id) ``{ - list<string> ai = DnsServer::GetAllowedInterfaces (); - UI::ChangeWidget (`id (`int), `Value, contains (ai, "int")); - UI::ChangeWidget (`id (`ext), `Value, contains (ai, "ext")); - UI::ChangeWidget (`id (`dmz), `Value, contains (ai, "dmz")); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void IfacesStore (string id, map event) ``{ - list<string> ai = []; - if ((boolean)UI::QueryWidget (`id (`int), `Value)) - ai = add (ai, "int"); - if ((boolean)UI::QueryWidget (`id (`ext), `Value)) - ai = add (ai, "ext"); - if ((boolean)UI::QueryWidget (`id (`dmz), `Value)) - ai = add (ai, "dmz"); - DnsServer::SetAllowedInterfaces (ai); -} - -/** - * Get the widget description map - * @return map widget description map - */ -define map getIfaceClassesWidget () ``{ - return $[ - "widget" : `custom, - // frame - "custom_widget" : `Frame (_("Interface Classes"), `VBox ( - `VSpacing (1), - // check box - `Left (`CheckBox (`id(`int), _("Allow &Internal Interfaces"))), - `VSpacing (1), - // check box - `Left (`CheckBox (`id(`ext), _("Allow &External Interfaces"))), - `VSpacing (1), - // check box - `Left (`CheckBox (`id(`dmz), _("Allow &Demilitarized Zone"))), - `VSpacing (1) - )), - "init" : IfacesInit, - "store" : IfacesStore, - "help" : HELPS["iface_classes"]:"", - ]; -} - -// DDNS allowing widget - -/** - * Handle function of the widget - * @param id string widget id - * @param event map event that caused storing process - * @return symbol always nil - */ -global define symbol AllowDdnsHandle (string id, map event) ``{ - boolean enabled = (boolean)UI::QueryWidget (`id (id), `Value); - while (enabled && size (DnsTsigKeys::ListTSIGKeys ()) == 0) - { - // yes-no popup - if (! Popup::YesNo (_("No TSIG key is defined. Define it now?"))) - { - UI::ChangeWidget (`id (id), `Value, false); - UI::ChangeWidget (`id ("ddns_key"), `Enabled, false); - return nil; - } - return `ddns; - } - UI::ChangeWidget (`id ("ddns_key"), `Enabled, enabled); - return nil; -} - -/** - * Initialize the widget - * @param id any widget id - */ -global define void AllowDdnsInit (string id) ``{ - boolean allowed = false; - string key = nil; - list <map <string, any> > updater_keys_m = DnsTsigKeys::ListTSIGKeys (); - list<string> updater_keys = maplist (map m, updater_keys_m, ``( - m["key"]:"" - )); - UI::ReplaceWidget (`ddns_key_rp, - `ComboBox ( - `id ("ddns_key"), - `opt (`hstretch), - // combo box - _("TSIG &Key"), - updater_keys)); - foreach (map m, current_zone["options"]:[], ``{ - if (m["key"]:"" == "allow-update" && ! allowed) - { - key = regexpsub ( - m["value"]:"", - "^.*key[ \t]+([^ \t;]+)[ \t;]+.*$", - "\\1"); - if (key != nil) - { - allowed = true; - } - } - }); - UI::ChangeWidget (`id (id), `Value, allowed); - if (allowed) - { - UI::ChangeWidget (`id ("ddns_key"), `Value, key); - } - AllowDdnsHandle (id, $[]); -} - -/** - * Store settings of the widget - * @param id string widget id - * @param event map event that caused storing process - */ -global define void AllowDdnsStore (string id, map event) ``{ - current_zone["options"] = maplist (map m, current_zone["options"]:[], ``{ - if (m["key"]:"" == "allow-update" - && regexpmatch (m["value"]:"", "^.*key[ \t]+[^ \t;]+[ \t;]+.*$")) - { - return $[]; - } - return m; - }); - current_zone["options"] = filter (map m, current_zone["options"]:[], ``( - m != $[] - )); - string key = (string)UI::QueryWidget (`id ("ddns_key"), `Value); - boolean allowed = (boolean)UI::QueryWidget (`id (id), `Value); - if (allowed) - { - current_zone["options"] = add (current_zone["options"]:[], $[ - "key" : "allow-update", - "value" : sformat ("{ key %1; }", key), - ]); - } -} - -// generic stuff - - /** - * Create the wodgets description map - * @return the widgets description map - */ - global define map InitWidgets () ``{ - return $[ - "global_table" : getGlobalTableWidget (), - "zones" : getZoneListWidget (), - "master_table" : getMasterTableWidget (), - "start" : getStartWidget (), - "chroot" : getChrootWidget (), - "zone_direction" : getZoneDirectionWidget (), - "zone_type" : getZoneTypeWidget (), - "zone_name" : getZoneNameWidget (), - "soa" : getSoaWidget (), - "soa_button" : getSoaButton (), - "advanced_mbutton" : getAdvancedMenubutton (), - "ns_widget" : getNameServersWidget (), - "mx_widget" : getMailRelaysWidget (), -// "ns_mx_button" : getNsMxButton (), - "zone_masters" : getZoneMastersWidget (), - "interface_classes" : getIfaceClassesWidget (), -// "allow_ddns" : getAllowDdnsWidget (), -// "ddns_keys" : getDdnsKeysWidget (), - ]; - } - - /** - * Ask for exit without saving - * @return event that should be handled, nil if user canceled the exit - */ - global define boolean confirmAbort () ``{ - return Popup::YesNo ( - // Yes-No popup -_("All changes will be lost. -Really leave the DNS server configuration without saving?")); - } - - /** - * Check whether settings were changed and if yes, ask for exit - * without saving - * @return event that should be handled, nil if user canceled the exit - */ - global define boolean confirmAbortIfChanged () ``{ - if (! DnsServer::WasModified ()) - return true; - return confirmAbort (); - } - -/* EOF */ -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.6/VERSION new/yast2-dns-server-2.17.7/VERSION --- old/yast2-dns-server-2.17.6/VERSION 2008-08-11 12:13:44.000000000 +0200 +++ new/yast2-dns-server-2.17.7/VERSION 2008-08-28 15:04:57.000000000 +0200 @@ -1 +1 @@ -2.17.6 +2.17.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠Hilbert.suse.de 30 Aug '08

30 Aug '08

Hello community, here is the log from the commit of package yast2 checked in at Sat Aug 30 02:01:51 CEST 2008. -------- --- yast2/yast2.changes 2008-08-25 14:21:15.000000000 +0200 +++ yast2/yast2.changes 2008-08-28 13:40:00.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Aug 28 11:55:05 CEST 2008 - locilka(a)suse.cz + +- Adapted Popup, Confirm, CWM, ALog, GPGWidgets, NetworkPopup, + PackageCallbacks, SignatureCheckDialogs, FileChanges, Initrd, + and ModuleLoading libraries to use new YButtonBox widget + (FATE #303446). +- Adjusted RPM dependencies. +- 2.17.15 + +------------------------------------------------------------------- +Wed Aug 27 10:03:54 CEST 2008 - jsrain(a)suse.cz + +- added configuration files changes tracking in SNV as preview + +------------------------------------------------------------------- Old: ---- yast2-2.17.14.tar.bz2 New: ---- yast2-2.17.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.Z20922/_old 2008-08-30 01:58:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Z20922/_new 2008-08-30 01:58:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.17.14) +# spec file for package yast2 (Version 2.17.15) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2 -Version: 2.17.14 +Version: 2.17.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.17.14.tar.bz2 +Source0: yast2-2.17.15.tar.bz2 Prefix: /usr Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite @@ -35,7 +35,8 @@ # y2base foo -S (hello) UI, list:: namespace Requires: yast2-core >= 2.17.1 # Mod_UI -Requires: yast2-ycp-ui-bindings >= 2.16.44 +# new YButtonBox widget (fate #303446) +Requires: yast2-ycp-ui-bindings >= 2.17.3 # changed patch/message callbacks Requires: yast2-pkg-bindings >= 2.17.1 Requires: yast2_ui yast2_theme @@ -148,7 +149,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.17.14 +%setup -n yast2-2.17.15 %build %{prefix}/bin/y2tool y2autoconf @@ -252,6 +253,15 @@ %doc %{prefix}/share/doc/packages/yast2/types %doc %{prefix}/share/doc/packages/yast2/wizard %changelog +* Thu Aug 28 2008 locilka(a)suse.cz +- Adapted Popup, Confirm, CWM, ALog, GPGWidgets, NetworkPopup, + PackageCallbacks, SignatureCheckDialogs, FileChanges, Initrd, + and ModuleLoading libraries to use new YButtonBox widget + (FATE #303446). +- Adjusted RPM dependencies. +- 2.17.15 +* Wed Aug 27 2008 jsrain(a)suse.cz +- added configuration files changes tracking in SNV as preview * Mon Aug 25 2008 ug(a)suse.de - post-patterns for autoyast added - 2.17.14 ++++++ yast2-2.17.14.tar.bz2 -> yast2-2.17.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/configure new/yast2-2.17.15/configure --- old/yast2-2.17.14/configure 2008-08-25 14:11:26.000000000 +0200 +++ new/yast2-2.17.15/configure 2008-08-28 13:40:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2 2.17.14. +# Generated by GNU Autoconf 2.61 for yast2 2.17.15. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.17.14' -PACKAGE_STRING='yast2 2.17.14' +PACKAGE_VERSION='2.17.15' +PACKAGE_STRING='yast2 2.17.15' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1200,7 +1200,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 2.17.14 to adapt to many kinds of systems. +\`configure' configures yast2 2.17.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1271,7 +1271,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.17.14:";; + short | recursive ) echo "Configuration of yast2 2.17.15:";; esac cat <<\_ACEOF @@ -1349,7 +1349,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.17.14 +yast2 configure 2.17.15 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1363,7 +1363,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 $as_me 2.17.14, which was +It was created by yast2 $as_me 2.17.15, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2184,7 +2184,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.17.14' + VERSION='2.17.15' cat >>confdefs.h <<_ACEOF @@ -2412,7 +2412,7 @@ -VERSION="2.17.14" +VERSION="2.17.15" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3427,7 +3427,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.17.14, which was +This file was extended by yast2 $as_me 2.17.15, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3470,7 +3470,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.17.14 +yast2 config.status 2.17.15 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/configure.in new/yast2-2.17.15/configure.in --- old/yast2-2.17.14/configure.in 2008-08-25 14:11:19.000000000 +0200 +++ new/yast2-2.17.15/configure.in 2008-08-28 13:40:25.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.17.14, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.17.15, http://bugs.opensuse.org/, yast2) 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.17.14" +VERSION="2.17.15" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/data/sysconfig.yast2 new/yast2-2.17.15/data/sysconfig.yast2 --- old/yast2-2.17.14/data/sysconfig.yast2 2007-09-07 16:09:37.000000000 +0200 +++ new/yast2-2.17.15/data/sysconfig.yast2 2008-08-28 11:06:29.000000000 +0200 @@ -31,3 +31,24 @@ # mono: white-black # braille: for visually impaired Y2NCURSES_COLOR_THEME="" + +## Type: list(yes,no) +## Default: "no" +# Enable tracking of configuraiton changes in subversion repository +# This is EXPERIMENTAL and not all YaST modules do support it. +# Use at your own risk +STORE_CONFIG_IN_SUBVERSION="no" + +## Type: list(yes,no) +## Default: "no" +# Track all changes in all files in configuration directory +# If set to "no", YaST adds to the repository only files it changes +# itself and the first change of a particular configuration file +# gets lost (it can only be manually compared to the one in +# configuration file). +# If set to "yes", all files in the configuration directory +# are tracked in the subversion repository. This has big impact +# on start-up and finish times of YaST modules +# This option is experimental and not all YaST modules do support +# configuration tracking via subversion +SUBVERSION_ADD_DIRS_RECURSIVE="no" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/agents/cfg_yast2.scr new/yast2-2.17.15/library/agents/cfg_yast2.scr --- old/yast2-2.17.14/library/agents/cfg_yast2.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.17.15/library/agents/cfg_yast2.scr 2008-08-28 11:06:27.000000000 +0200 @@ -0,0 +1,17 @@ +/** + * File: + * cfg_yast2.scr + * Summary: + * SCR Agent for reading/writing /etc/sysconfig/yast2 + * using the sysconfig-agent + * + * $Id: cfg_displaymanager.scr 12455 2003-10-22 12:24:49Z visnov $ + * + * Read/Sets the values defined in <tt>/etc/sysconfig/yast2</tt> + * in an easy manner. + */ +.sysconfig.yast2 + +`ag_ini( + `SysConfigFile("/etc/sysconfig/yast2") +) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/cwm/src/CWM.ycp new/yast2-2.17.15/library/cwm/src/CWM.ycp --- old/yast2-2.17.14/library/cwm/src/CWM.ycp 2008-07-11 15:07:30.000000000 +0200 +++ new/yast2-2.17.15/library/cwm/src/CWM.ycp 2008-08-28 13:02:06.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routines for common widget manipulation * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: CWM.ycp 48978 2008-07-10 16:51:50Z mvidner $ + * $Id: CWM.ycp 50435 2008-08-28 11:02:06Z locilka $ * */ @@ -399,14 +399,9 @@ * @return the term (HBox) */ global define term OkCancelBox () ``{ - return `HBox ( - `HStretch (), - `PushButton (`id (`_tp_ok), `opt (`key_F10, `default), - Label::OKButton ()), - `HSpacing (1), - `PushButton (`id (`_tp_cancel), `opt (`key_F9), - Label::CancelButton ()), - `HStretch () + return `ButtonBox ( + `PushButton (`id (`_tp_ok), `opt (`key_F10, `default, `okButton), Label::OKButton ()), + `PushButton (`id (`_tp_cancel), `opt (`key_F9, `cancelButton), Label::CancelButton ()) ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/desktop/src/menu.ycp new/yast2-2.17.15/library/desktop/src/menu.ycp --- old/yast2-2.17.14/library/desktop/src/menu.ycp 2008-04-07 10:02:02.000000000 +0200 +++ new/yast2-2.17.15/library/desktop/src/menu.ycp 2008-08-28 13:02:06.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: NCurses Control Center * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: menu.ycp 45905 2008-04-01 06:46:58Z jsrain $ + * $Id: menu.ycp 50435 2008-08-28 11:02:06Z locilka $ * * Provides a list of available yast2 modules. This module is inteded for use * with ncurses, for X the yast2 control center should be used. @@ -75,11 +75,9 @@ ), `VSpacing(1.0), - `HBox( - `HSpacing(2), - `Left(`PushButton(`id(`help), `opt(`key_F1), Label::HelpButton())), - `Right(`PushButton(`id(`quit), `opt(`key_F9), Label::QuitButton())), - `HSpacing(2) + `ButtonBox ( + `PushButton(`id(`help), `opt(`key_F1, `helpButton), Label::HelpButton()), + `PushButton(`id(`quit), `opt(`key_F9, `cancelButton), Label::QuitButton()) ), `VSpacing(1) )); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/gpg/src/GPGWidgets.ycp new/yast2-2.17.15/library/gpg/src/GPGWidgets.ycp --- old/yast2-2.17.14/library/gpg/src/GPGWidgets.ycp 2007-05-21 12:23:57.000000000 +0200 +++ new/yast2-2.17.15/library/gpg/src/GPGWidgets.ycp 2008-08-28 12:14:05.000000000 +0200 @@ -318,10 +318,9 @@ `Heading(_("Enter Passphrase")), "ask_passphrase", `VSpacing(0.5), - `HBox( - `PushButton(`id(`ok), `opt(`default), Label::OKButton()), - `HSpacing(1), - `PushButton(`id(`cancel), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id (`ok), `opt (`default, `okButton, `key_F10), Label::OKButton()), + `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/log/src/ALog.ycp new/yast2-2.17.15/library/log/src/ALog.ycp --- old/yast2-2.17.14/library/log/src/ALog.ycp 2008-08-18 12:54:19.000000000 +0200 +++ new/yast2-2.17.15/library/log/src/ALog.ycp 2008-08-28 13:02:06.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Admin's Log, producing a summary of what YaST did to the system * Authors: Martin Vidner <mvidner(a)suse.cz> * - * $Id: ALog.ycp 49776 2008-08-06 13:50:01Z mvidner $ + * $Id: ALog.ycp 50435 2008-08-28 11:02:06Z locilka $ * FATE#303700 * TODO stability tag. * @@ -55,8 +55,10 @@ // TODO more lines? term d = `VBox( `InputField (`id (`val), label, ""), - `PushButton (`id (`ok), `opt (`default, `key_F10), Label::OKButton ()) - ); + `ButtonBox ( + `PushButton (`id (`ok), `opt (`default, `key_F10, `okButton), Label::OKButton ()) + ) + ); UI::OpenDialog (d); any ui = nil; do { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/modules/ConfigHistory.ycp new/yast2-2.17.15/library/modules/ConfigHistory.ycp --- old/yast2-2.17.14/library/modules/ConfigHistory.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.17.15/library/modules/ConfigHistory.ycp 2008-08-28 11:06:29.000000000 +0200 @@ -0,0 +1,475 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2008 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: modules/ConfigHistory.ycp + * Package: Maintain history of configuration files + * Summary: ConfigHistory settings, input and output functions + * Authors: Jiri Srain <jsrain(a)suse.cz> + * + * $Id: ConfigHistory.ycp 41350 2007-10-10 16:59:00Z dfiser $ + * + * Routines for tracking configuration files in a subversion repository + * + * Use: + * - at your module start, call ConfigHistory::Init(); which will initialize + * the repo if needed and also commits any uncommitted changes + * - at the module finish, call ConfigHistory::CommitChanges("module name"); + * which will commit the changes made to SVN with appropriate comment + * mentioning the module name in the log + * - to ensure all configuration files are in SVN after initialization, call + * ConfigHistory::InitFiles(["file1", "file2"]) immediatelly after calling + * Init(); which will ensure the changes made are tracked during the first + * run as well + * + * See also /etc/sysconfig/yast2, variables STORE_CONFIG_IN_SUBVERSION and + * SUBVERSION_ADD_DIRS_RECURSIVE + */ + +{ + +module "ConfigHistory"; +textdomain "config-history"; + +/** + * Location of SVN repo + */ +string history_location = "/var/lib/YaST2/config-history"; + +/** + * Location of timestamp for detecting changed files out of version control + */ +string changes_timestamp = "/var/lib/YaST2/config-history-timestamp"; + +/** + * Directories to put under version control + */ +list<string> log_directories = [ "/etc" ]; + +/** + * Is the SVN history active? + */ +boolean use_svn = nil; + +/** + * Always have whole subtree in SVN, not only files changed by YaST + */ +boolean store_whole_subtree = nil; + +/** + * Count of nested transactions (module calling another module) + */ +integer nested_transactions = 0; + +/** + * If true, force commit at the end of initialization/finalization + */ +boolean commit_needed = false; + +/** + * Is the SVN history in use? + * @return boolean true to log to SVN + */ +boolean UseSvn() { + if (use_svn == nil) { + use_svn = (string)SCR::Read (.sysconfig.yast2.STORE_CONFIG_IN_SUBVERSION) == "yes"; + y2milestone ("Using SVN for configuration files: %1", use_svn); + } + return use_svn; +} + +boolean Recursive() { + if (store_whole_subtree == nil) { + store_whole_subtree = (string)SCR::Read (.sysconfig.yast2.SUBVERSION_ADD_DIRS_RECURSIVE) == "yes"; + y2milestone ("Automatically store whole subtree: %1", store_whole_subtree); + } + return store_whole_subtree; +} + +/** + * Initialize a SVN repository for config files in /var/lib/YaST2 + * @return boolean true on success, false otherwise + */ +boolean InitSvnRepository() { + y2milestone ("Initializing repo at %1", history_location); + map out = (map)SCR::Execute (.target.bash_output, + sformat ("svnadmin create %1", history_location)); + if (out["exit"]:-1 != 0) { + y2error ("Failed to initialize SVN repository: %1", out["stderr"]:""); + return false; + } + out = (map)SCR::Execute (.target.bash_output, + sformat ("chown -R root:root %1; chmod -R g= %1; chmod -R o= %1", history_location)); + if (out["exit"]:-1 != 0) { + y2error ("Failed to set svn repo permissions: %1", out["stderr"]:""); + return false; + } + y2milestone ("Repo initialized"); + return true; +} + +/** + * Check the presence of SVN repo for storing changes + * @return boolean true if repo exists + */ +boolean CheckSvnRepository() { + y2milestone ("Checking repo presence"); + map out = (map)SCR::Execute (.target.bash_output, + sformat ("test -d %1", history_location)); + boolean ret = (out["exit"]:-1 == 0); + y2milestone ("Repo found: %1", ret); + return ret; +} + +/** + * Check whether repo has been deployed to the filesystem + * @return boolean true if yes (/.svn exists), false otherwise + */ +boolean CheckRepoLinked() { + y2milestone ("Checking whether repo is linked to root directory"); + map out = (map)SCR::Execute (.target.bash_output, + sformat ("test -d %1", "/.svn")); + boolean ret = (out["exit"]:-1 == 0); + y2milestone ("Repo linked: %1", ret); + return ret; +} + +/** + * Initialize predefined directories for SVN + * @param recursive boolean true to add whole directories incl. subtree, + * false to add directory itself only + * @return boolean true on success, false on failure + */ +boolean InitDirectories(boolean recursive) { + y2milestone ("Linking system with the repository; recursive: %1", recursive); + map out = (map)SCR::Execute (.target.bash_output, + sformat ("svn co file://%1 /", history_location)); + if (out["exit"]:-1 != 0) + { + y2error ("svn check out to root failed: %1", out["stderr"]:""); + return false; + } + boolean success = true; + foreach (string dir, log_directories, { + y2milestone ("Initializing directory %1", dir); + string params = recursive ? "" : "-N"; + out = (map)SCR::Execute (.target.bash_output, + sformat ("cd / ; svn add %2 %1", dir, params)); + if (out["exit"]:-1 != 0) + { + success = false; + y2error ("Failed to add directory %1: %2", dir, out["stderr"]:""); + } + }); + if (! success) + return false; + out = (map)SCR::Execute (.target.bash_output, + "cd / ; svn ci -m 'Initial check-in'"); + if (out["exit"]:-1 != 0) + { + y2error ("Initial check-in to repo failed: %1", out["stderr"]:""); + return false; + } + y2milestone ("Initial check-in succeeded"); + return true; +} + +/** + * Check for files in version control which had been changed but not committed + * @return boolean true on success + */ +boolean CheckUncommitedChanges() { + boolean success = true; + foreach (string dir, log_directories, { + y2milestone ("Checking for uncommitted changes in %1", dir); + map out = (map)SCR::Execute (.target.bash_output, sformat ( + "cd %1; svn st |grep '^M'", dir)); + if (out["exit"]:-1 == 1 && ! commit_needed) + { + y2milestone ("No uncommitted change detected"); + } + else + { + out = (map)SCR::Execute (.target.bash_output, sformat ( + "cd %1; svn ci -m 'Commit remaining changes before running YaST'", + dir)); + if (out["exit"]:-1 != 0) + { + success = false; + y2error ("Failed to commit changes in %1: %2", dir, out["stderr"]:""); + } + } + }); + y2milestone ("Commit successful: %1", success); + return success; +} + +/** + * Create a timestamp to find changed files which are not under version control + * @return boolean true on success + */ +boolean CreateTimeStamp() { + y2milestone ("Creating timestamp to detect changes"); + map out = (map)SCR::Execute (.target.bash_output, sformat ("touch %1", changes_timestamp)); + boolean ret = out["exit"]:-1 == 0; + y2milestone ("Success: %1", ret); + return ret; +} + +/** + * Check for changed files which are not under verison control (e.g. new created files) + * Schedule them for next commit + * @return boolean true on success, false on failure + */ +boolean CheckChangedFilesOutOfVersionControl() { + boolean success = true; + foreach (string dir, log_directories, { + y2milestone ("Checking for new files in %1", dir); + map out = (map)SCR::Execute (.target.bash_output, sformat ( + "find %1 -newer %2 -type f |grep -v '/\\.'", dir, changes_timestamp)); + if (out["exit"]:-1 == 1) + { + y2milestone ("No changes found"); + return; + } + string param = out["stdout"]:""; + list<string> files = splitstring (param, "\n"); + files = filter (string f, files, { return f != ""; }); + files = filter (string f, files, { + return 0 == (integer)SCR::Execute (.target.bash, sformat ( + "svn st %1 | grep '^?'", f)); + }); + commit_needed = commit_needed || (size (files) > 0); + if (size (files) > 0) { + param = mergestring (files, " "); + out = (map)SCR::Execute (.target.bash_output, sformat ( + "cd %1; svn add --parents %2", dir, param)); + if (out["exit"]:-1 != 0) + { + success = false; + y2error ("Failed to add changes: %1", out["stderr"]:""); + } + } + }); + SCR::Execute (.target.bash_output, sformat ("rm %1", changes_timestamp)); + return success; +} + +/** + * Find all files which are not under version control + * Schedule such files for next commit + * @return boolean true on success, false otherwise + */ +boolean CheckAllFilesOutOfVersionControl() { + boolean success = true; + y2milestone ("Adding all files out of version control"); + foreach (string dir, log_directories, { + map out = (map)SCR::Execute (.target.bash_output, sformat ( + "cd %1; svn add `svn st |grep '^?'|cut -d ' ' -f 7`", dir)); + if (out["exit"]:-1 != 0) + { + y2error ("Failed to add files in %1: %2", dir, out["stderr"]:""); + success = false; + } + }); + commit_needed = true; // TODO check if really necessary + y2milestone ("Finished successfuly: %1", success); + return success; +} + +/** + * Check for files which had been deleted, but are still in SVN + * Schedule such files for deletion with next commit + * @return boolean true on success, false otherwise + */ +boolean RemoveDeletedFiles() { + boolean success = true; + y2milestone ("Checking for removed files"); + foreach (string dir, log_directories, { + map out = (map)SCR::Execute (.target.bash_output, sformat ( + "cd %1; svn st |grep '^!'|cut -d ' ' -f 7", dir)); + if (out["exit"]:-1 != 0) + { + y2error ("Failed to check for deleted files in %1: %2", dir, out["stderr"]:""); + success = false; + return; + } + string filelist = out["stdout"]:""; + list<string> files = splitstring (filelist, " "); + files = filter (string f, files, { return f != ""; }); + if (size (files) == 0) + return; + filelist = mergestring (files, " "); + out = (map)SCR::Execute (.target.bash_output, sformat ( + "cd %1; svn rm %2", dir, filelist)); + if (out["exit"]:-1 != 0) + { + y2error ("Failed to remove files in %1: %2", dir, out["stderr"]:""); + success = false; + } + }); + commit_needed = true; // TODO check if really necessary + y2milestone ("Finished successfuly: %1", success); + return success; +} + +/** + * Do commit to subversion + * @return boolean tru eon success + */ +boolean DoCommit(string mod) { + y2milestone ("Committing changes"); + string arg = mergestring (log_directories, " "); + y2debug ("Directories to commit: %1", arg); + string log = sformat ("Changes by YaST module %1", mod); + map out = (map)SCR::Execute (.target.bash_output, sformat ( + "cd / ; svn ci -m '%1' %2", log, arg)); + boolean ret = out["exit"]:-1 == 0; + y2milestone ("Success: %1", ret); + return ret; +} + +/** + * Update check-out from SVN to avoid commit conflicts + * @return boolean true on success + */ +boolean UpdateCheckout() { + boolean success = true; + foreach (string dir, log_directories, { + y2milestone ("Updating configuration files in %1", dir); + map out = (map)SCR::Execute (.target.bash_output, sformat ( + "cd %1; svn up", dir)); + if (out["exit"]:-1 != 0) + { + y2error ("Failed to update %1 from SVN: %2", dir, out["stderr"]:""); + success = false; + } + }); + return success; +} + +/** + * Initialize before module is started + * Do not call CommitChanges unless Init returns true! + * @return boolean true on success, false on failure + */ +global boolean Init() { + if (! UseSvn()) + return true; + if (nested_transactions > 0) + { + nested_transactions = nested_transactions + 1; + y2milestone ("Skiping SVN initialization, translaction already in progress"); + return true; + } + //ensure the repo exists + if (! CheckSvnRepository ()) { + if (! InitSvnRepository()) + return false; + } + if (! CheckRepoLinked()) { + if (! InitDirectories(Recursive())) + return false; + } + if (Recursive()) { + CheckAllFilesOutOfVersionControl(); + } + RemoveDeletedFiles(); + if (! UpdateCheckout()) { + return false; + } + if (! CheckUncommitedChanges()) + return false; + if (! CreateTimeStamp()) + return false; + nested_transactions = nested_transactions + 1; + return true; +} + +/** + * Commit changes done by YaST into the SVN repo + * @param module_name string name of YaST module which does commit + * used only in the commit log + * @return boolean true on success, false on failure + */ +global boolean CommitChanges(string module_name) { + if (! UseSvn()) + return true; + nested_transactions = nested_transactions - 1; + if (nested_transactions > 0) + { + y2milestone ("Skipping commit, all nested transaction not yet finished"); + return true; + } + boolean success = true; + if (Recursive()) + success = CheckAllFilesOutOfVersionControl(); + else + success = CheckChangedFilesOutOfVersionControl(); + success = RemoveDeletedFiles() && success; + if (! UpdateCheckout()) { + success = false; + } + success = DoCommit(module_name) && success; + return true; +} + +/** + * Initialize specified files for version control; useful when + * not having whole directory under version control, but only + * relevant files + * @param files a list of files to add to repo (resp. ensure they are in) + * @return boolean true on success, false otherwise + */ +global boolean InitFiles(list<string> files) { + if (size (files) == 0) + return true; + if (! UseSvn()) + return true; + if (Recursive()) + return true; + if (nested_transactions == 0) + { + y2error ("InitFiles called before prior initialization"); + return false; + } + string filelist = mergestring (files, " "); + map out = (map)SCR::Execute (.target.bash_output, sformat ( + "svn add %1", filelist)); + if (out["exit"]:-1 != 0) { + y2error ("Failed to schedule files %1 for addition: %2", filelist, out["stderr"]:""); + return false; + } + boolean success = true; + foreach (string dir, log_directories, { + out = (map)SCR::Execute (.target.bash_output, sformat ( + "cd %1; svn ci -m 'Initial check-in of files to be changed'", dir)); + if (out["exit"]:-1 != 0) + { + y2error ("Failed to commit changes to %1: %2", dir, out["exit"]:""); + success = false; + } + }); + return success; +} + + +/* EOF */ +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/modules/Popup.ycp new/yast2-2.17.15/library/modules/Popup.ycp --- old/yast2-2.17.14/library/modules/Popup.ycp 2008-07-11 15:07:30.000000000 +0200 +++ new/yast2-2.17.15/library/modules/Popup.ycp 2008-08-28 11:56:14.000000000 +0200 @@ -7,7 +7,7 @@ * Arvin Schnell <arvin(a)suse.de> * Flags: Stable * - * $Id: Popup.ycp 48991 2008-07-11 11:55:54Z locilka $ + * $Id: Popup.ycp 50431 2008-08-28 09:56:14Z locilka $ * * Contains commonly used popup dialogs * for general usage, e.g. Popup::YesNo(), Popup::ContinueCancel(). @@ -165,13 +165,11 @@ integer width, integer height ) { - term button_box = `HBox( - `HStretch(), - `HWeight(1, `PushButton( `id(`stop), Label::StopButton())), - `HSpacing(2), - `HWeight(1, `PushButton( `id(`ok_msg), `opt(`default, `key_F10), Label::OKButton())), - `HStretch() + term button_box = `ButtonBox ( + `PushButton (`id (`stop), `opt (`customButton), Label::StopButton()), + `PushButton (`id (`ok_msg), `opt (`default, `okButton), Label::OKButton()) ); + UI::OpenDialog( `opt(`decorated), popupLayoutInternalTypeWithLabel( headline, message, icon_name, @@ -189,7 +187,7 @@ if (button == `stop) { - while(UI::UserInput() != `ok_msg){}; + while (UI::UserInput() != `ok_msg){}; break; } @@ -266,29 +264,18 @@ if ( focus == `focus_no ) { - yes_button = `PushButton( `id(`yes), - `opt (`key_F10), - yes_button_message ); - no_button = `PushButton( `id(`no_button), - `opt(`default, `key_F9), - no_button_message ); + yes_button = `PushButton (`id (`yes), `opt (`okButton), yes_button_message); + no_button = `PushButton (`id (`no_button), `opt(`default, `cancelButton), no_button_message); } else { - yes_button = `PushButton( `id(`yes), - `opt(`default, `key_F10), - yes_button_message); - no_button = `PushButton( `id(`no_button), - `opt (`key_F9), - no_button_message ); + yes_button = `PushButton (`id (`yes), `opt (`default, `okButton), yes_button_message); + no_button = `PushButton (`id (`no_button), `opt (`cancelButton), no_button_message); } - term button_box = `HBox( - `HStretch (), - `HWeight( 1, yes_button), - `HSpacing(2), - `HWeight( 1, no_button ), - `HStretch () + term button_box = `ButtonBox ( + yes_button, + no_button ); return button_box; } @@ -362,10 +349,9 @@ `HCenter( `Label(`id(`remaining_time), "" + timeout_seconds) ), - `HBox( - `PushButton(`id(`timed_stop), Label::StopButton() ), - `HSpacing(2), - `PushButton(`id(`timed_ok), `opt(`default, `key_F10), Label::OKButton() ) + `ButtonBox ( + `PushButton (`id (`timed_stop), `opt (`customButton), Label::StopButton()), + `PushButton (`id (`timed_ok), `opt (`default, `key_F10, `okButton), Label::OKButton()) ), `VSpacing(0.2) ) @@ -551,16 +537,21 @@ global define void LongText( string headline, term richtext, integer hdim, integer vdim ) { - UI::OpenDialog( `opt( `decorated ), - `HBox( `VSpacing(vdim), - `VBox (`HSpacing(hdim), - `Left(`Heading( headline )), - `VSpacing(0.2), - richtext, // scrolled text - `PushButton( `id(`ok), `opt(`default, `key_F10), Label::OKButton() ) - ) - ) - ); + UI::OpenDialog ( + `opt (`decorated), + `HBox ( + `VSpacing(vdim), + `VBox ( + `HSpacing(hdim), + `Left (`Heading (headline)), + `VSpacing(0.2), + richtext, // scrolled text + `ButtonBox ( + `PushButton (`id (`ok), `opt (`default, `key_F10, `okButton), Label::OKButton()) + ) + ) + ) + ); UI::SetFocus(`id(`ok ) ); @@ -590,16 +581,20 @@ { term yes_button = `PushButton ( `id (`ok), - ( focus == `focus_yes ? - `opt (`default, `key_F10) : - `opt (`key_F10) ), + (focus == `focus_yes ? + `opt (`default, `key_F10, `okButton) + : + `opt (`key_F10, `okButton) + ), yes_button_message); term no_button = `PushButton ( `id (`cancel), - ( focus == `focus_no ? - `opt (`default, `key_F9) : - `opt (`key_F9) ), + (focus == `focus_no ? + `opt (`default, `key_F9) + : + `opt (`key_F9) + ), no_button_message); term d = `HBox ( @@ -609,12 +604,13 @@ size (headline) > 0 ? `Left(`Heading( headline )) : `Empty (), `VSpacing(0.2), `RichText (richtext), - `HBox ( + `ButtonBox ( yes_button, no_button ) ) ); + UI::OpenDialog (`opt (`decorated), d); any ui = UI::UserInput (); UI::CloseDialog (); @@ -765,11 +761,12 @@ */ define void anyMessageDetailsInternalType(string headline, string message, string details, string icon_name, boolean richtext, integer width, integer height ) { - term button_box = `HBox ( - `PushButton (`id(`ok_msg), `opt (`default, `key_F10), Label::OKButton()), + term button_box = `ButtonBox ( + `PushButton (`id(`ok_msg), `opt (`default, `okButton), Label::OKButton()), // button label - `PushButton (`id(`details), `opt (`key_F6), _("&Details...")) + `PushButton (`id(`details), `opt (`key_F6, `customButton), _("&Details...")) ); + UI::OpenDialog ( `opt(`decorated), richtext ? popupLayoutInternalRich(headline, message, icon_name, button_box, width, height) @@ -789,7 +786,9 @@ `VSpacing (0.5), `RichText (mergestring(splitstring(String::EscapeTags(details), "\n"), " ")), `VSpacing (), - `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()) + `ButtonBox ( + `PushButton (`id (`ok), `opt (`default, `key_F10, `okButton), Label::OKButton()) + ) ) )); UI::UserInput(); @@ -811,7 +810,10 @@ */ define void anyMessageInternalType(string headline, string message, string icon_name, boolean richtext, integer width, integer height ) { - term button_box = `PushButton( `id(`ok_msg), `opt(`default, `key_F10), Label::OKButton() ); + term button_box = `ButtonBox ( + `PushButton (`id (`ok_msg), `opt (`default, `key_F10, `okButton), Label::OKButton()) + ); + UI::OpenDialog( `opt(`decorated), richtext ? popupLayoutInternalRich(headline, message, icon_name, button_box, width, height) : @@ -857,7 +859,10 @@ */ define void anyRichMessageInternal(string headline, string message, string icon_name, integer width, integer height ) { - term button_box = `PushButton( `id(`ok_msg), `opt(`default, `key_F10), Label::OKButton() ); + term button_box = `ButtonBox ( + `PushButton (`id(`ok_msg), `opt (`default, `key_F10), Label::OKButton()) + ); + UI::OpenDialog( `opt(`decorated), popupLayoutInternalRich( headline, message, icon_name, button_box, width, height ) @@ -1314,12 +1319,10 @@ `HCenter( `Label(`id(`remaining_time), "" + timeout_seconds) ), - `HBox( - `PushButton(`id(`timed_stop), Label::StopButton() ), - `HSpacing(2), - `PushButton(`id(`timed_ok), `opt(`default, `key_F10), Label::OKButton() ), - `HSpacing(2), - `PushButton(`id(`timed_cancel), `opt (`key_F9), Label::CancelButton() ) + `ButtonBox ( + `PushButton (`id (`timed_stop), `opt (`customButton), Label::StopButton()), + `PushButton (`id (`timed_ok), `opt (`default, `key_F10, `okButton), Label::OKButton()), + `PushButton (`id (`timed_cancel), `opt (`key_F9, `cancelButton), Label::CancelButton()) ), `VSpacing(0.2) ) @@ -1378,49 +1381,29 @@ term no_button = `Empty(); term retry_button = `Empty(); - if ( focus == `focus_no ) + if (focus == `focus_no) { - yes_button = `PushButton( `id(`yes), - `opt (`key_F10), - yes_button_message ); - no_button = `PushButton( `id(`no), - `opt(`default, `key_F9), - no_button_message ); - retry_button = `PushButton( `id(`retry), - `opt (`key_F6), - retry_button_message ); - } - else if ( focus == `focus_yes ) - { - yes_button = `PushButton(`id(`yes), - `opt(`default, `key_F10), - yes_button_message); - no_button = `PushButton( `id(`no), - `opt (`key_F9), - no_button_message ); - retry_button = `PushButton( `id(`retry), - `opt (`key_F6), - retry_button_message ); + yes_button = `PushButton (`id (`yes), `opt (`key_F10, `okButton), yes_button_message); + no_button = `PushButton (`id (`no), `opt(`default, `key_F9, `cancelButton), no_button_message); + retry_button = `PushButton (`id(`retry), `opt (`key_F6, `customButton), retry_button_message); + } + else if (focus == `focus_yes) + { + yes_button = `PushButton (`id(`yes), `opt(`default, `key_F10, `okButton), yes_button_message); + no_button = `PushButton (`id(`no), `opt (`key_F9, `cancelButton), no_button_message); + retry_button = `PushButton (`id(`retry), `opt (`key_F6, `customButton), retry_button_message); } else { - yes_button = `PushButton(`id(`yes), - `opt (`key_F10), - yes_button_message); - no_button = `PushButton( `id(`no), - `opt (`key_F9), - no_button_message ); - retry_button = `PushButton( `id(`retry), - `opt(`default, `key_F6), - retry_button_message ); - } - - term button_box = `HBox( - `HWeight( 1, yes_button), - `HSpacing(2), - `HWeight( 1, no_button ), - `HSpacing(2), - `HWeight( 1, retry_button ) + yes_button = `PushButton (`id (`yes), `opt (`key_F10, `okButton), yes_button_message); + no_button = `PushButton (`id (`no), `opt (`key_F9, `cancelButton), no_button_message); + retry_button = `PushButton (`id(`retry), `opt (`default, `key_F6, `customButton), retry_button_message); + } + + term button_box = `ButtonBox ( + yes_button, + no_button, + retry_button ); UI::OpenDialog( @@ -1460,11 +1443,11 @@ `VBox( `VSpacing(0.2), `Heading(text), - `HBox( - `PushButton(`id(`back), `opt (`key_F8), Label::BackButton() ), - `PushButton(`id(`again), `opt (`key_F6), Label::RetryButton() ), - `PushButton(`id(`cancel), `opt (`key_F9), Label::QuitButton() ), - `PushButton(`id(`next), `opt (`key_F10), Label::NextButton() ) + `ButtonBox ( + `PushButton(`id(`back), `opt (`key_F8, `customButton), Label::BackButton()), + `PushButton(`id(`again), `opt (`key_F6, `customButton), Label::RetryButton()), + `PushButton(`id(`cancel), `opt (`key_F9, `cancelButton), Label::QuitButton()), + `PushButton(`id(`next), `opt (`key_F10, `okButton), Label::NextButton()) ), `VSpacing(0.2) ), @@ -1542,7 +1525,9 @@ `VSpacing( 0.3 ), `Label(`id(`label), sformat("%1", timeout)), `VSpacing(0.2), - `PushButton(`id(`ok_msg), `opt(`default, `key_F10), Label::OKButton() ), + `ButtonBox ( + `PushButton(`id (`ok_msg), `opt(`default, `key_F10, `okButton), Label::OKButton()) + ), `VSpacing( 0.3 ) ) ); @@ -1595,8 +1580,11 @@ ) ), `VSpacing( 0.3 ), - `PushButton( `opt(`default, `key_F10), Label::OKButton() ), `VSpacing( 0.3 ) - ) + `ButtonBox ( + `PushButton (`opt (`default, `key_F10, `okButton), Label::OKButton()) + ), + `VSpacing (0.3) + ) ); UI::UserInput(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/modules/ValueBrowser.ycp new/yast2-2.17.15/library/modules/ValueBrowser.ycp --- old/yast2-2.17.14/library/modules/ValueBrowser.ycp 2008-03-31 16:09:41.000000000 +0200 +++ new/yast2-2.17.15/library/modules/ValueBrowser.ycp 2008-08-28 13:02:06.000000000 +0200 @@ -6,7 +6,7 @@ * Dan Vesely? * Flags: Unstable * - * $Id: ValueBrowser.ycp 44396 2008-02-12 15:52:28Z msvec $ + * $Id: ValueBrowser.ycp 50435 2008-08-28 11:02:06Z locilka $ */ { @@ -145,7 +145,9 @@ `VBox ( // translators: Tree header `Tree (`opt (`hstretch, `vstretch), _("&Variable"), [ items ]), - `PushButton (Label::OKButton()) + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton, `key_F10), Label::OKButton()) + ) ) ); UI::UserInput (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/modules/Version.ycp new/yast2-2.17.15/library/modules/Version.ycp --- old/yast2-2.17.14/library/modules/Version.ycp 2008-08-25 14:11:41.000000000 +0200 +++ new/yast2-2.17.15/library/modules/Version.ycp 2008-08-28 13:40:34.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.17.14"; +global string yast2 = "2.17.15"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/network/src/CWMFirewallInterfaces.ycp new/yast2-2.17.15/library/network/src/CWMFirewallInterfaces.ycp --- old/yast2-2.17.14/library/network/src/CWMFirewallInterfaces.ycp 2008-08-18 12:54:19.000000000 +0200 +++ new/yast2-2.17.15/library/network/src/CWMFirewallInterfaces.ycp 2008-08-28 13:02:06.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routines for selecting interfaces opened in firewall * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: CWMFirewallInterfaces.ycp 49934 2008-08-11 11:52:49Z kmachalkova $ + * $Id: CWMFirewallInterfaces.ycp 50435 2008-08-28 11:02:06Z locilka $ * * WARNING: If you want to use this functionality of this module * you should allways call 'SuSEFirewall::Read()' in the @@ -778,11 +778,9 @@ string help = CWM::MergeHelps (w); term contents = `VBox ( "firewall_ifaces", - `HBox ( - `HStretch (), - `PushButton (`id (`ok), Label::OKButton ()), - `PushButton (`id (`cancel), Label::CancelButton ()), - `HStretch () + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton, `key_F10), Label::OKButton ()), + `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton ()) ) ); contents = CWM::PrepareDialog (contents, w); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/network/src/NetworkPopup.ycp new/yast2-2.17.15/library/network/src/NetworkPopup.ycp --- old/yast2-2.17.14/library/network/src/NetworkPopup.ycp 2008-01-29 13:34:16.000000000 +0100 +++ new/yast2-2.17.15/library/network/src/NetworkPopup.ycp 2008-08-28 13:02:06.000000000 +0200 @@ -9,7 +9,7 @@ * Martin Vidner <mvidner(a)suse.cz> * Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: NetworkPopup.ycp 43882 2008-01-24 14:18:42Z mzugec $ + * $Id: NetworkPopup.ycp 50435 2008-08-28 11:02:06Z locilka $ * * Network browsing dialogs - all hosts, NFS servers, exports of the NFS server * @@ -69,11 +69,9 @@ `Table(`id(`items), `header(_("Device Type"),_("Device Name"),_("IP Address"),_("Device ID")), Items), `VSpacing(10) ), - `HBox ( - `PushButton (`id(`ok), `opt(`default, `key_F10), - Label::OKButton()), - `PushButton (`id(`cancel), `opt(`key_F9), - Label::CancelButton()) + `ButtonBox ( + `PushButton (`id(`ok), `opt(`default, `key_F10, `okButton), Label::OKButton()), + `PushButton (`id(`cancel), `opt(`key_F9, `cancelButton), Label::CancelButton()) ) )); UI::ChangeWidget(`id(`items), `CurrentItem, selected); @@ -116,11 +114,9 @@ `SelectionBox (`id (`items), title, Items), `VSpacing(10) ), - `HBox ( - `PushButton (`id(`ok), `opt(`default, `key_F10), - Label::OKButton()), - `PushButton (`id(`cancel), `opt(`key_F9), - Label::CancelButton()) + `ButtonBox ( + `PushButton (`id(`ok), `opt(`default, `key_F10, `okButton), Label::OKButton()), + `PushButton (`id(`cancel), `opt(`key_F9, `cancelButton), Label::CancelButton()) ) )); UI::SetFocus (`id (`items)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/packages/src/PackageCallbacks.ycp new/yast2-2.17.15/library/packages/src/PackageCallbacks.ycp --- old/yast2-2.17.14/library/packages/src/PackageCallbacks.ycp 2008-08-21 17:44:15.000000000 +0200 +++ new/yast2-2.17.15/library/packages/src/PackageCallbacks.ycp 2008-08-28 13:27:46.000000000 +0200 @@ -7,7 +7,7 @@ * * Purpose: provides the default Callbacks for Pkg:: * - * $Id: PackageCallbacks.ycp 50260 2008-08-21 11:11:22Z lslezak $ + * $Id: PackageCallbacks.ycp 50438 2008-08-28 11:27:45Z locilka $ * */ @@ -156,10 +156,8 @@ ) )), `ProgressBar(`id(`progress), "", 100, 0 ), - `HBox ( - `HStretch (), - `PushButton (`id (`abort), Label::AbortButton ()), - `HStretch () + `ButtonBox ( + `PushButton (`id (`abort), `opt (`key_F9, `cancelButton), Label::AbortButton ()) ) ); return progressbox; @@ -367,9 +365,11 @@ return "I"; } - term button_box = `HBox (`PushButton (`id(`abort), Label::AbortButton())); - button_box = add (button_box, `PushButton(`id(`retry), Label::RetryButton())); - button_box = add (button_box, `PushButton(`id(`ignore), Label::SkipButton())); + term button_box = `ButtonBox ( + `PushButton (`id(`abort), `opt (`cancelButton, `key_F9), Label::AbortButton()), + `PushButton (`id(`retry), `opt (`customButton), Label::RetryButton()), + `PushButton (`id(`ignore), `opt (`okButton), Label::SkipButton()) + ); if ( showLongInfo ) { @@ -579,9 +579,11 @@ } } else { - term button_box = `HBox (`PushButton (`id(`abort), Label::AbortButton()), - `PushButton(`id(`retry), Label::RetryButton()), - `PushButton(`id(`ignore), Label::IgnoreButton())); + term button_box = `ButtonBox ( + `PushButton (`id(`abort), `opt (`cancelButton), Label::AbortButton()), + `PushButton (`id(`retry), `opt (`commonButton), Label::RetryButton()), + `PushButton (`id(`ignore), `opt (`okButton), Label::IgnoreButton()) + ); if ( showLongInfo ) { @@ -790,18 +792,18 @@ // -------------------------------------- // build up button box - term button_box = `HBox (`PushButton (`id(`retry), `opt(`default), Label::RetryButton())); + term button_box = `ButtonBox (`PushButton (`id(`retry), `opt(`default, `commonButton), Label::RetryButton())); if (current == -1) // wrong media id, offer "Ignore" { - button_box = add (button_box, `PushButton(`id(`ignore), Label::IgnoreButton())); + button_box = add (button_box, `PushButton(`id(`ignore), `opt (`okButton), Label::IgnoreButton())); } - button_box = add (button_box, `PushButton (`id(`cancel), Label::AbortButton())); + button_box = add (button_box, `PushButton (`id(`cancel), `opt (`cancelButton), Label::AbortButton())); // push button label during media change popup, user can skip // this media (CD) so no packages from this media will be installed - button_box = add (button_box, `PushButton (`id(`skip), _("&Skip"))); + button_box = add (button_box, `PushButton (`id(`skip), `opt(`commonButton), _("&Skip"))); if (offer_eject_button) { @@ -1307,9 +1309,9 @@ UI::OpenDialog (`VBox ( `Label (message), `RichText(detail), - `HBox ( - `PushButton (`id (`RETRY), Label::RetryButton()), - `PushButton (`id (`ABORT), Label::AbortButton()) + `ButtonBox ( + `PushButton (`id (`RETRY), `opt (`okButton), Label::RetryButton()), + `PushButton (`id (`ABORT), `opt (`cancelButton), Label::AbortButton()) ) )); symbol ret = (symbol)UI::UserInput (); @@ -1423,9 +1425,9 @@ UI::OpenDialog (`VBox ( `Label (message), `RichText(detail), - `HBox ( - `PushButton (`id (`RETRY), Label::RetryButton()), - `PushButton (`id (`ABORT), Label::AbortButton()) + `ButtonBox ( + `PushButton (`id (`RETRY), `opt (`okButton), Label::RetryButton()), + `PushButton (`id (`ABORT), `opt (`cancelButton), Label::AbortButton()) ) )); symbol ret = (symbol)UI::UserInput (); @@ -1517,8 +1519,8 @@ `Label (message), `RichText(detail), `HBox ( - `PushButton (`id (`RETRY), Label::RetryButton()), - `PushButton (`id (`ABORT), Label::AbortButton()) + `PushButton (`id (`RETRY), `opt (`okButton), Label::RetryButton()), + `PushButton (`id (`ABORT), `opt (`cancelButton), Label::AbortButton()) ) )); symbol ret = (symbol)UI::UserInput (); @@ -1699,7 +1701,9 @@ // label `LogView(`id(`log), _("Output of the Script"), 10, 0), - `PushButton(`id(`abort), `opt(`default, `key_F9), Label::AbortButton()) + `ButtonBox ( + `PushButton(`id(`abort), `opt(`default, `key_F9, `cancelButton), Label::AbortButton()) + ) ); if (_script_popup) @@ -1814,10 +1818,9 @@ Note: If the refresh is skipped some packages might be missing or out of date.")), - `HBox( - `PushButton(`id(`continue), `opt(`default), Label::ContinueButton()), - `HSpacing(2), - `PushButton(`id(`skip), _("Skip Refresh")) + `ButtonBox ( + `PushButton (`id(`continue), `opt (`default, `okButton), Label::ContinueButton()), + `PushButton (`id(`skip), `opt (`commonButton), _("Skip Refresh")) ) ) ) @@ -1874,10 +1877,8 @@ `HSpacing(1) ), `VSpacing(0.5), - `HBox ( - `HStretch (), - `PushButton (`id (`abort), Label::AbortButton ()), - `HStretch () + `ButtonBox ( + `PushButton (`id (`abort), `opt (`cancelButton), Label::AbortButton ()) ), `VSpacing(0.5) ) @@ -2322,11 +2323,11 @@ boolean show_details = false; - term button_box = `HBox + term button_box = `ButtonBox ( - `PushButton (`id(`abort), Label::AbortButton()), - `PushButton(`id(`retry), Label::RetryButton()), - `PushButton(`id(`ignore), Label::IgnoreButton()) + `PushButton (`id (`abort), `opt (`cancelButton), Label::AbortButton()), + `PushButton (`id (`retry), `opt (`commonButton), Label::RetryButton()), + `PushButton (`id (`ignore), `opt (`okButton), Label::IgnoreButton()) ); UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 1, false) ); @@ -2433,10 +2434,9 @@ `HSpacing(1) ), `VSpacing(0.5), - `HBox( - `PushButton (`id(`cont), `opt(`default), Label::ContinueButton()), - `HSpacing(1), - `PushButton(`id(`cancel), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id(`cont), `opt (`default, `okButton), Label::ContinueButton()), + `PushButton(`id(`cancel), `opt (`cancelButton), Label::CancelButton()) ), `VSpacing(0.5) ); @@ -2522,7 +2522,9 @@ (in_percent) ? `ProgressBar (`id (`progress_widget), task, 100, val_percent) : `BusyIndicator(`id(`progress_widget), task, 3000), `VSpacing(0.2), - `PushButton (`id (`abort), Label::AbortButton ()), + `ButtonBox ( + `PushButton (`id (`abort), `opt (`cancelButton), Label::AbortButton ()) + ), `VSpacing(0.5) ), `HSpacing(1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/packages/src/SignatureCheckDialogs.ycp new/yast2-2.17.15/library/packages/src/SignatureCheckDialogs.ycp --- old/yast2-2.17.14/library/packages/src/SignatureCheckDialogs.ycp 2008-04-07 10:02:02.000000000 +0200 +++ new/yast2-2.17.15/library/packages/src/SignatureCheckDialogs.ycp 2008-08-28 13:31:58.000000000 +0200 @@ -271,18 +271,17 @@ * @return term with buttons */ term YesNoButtons (symbol default_button) { - term yes_button = `PushButton(`id(`yes), Label::YesButton()); - term no_button = `PushButton(`id(`no), Label::NoButton()); + term yes_button = `PushButton(`id(`yes), `opt (`okButton, `key_F10), Label::YesButton()); + term no_button = `PushButton(`id(`no), `opt (`cancelButton, `key_F9), Label::NoButton()); if (default_button == `yes) { - yes_button = `PushButton(`id(`yes), `opt(`default), Label::YesButton()); + yes_button = `PushButton(`id(`yes), `opt(`default, `okButton, `key_F10), Label::YesButton()); } else { - no_button = `PushButton(`id(`no), `opt(`default), Label::NoButton()); + no_button = `PushButton(`id(`no), `opt(`default, `cancelButton, `key_F9), Label::NoButton()); } - return `HBox ( + return `ButtonBox ( yes_button, - `HSpacing(2), no_button ); } @@ -654,9 +653,8 @@ `MarginBox(0.5, 0.5, `Label(description_text)), `HBox ( // push button - `PushButton(`id(`trust), _("&Trust and Import the Key")), - `HSpacing(1), - `PushButton(`id(`skip), Label::SkipButton()) + `PushButton(`id(`trust), `opt(`okButton, `key_F10), _("&Trust and Import the Key")), + `PushButton(`id(`skip), `opt (`cancelButton, `key_F9), Label::SkipButton()) ) ) ); @@ -757,15 +755,11 @@ ), // dialog buttons `Bottom( - `HBox ( + `ButtonBox ( // push button - `PushButton(`id(`import), _("&Import")), - `HSpacing(1), + `PushButton (`id (`import), `opt (`okButton, `key_F10), _("&Import")), // push button - //`PushButton(`id(`details), _("&Details...")), - //`HSpacing(1), - // push button - `PushButton(`id(`dont_import), _("Do &Not Import")) + `PushButton (`id (`dont_import), `opt (`cancelButton, `key_F9), _("Do &Not Import")) ) ) ) @@ -863,15 +857,11 @@ ), // dialog buttons `Bottom( - `HBox ( - // push button - `PushButton(`id(`import), _("&Import")), - `HSpacing(1), + `ButtonBox ( // push button - //`PushButton(`id(`details), _("&Details...")), - //`HSpacing(1), + `PushButton(`id(`import), `opt (`key_F10, `okButton), _("&Import")), // push button - `PushButton(`id(`dont_import), _("Do &Not Import")) + `PushButton(`id(`dont_import), `opt (`key_F9, `cancelButton), _("Do &Not Import")) ) ) ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/system/src/FileChanges.ycp new/yast2-2.17.15/library/system/src/FileChanges.ycp --- old/yast2-2.17.14/library/system/src/FileChanges.ycp 2008-07-11 15:07:30.000000000 +0200 +++ new/yast2-2.17.15/library/system/src/FileChanges.ycp 2008-08-28 13:34:54.000000000 +0200 @@ -167,8 +167,10 @@ term content = `VBox( `Label(msg), `Left(`CheckBox(`id(`disable), _("Do not show this message anymore"))), - `HBox(`PushButton(`id(`ok), Label::ContinueButton()), - `PushButton(`id(`cancel), Label::CancelButton())) + `ButtonBox ( + `PushButton(`id(`ok), `opt (`okButton), Label::ContinueButton()), + `PushButton(`id(`cancel), `opt (`cancelButton), Label::CancelButton()) + ) ); UI::OpenDialog(content); UI::SetFocus(`ok); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/system/src/Initrd.ycp new/yast2-2.17.15/library/system/src/Initrd.ycp --- old/yast2-2.17.14/library/system/src/Initrd.ycp 2008-08-25 12:56:10.000000000 +0200 +++ new/yast2-2.17.15/library/system/src/Initrd.ycp 2008-08-28 13:39:08.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: Initrd.ycp 50302 2008-08-22 08:19:25Z jsrain $ + * $Id: Initrd.ycp 50440 2008-08-28 11:39:07Z locilka $ * */ { @@ -332,7 +332,9 @@ // heading `Heading(header), text, // e.g. `Richtext() - `PushButton( `id(`ok_help), `opt(`default), Label::OKButton() ) + `ButtonBox ( + `PushButton( `id(`ok_help), `opt(`default, `okButton), Label::OKButton()) + ) ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/system/src/ModuleLoading.ycp new/yast2-2.17.15/library/system/src/ModuleLoading.ycp --- old/yast2-2.17.14/library/system/src/ModuleLoading.ycp 2007-05-21 12:23:40.000000000 +0200 +++ new/yast2-2.17.15/library/system/src/ModuleLoading.ycp 2008-08-28 13:39:08.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: * This module does all module loading stuff. * - * $Id: ModuleLoading.ycp 25850 2005-10-10 13:38:49Z mvidner $ + * $Id: ModuleLoading.ycp 50440 2008-08-28 11:39:07Z locilka $ */ { module "ModuleLoading"; @@ -168,14 +168,11 @@ `Left(`TextEntry(`id(`mod_name), _("&Driver/Module to load"), modulename+" "+moduleargs)) ) ) - ), - `HSquash( - `HBox( - `HWeight( 1, `PushButton(`id(`ok_msg), `opt(`default), Label::OKButton())), - `HSpacing(2), - `HWeight( 1, `PushButton(`id(`cancel_msg), Label::CancelButton())) - ) - ), + ), + `ButtonBox ( + `PushButton (`id (`ok_msg), `opt (`default, `okButton, `key_F10), Label::OKButton()), + `PushButton (`id (`cancel_msg), `opt (`cancelButton, `key_F9), Label::CancelButton()) + ), `VSpacing(0.2) ) ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/wizard/src/Confirm.ycp new/yast2-2.17.15/library/wizard/src/Confirm.ycp --- old/yast2-2.17.14/library/wizard/src/Confirm.ycp 2008-03-31 16:09:39.000000000 +0200 +++ new/yast2-2.17.15/library/wizard/src/Confirm.ycp 2008-08-28 11:56:14.000000000 +0200 @@ -9,7 +9,7 @@ * * Flags: Stable * - * $Id: Confirm.ycp 44622 2008-02-19 09:44:08Z mzugec $ + * $Id: Confirm.ycp 50431 2008-08-28 09:56:14Z locilka $ */ { @@ -65,12 +65,11 @@ `HVCenter(`Heading(class)), `VSpacing(0.5) ))), - `HSquash(`HBox( - `HWeight(1, `PushButton(`id(`continue), `opt(`default), Label::ContinueButton())), - `HSpacing(2), + `ButtonBox ( + `HWeight (1, `PushButton (`id(`continue), `opt(`default, `okButton), Label::ContinueButton())), /* PushButton label */ - `HWeight(1, `PushButton(`id(`skip), _("&Skip"))) - )), + `HWeight (1, `PushButton (`id(`skip, `cancelButton), _("&Skip"))) + ), `VSpacing(0.2) ))), `HSpacing(1) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/library/wizard/src/Wizard.ycp new/yast2-2.17.15/library/wizard/src/Wizard.ycp --- old/yast2-2.17.14/library/wizard/src/Wizard.ycp 2008-08-18 12:54:20.000000000 +0200 +++ new/yast2-2.17.15/library/wizard/src/Wizard.ycp 2008-08-28 12:06:22.000000000 +0200 @@ -169,13 +169,11 @@ **/ global term AbortApplyFinishButtonBox() { - return `HBox( - `PushButton(`id(`abort ), Label::AbortButton() ), - `HStretch(), + return `ButtonBox ( + `PushButton (`id (`abort, `cancelButton, `key_F9), Label::AbortButton()), // button text - `PushButton(`id(`apply), _("&Apply") ), - `HStretch(), - `PushButton(`id(`finish), Label::FinishButton() ) + `PushButton (`id (`apply, `applyButton), _("&Apply")), + `PushButton (`id (`finish, `okButton, `key_F10), Label::FinishButton()) ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.14/VERSION new/yast2-2.17.15/VERSION --- old/yast2-2.17.14/VERSION 2008-08-25 14:10:48.000000000 +0200 +++ new/yast2-2.17.15/VERSION 2008-08-28 13:39:35.000000000 +0200 @@ -1 +1 @@ -2.17.14 +2.17.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server
by root＠Hilbert.suse.de 29 Aug '08

29 Aug '08

Hello community, here is the log from the commit of package xorg-x11-server checked in at Sat Aug 30 01:57:47 CEST 2008. -------- --- xorg-x11-server/xorg-x11-server.changes 2008-08-08 11:00:02.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2008-08-28 12:47:02.772422887 +0200 @@ -1,0 +2,6 @@ +Thu Aug 28 12:46:01 CEST 2008 - sndirsch(a)suse.de + +- commit-5930aeb.diff/commit-78f50cd.diff + * obsoletes reverting of Mesa commit 1724334 (bfo #17069) + +------------------------------------------------------------------- New: ---- commit-5930aeb.diff commit-78f50cd.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.B17762/_old 2008-08-30 01:57:09.000000000 +0200 +++ /var/tmp/diff_new_pack.B17762/_new 2008-08-30 01:57:09.000000000 +0200 @@ -29,7 +29,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 141 +Release: 156 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -98,6 +98,8 @@ Patch116: ppc.diff Patch117: acpi-warning.diff Patch118: exa-greedy.diff +Patch119: commit-5930aeb.diff +Patch120: commit-78f50cd.diff %description This package contains the X.Org Server. @@ -216,6 +218,8 @@ %endif %patch117 %patch118 -p1 +%patch119 -p1 +%patch120 -p1 %build pushd xorg-docs-* @@ -530,6 +534,9 @@ %endif %changelog +* Thu Aug 28 2008 sndirsch(a)suse.de +- commit-5930aeb.diff/commit-78f50cd.diff + * obsoletes reverting of Mesa commit 1724334 (bfo #17069) * Fri Aug 08 2008 sndirsch(a)suse.de - commit-50e80c3.diff obsolete now (bnc #415680) - commit-f6401f9.diff obsolete ++++++ commit-5930aeb.diff ++++++ commit 5930aeb45e3849df6fc9abf7373599936d515ffa Author: Dave Miller <davem(a)davemloft.net> Date: Sat Aug 9 16:45:59 2008 +1000 glx: fix crash in driGetConfigAttribIndex Don't access GLboolean via int pointers diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c index 13725ae..3285835 100644 --- a/glx/glxdricommon.c +++ b/glx/glxdricommon.c @@ -164,6 +164,10 @@ createModeFromConfig(const __DRIcoreExtension *core, if (value & __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT) config->config.bindToTextureTargets |= GLX_TEXTURE_RECTANGLE_BIT_EXT; break; + case __DRI_ATTRIB_FLOAT_MODE: + config->config.floatMode = (value ? GL_TRUE : GL_FALSE); + break; + default: setScalar(&config->config, attrib, value); break; ++++++ commit-78f50cd.diff ++++++ commit 78f50cd5758d778a5b01aa607c04919b69a5a47f Author: Kristian Høgsberg <krh(a)redhat.com> Date: Tue Aug 26 10:58:35 2008 -0400 Fix driGetConfigAttribIndex unaligned access to GLboolean. We don't actually send the float mode so just drop it. Drop a couple of other unused or redundant fields from GLXconfig. diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 0831135..95221a7 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -907,7 +907,7 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc) p = 0; buf[p++] = modes->visualID; buf[p++] = glxConvertToXVisualType( modes->visualType ); - buf[p++] = modes->rgbMode; + buf[p++] = (modes->renderType & GLX_RGBA_BIT) ? GL_TRUE : GL_FALSE; buf[p++] = modes->redBits; buf[p++] = modes->greenBits; @@ -959,7 +959,7 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc) return Success; } -#define __GLX_TOTAL_FBCONFIG_ATTRIBS (35) +#define __GLX_TOTAL_FBCONFIG_ATTRIBS (36) #define __GLX_FBCONFIG_ATTRIBS_LENGTH (__GLX_TOTAL_FBCONFIG_ATTRIBS * 2) /** * Send the set of GLXFBConfigs to the client. There is not currently @@ -1011,7 +1011,9 @@ DoGetFBConfigs(__GLXclientState *cl, unsigned screen) WRITE_PAIR( GLX_FBCONFIG_ID, modes->fbconfigID ); WRITE_PAIR( GLX_X_RENDERABLE, GL_TRUE ); - WRITE_PAIR( GLX_RGBA, modes->rgbMode ); + WRITE_PAIR( GLX_RGBA, + (modes->renderType & GLX_RGBA_BIT) ? GL_TRUE : GL_FALSE ); + WRITE_PAIR( GLX_RENDER_TYPE, modes->renderType ); WRITE_PAIR( GLX_DOUBLEBUFFER, modes->doubleBufferMode ); WRITE_PAIR( GLX_STEREO, modes->stereoMode ); diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c index 3285835..faaa3b7 100644 --- a/glx/glxdricommon.c +++ b/glx/glxdricommon.c @@ -88,7 +88,6 @@ static const struct { unsigned int attrib, offset; } attribMap[] = { __ATTRIB(__DRI_ATTRIB_TRANSPARENT_GREEN_VALUE, transparentGreen), __ATTRIB(__DRI_ATTRIB_TRANSPARENT_BLUE_VALUE, transparentBlue), __ATTRIB(__DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE, transparentAlpha), - __ATTRIB(__DRI_ATTRIB_FLOAT_MODE, floatMode), __ATTRIB(__DRI_ATTRIB_RED_MASK, redMask), __ATTRIB(__DRI_ATTRIB_GREEN_MASK, greenMask), __ATTRIB(__DRI_ATTRIB_BLUE_MASK, blueMask), @@ -136,16 +135,11 @@ createModeFromConfig(const __DRIcoreExtension *core, while (core->indexConfigAttrib(driConfig, i++, &attrib, &value)) { switch (attrib) { case __DRI_ATTRIB_RENDER_TYPE: - if (value & __DRI_ATTRIB_RGBA_BIT) { + config->config.renderType = 0; + if (value & __DRI_ATTRIB_RGBA_BIT) config->config.renderType |= GLX_RGBA_BIT; - config->config.rgbMode = GL_TRUE; - } else if (value & __DRI_ATTRIB_COLOR_INDEX_BIT) { + if (value & __DRI_ATTRIB_COLOR_INDEX_BIT) config->config.renderType |= GLX_COLOR_INDEX_BIT; - config->config.rgbMode = GL_FALSE; - } else { - config->config.renderType = 0; - config->config.rgbMode = GL_FALSE; - } break; case __DRI_ATTRIB_CONFIG_CAVEAT: if (value & __DRI_ATTRIB_NON_CONFORMANT_CONFIG) @@ -164,10 +158,6 @@ createModeFromConfig(const __DRIcoreExtension *core, if (value & __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT) config->config.bindToTextureTargets |= GLX_TEXTURE_RECTANGLE_BIT_EXT; break; - case __DRI_ATTRIB_FLOAT_MODE: - config->config.floatMode = (value ? GL_TRUE : GL_FALSE); - break; - default: setScalar(&config->config, attrib, value); break; diff --git a/glx/glxscreens.h b/glx/glxscreens.h index 39d162d..ea47db4 100644 --- a/glx/glxscreens.h +++ b/glx/glxscreens.h @@ -58,16 +58,9 @@ void __glXSwapBarrierInit(int screen, __GLXSwapBarrierExtensionFuncs *funcs); typedef struct __GLXconfig __GLXconfig; struct __GLXconfig { __GLXconfig *next; - GLboolean rgbMode; - GLboolean floatMode; - GLboolean colorIndexMode; GLuint doubleBufferMode; GLuint stereoMode; - GLboolean haveAccumBuffer; - GLboolean haveDepthBuffer; - GLboolean haveStencilBuffer; - GLint redBits, greenBits, blueBits, alphaBits; /* bits per comp */ GLuint redMask, greenMask, blueMask, alphaMask; GLint rgbBits; /* total bits for rgb */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-libXau
by root＠Hilbert.suse.de 29 Aug '08

29 Aug '08

Hello community, here is the log from the commit of package xorg-x11-libXau checked in at Sat Aug 30 01:56:58 CEST 2008. -------- --- xorg-x11-libXau/xorg-x11-libXau.changes 2008-04-10 13:00:58.000000000 +0200 +++ xorg-x11-libXau/xorg-x11-libXau.changes 2008-08-27 10:32:21.151665809 +0200 @@ -1,0 +2,10 @@ +Wed Aug 27 10:31:34 CEST 2008 - sndirsch(a)suse.de + +- libXau 1.0.4 + * SVR4 (including Solaris) puts gethostbyname_r in libnsl instead + of libc + * Bug 17314: libXau's Makefile.am should have proper man creation + rules + * Bug #11097: libXau COPYING fix (add missing copyright dates) + +------------------------------------------------------------------- Old: ---- libXau-1.0.3.tar.bz2 New: ---- libXau-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libXau.spec ++++++ --- /var/tmp/diff_new_pack.p16185/_old 2008-08-30 01:56:17.000000000 +0200 +++ /var/tmp/diff_new_pack.p16185/_new 2008-08-30 01:56:17.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package xorg-x11-libXau (Version 7.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,11 +19,11 @@ Name: xorg-x11-libXau -%define dirsuffix 1.0.3 +%define dirsuffix 1.0.4 BuildRequires: pkgconfig xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 33 +Release: 64 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -96,6 +103,13 @@ %{_mandir}/man3/* %changelog +* Wed Aug 27 2008 sndirsch(a)suse.de +- libXau 1.0.4 + * SVR4 (including Solaris) puts gethostbyname_r in libnsl instead + of libc + * Bug 17314: libXau's Makefile.am should have proper man creation + rules + * Bug #11097: libXau COPYING fix (add missing copyright dates) * Thu Apr 10 2008 ro(a)suse.de - added baselibs.conf file to build xxbit packages for multilib support ++++++ libXau-1.0.3.tar.bz2 -> libXau-1.0.4.tar.bz2 ++++++ ++++ 20234 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/libXau-1.0.3/ChangeLog new/libXau-1.0.4/ChangeLog --- old/libXau-1.0.3/ChangeLog 2006-12-16 00:19:01.000000000 +0100 +++ new/libXau-1.0.4/ChangeLog 2008-08-26 23:20:12.000000000 +0200 @@ -1,3 +1,33 @@ +commit 7f6275300243fd15ce974d1b5e478b47f7758485 +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Tue Aug 26 14:19:19 2008 -0700 + + Version bump: 1.0.4 + +commit 753bf38ceca4a0c8d6c6c1845b4387e4b3c9e4f0 +Author: Damien Th?bault <damien.thebault(a)gmail.com> +Date: Tue Aug 26 14:16:44 2008 -0700 + + Bug 17314: libXau's Makefile.am should have proper man creation rules + + X.Org Bugzilla #17314 <http://bugs.freedesktop.org/show_bug.cgi?id=17314> + Patch #18528 <http://bugs.freedesktop.org/attachment.cgi?id=18528> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com> + +commit a0b2aac596ea2cbe4d0ec1ef8c406ad98f0c499d +Author: Alan Coopersmith <alan.coopersmith(a)sun.com> +Date: Tue Jul 8 15:08:35 2008 -0700 + + SVR4 (including Solaris) puts gethostbyname_r in libnsl instead of libc + +commit 1bc9f04963a8a236cc190e75e32282774b556932 +Author: Daniel Drake <ddrake(a)brontes3d.com> +Date: Tue May 29 14:06:00 2007 -0800 + + Bug #11097: libXau COPYING fix (add missing copyright dates) + + X.Org Bugzilla #11097 <https://bugs.freedesktop.org/show_bug.cgi?id=11097> + commit 45d137fdbb9b21513aff68e945e19cdfdcbc28b1 Author: Daniel Stone <daniel(a)fooishbar.org> Date: Sat Dec 16 01:18:20 2006 +0200 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/libXau-1.0.3/configure.ac new/libXau-1.0.4/configure.ac --- old/libXau-1.0.3/configure.ac 2006-12-16 00:18:14.000000000 +0100 +++ new/libXau-1.0.4/configure.ac 2008-08-26 23:18:15.000000000 +0200 @@ -24,7 +24,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(libXau, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau) +AC_INIT(libXau, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],libXau) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -55,8 +55,14 @@ if test "x$xthreads" = "xyes" ; then AC_DEFINE(XTHREADS,1,[Whether libXau is compiled with thread support]) - AC_CHECK_LIB(c, gethostbyname_r, AC_DEFINE(XUSE_MTSAFE_API,1, - [Whether libXau needs to use MT safe API's])) + AC_CHECK_LIB(c, gethostbyname_r, [mtsafe=yes]) + if test "x$mtsafe" = "x" ; then + AC_CHECK_LIB(nsl, gethostbyname_r, [mtsafe=yes]) + fi + if test "x$mtsafe" = "xyes" ; then + AC_DEFINE(XUSE_MTSAFE_API, 1, + [Whether libXau needs to use MT safe API's]) + fi dnl XXX incomplete, please fill this in case $host_os in 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/libXau-1.0.3/COPYING new/libXau-1.0.4/COPYING --- old/libXau-1.0.3/COPYING 2006-12-06 17:09:19.000000000 +0100 +++ new/libXau-1.0.4/COPYING 2007-08-22 02:21:56.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright 1988, 1998 The Open Group +Copyright 1988, 1993, 1994, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that 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/libXau-1.0.3/Makefile.am new/libXau-1.0.4/Makefile.am --- old/libXau-1.0.3/Makefile.am 2006-12-06 17:53:14.000000000 +0100 +++ new/libXau-1.0.4/Makefile.am 2008-08-26 23:09:57.000000000 +0200 @@ -56,7 +56,7 @@ libmandir = $(LIB_MAN_DIR) libman_PRE = Xau.man -BUILT_SOURCES = shadows.DONE +BUILT_SOURCES = $(Xau_shadows:=.@LIB_MAN_SUFFIX@) CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) $(lintlib_DATA) libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ $(Xau_shadows:=.@LIB_MAN_SUFFIX@) @@ -73,12 +73,9 @@ XauGetAuthByAddr \ XauGetBestAuthByAddr -shadows.DONE: - -rm -f $(Xau_shadows:=.@LIB_MAN_SUFFIX@) - (for i in $(Xau_shadows:=.@LIB_MAN_SUFFIX@) ; do \ - echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $$i; \ - done) - touch shadows.DONE +Xau_shadows_man = $(Xau_shadows:=.@LIB_MAN_SUFFIX@) +$(Xau_shadows_man): + echo .so man$(LIB_MAN_DIR_SUFFIX)/Xau.$(LIB_MAN_SUFFIX) > $@ XORGRELSTRING = @PACKAGE_STRING@ XORGMANNAME = X Version 11 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/libXau-1.0.3/missing new/libXau-1.0.4/missing --- old/libXau-1.0.3/missing 2006-12-16 00:18:54.000000000 +0100 +++ new/libXau-1.0.4/missing 2008-08-26 23:19:54.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-libs
by root＠Hilbert.suse.de 29 Aug '08

29 Aug '08

Hello community, here is the log from the commit of package xorg-x11-libs checked in at Sat Aug 30 01:49:17 CEST 2008. -------- --- xorg-x11-libs/xorg-x11-libs.changes 2008-08-01 12:38:17.000000000 +0200 +++ xorg-x11-libs/xorg-x11-libs.changes 2008-08-29 15:33:16.272564759 +0200 @@ -1,0 +2,6 @@ +Fri Aug 29 15:32:41 CEST 2008 - sndirsch(a)suse.de + +- fixed build by adding libexpat-devel to Buildrequires +- removed libXft.la (bnc #421322) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.bH3690/_old 2008-08-30 01:48:17.000000000 +0200 +++ /var/tmp/diff_new_pack.bH3690/_new 2008-08-30 01:48:17.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package xorg-x11-libs (Version 7.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,7 +19,7 @@ Name: xorg-x11-libs -BuildRequires: fontconfig-devel freetype2-devel gperf libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel +BuildRequires: fontconfig-devel freetype2-devel gperf libexpat-devel libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel %ifarch ppc64 s390x x86_64 Provides: libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit) %else @@ -20,7 +27,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 78 +Release: 91 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -178,6 +185,9 @@ done /sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/ +%if %suse_version > 1100 +rm $RPM_BUILD_ROOT/%{_libdir}/libXft.la +%endif %clean rm -rf "$RPM_BUILD_ROOT" @@ -220,6 +230,9 @@ %{_mandir}/man3/* %changelog +* Fri Aug 29 2008 sndirsch(a)suse.de +- fixed build by adding libexpat-devel to Buildrequires +- removed libXft.la (bnc #421322) * Fri Aug 01 2008 sndirsch(a)suse.de - xcb-util 0.2.1 * bug fixes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠Hilbert.suse.de 29 Aug '08

29 Aug '08

Hello community, here is the log from the commit of package xorg-x11 checked in at Sat Aug 30 01:47:57 CEST 2008. -------- --- xorg-x11/xorg-x11.changes 2008-08-22 15:25:35.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2008-08-29 20:39:13.427920153 +0200 @@ -1,0 +2,6 @@ +Fri Aug 29 20:37:40 CEST 2008 - sndirsch(a)suse.de + +- moved %verifyscript/%verify_permissions from %clean to %post + (bnc #421243) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.zI1141/_old 2008-08-30 01:46:43.000000000 +0200 +++ /var/tmp/diff_new_pack.zI1141/_new 2008-08-30 01:46:43.000000000 +0200 @@ -26,7 +26,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.3 -Release: 126 +Release: 130 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -383,8 +383,6 @@ %clean rm -rf "$RPM_BUILD_ROOT" -%verifyscript -%verify_permissions -e /usr/bin/dga %pre test -L usr/include/X11 && rm usr/include/X11 @@ -398,6 +396,8 @@ %{fillup_only -n displaymanager} %endif %run_permissions +%verifyscript +%verify_permissions -e /usr/bin/dga exit 0 %preun @@ -464,6 +464,9 @@ /var/lib/xdm/authdir/ %changelog +* Fri Aug 29 2008 sndirsch(a)suse.de +- moved %%verifyscript/%%verify_permissions from %%clean to %%post + (bnc #421243) * Fri Aug 22 2008 ro(a)suse.de - remove deprecated option from fillup_and_insserv call * Tue Aug 12 2008 sndirsch(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