February 2010 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-storage for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at Fri Feb 5 14:18:22 CET 2010. -------- --- yast2-storage/yast2-storage.changes 2010-01-22 14:37:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2010-02-05 11:48:06.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 27 15:09:27 CET 2010 - aschnell(a)suse.de + +- allow to set driver for IMSM without callback (bnc #574270) +- 2.19.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.19.4.tar.bz2 New: ---- yast2-storage-2.19.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.mmExXT/_old 2010-02-05 14:17:44.000000000 +0100 +++ /var/tmp/diff_new_pack.mmExXT/_new 2010-02-05 14:17:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.19.4) +# spec file for package yast2-storage (Version 2.19.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,16 @@ Name: yast2-storage -Version: 2.19.4 +Version: 2.19.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.19.4.tar.bz2 +Source0: yast2-storage-2.19.5.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.6 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.7 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-perl-bindings yast2-testsuite >= 2.19.0 Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 @@ -52,7 +52,7 @@ devices during installation and on an installed system. %prep -%setup -n yast2-storage-2.19.4 +%setup -n yast2-storage-2.19.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-storage-2.19.4.tar.bz2 -> yast2-storage-2.19.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/configure new/yast2-storage-2.19.5/configure --- old/yast2-storage-2.19.4/configure 2010-01-22 14:35:58.000000000 +0100 +++ new/yast2-storage-2.19.5/configure 2010-02-05 11:39:34.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.4. +# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-storage' PACKAGE_TARNAME='yast2-storage' -PACKAGE_VERSION='2.19.4' -PACKAGE_STRING='yast2-storage 2.19.4' +PACKAGE_VERSION='2.19.5' +PACKAGE_STRING='yast2-storage 2.19.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1537,7 +1537,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-storage 2.19.4 to adapt to many kinds of systems. +\`configure' configures yast2-storage 2.19.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1608,7 +1608,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-storage 2.19.4:";; + short | recursive ) echo "Configuration of yast2-storage 2.19.5:";; esac cat <<\_ACEOF @@ -1720,7 +1720,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-storage configure 2.19.4 +yast2-storage configure 2.19.5 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1734,7 +1734,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-storage $as_me 2.19.4, which was +It was created by yast2-storage $as_me 2.19.5, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2714,7 +2714,7 @@ # Define the identity of the package. PACKAGE='yast2-storage' - VERSION='2.19.4' + VERSION='2.19.5' cat >>confdefs.h <<_ACEOF @@ -2836,7 +2836,7 @@ -VERSION="2.19.4" +VERSION="2.19.5" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" @@ -17373,7 +17373,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-storage $as_me 2.19.4, which was +This file was extended by yast2-storage $as_me 2.19.5, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17436,7 +17436,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-storage config.status 2.19.4 +yast2-storage config.status 2.19.5 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/configure.in new/yast2-storage-2.19.5/configure.in --- old/yast2-storage-2.19.4/configure.in 2010-01-22 14:35:49.000000000 +0100 +++ new/yast2-storage-2.19.5/configure.in 2010-02-05 11:39:26.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-storage, 2.19.4, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.19.5, 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.19.4" +VERSION="2.19.5" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/storage/src/include/ep-hd.ycp new/yast2-storage-2.19.5/storage/src/include/ep-hd.ycp --- old/yast2-storage-2.19.4/storage/src/include/ep-hd.ycp 2010-01-21 11:08:22.000000000 +0100 +++ new/yast2-storage-2.19.5/storage/src/include/ep-hd.ycp 2010-02-01 12:40:04.000000000 +0100 @@ -198,16 +198,26 @@ map<string, map> target_map = Storage::GetTargetMap(); - list<symbol> fields = StorageSettings::FilterOverview([ `heading_device, `device, `size, `udev_path, - `udev_id, `used_by, `heading_hd, `vendor, - `model, `num_cyl, `cyl_size, `bus, `bios_id, - `disk_label, `heading_fc, `fc_wwpn, `fc_port_id, - `fc_fcp_lun ]); + symbol ctype = target_map[device, "type"]:`CT_DISK; + + list<symbol> fields = [ `heading_device, `device, `size, `udev_path, `udev_id, `used_by, + `heading_hd, `vendor, `model, `num_cyl, `cyl_size, `bus, `bios_id, + `disk_label ]; + + if (contains([ `CT_MDPART ], ctype)) + { + fields = (list<symbol>) merge(fields, [ `heading_md, `raid_type, `chunk_size, `parity_algorithm ]); + } + + if (contains([ `CT_DISK ], ctype)) + { + fields = (list<symbol>) merge(fields, [`heading_fc, `fc_wwpn, `fc_port_id, `fc_fcp_lun ]); + } UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(fields, target_map, device), + StorageFields::Overview(StorageSettings::FilterOverview(fields), target_map, device), `HBox( // push button text (do not translate 'SMART', it is the name of the tool) `PushButton(`id(`smart), _("Health Test (SMART)...")), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/storage/src/include/ep-lib.ycp new/yast2-storage-2.19.5/storage/src/include/ep-lib.ycp --- old/yast2-storage-2.19.4/storage/src/include/ep-lib.ycp 2010-01-16 18:15:14.000000000 +0100 +++ new/yast2-storage-2.19.5/storage/src/include/ep-lib.ycp 2010-01-28 14:33:59.000000000 +0100 @@ -344,7 +344,7 @@ case `CT_DMMULTIPATH: case `CT_MDPART: { - string emptyspace = _("Unpartitioned Space"); + string emptyspace = _("Unpartitioned"); // Filter out extended partitions list <map> partitions = (list <map>) filter ( map one_part, disk["partitions"]:[], { @@ -410,6 +410,8 @@ case `CT_LVM: { + string emptyspace = _("Unallocated"); + list <map> partitions = disk["partitions"]:[]; integer disk_size_k = disk["size_k"]:1; @@ -422,7 +424,7 @@ }); if (disk_free_k > 0) - AddSegment((float) disk_free_k / (float) disk_size_k, _("Unallocated Space"), disk_free_k); + AddSegment((float) disk_free_k / (float) disk_size_k, emptyspace, disk_free_k); } break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/storage/src/inst_prepdisk.ycp new/yast2-storage-2.19.5/storage/src/inst_prepdisk.ycp --- old/yast2-storage-2.19.4/storage/src/inst_prepdisk.ycp 2010-01-14 17:45:15.000000000 +0100 +++ new/yast2-storage-2.19.5/storage/src/inst_prepdisk.ycp 2010-02-03 17:31:03.000000000 +0100 @@ -13,11 +13,6 @@ * and mounted for the targets / and /boot. * * - * SCR: Write(.disk + scrpath + .partitions, targetpartitions) - * Execute (.target.mkdir, [ <mountpoint>, 0755] ) - * Execute (.target.mount, [<device>, <mountpoint>] ) - * - * * possible return values: `back, `abort `next */ { @@ -25,63 +20,17 @@ import "Mode"; import "Stage"; - import "Wizard"; import "Storage"; import "String"; import "SlideShow"; import "StorageClients"; - import "Popup"; if (Mode::update ()) return `auto; - boolean test_mode = Mode::test(); - boolean this_is_for_real = !test_mode; - SCR::Write( .target.ycp, Storage::SaveDumpPath("targetMap_ps"), Storage::GetTargetMap() ); -// Define macro that creates a dialog with progressbar -define void MakefsDialog() - ``{ - return; - - if (!Wizard::IsWizardDialog()) - return; - - // html-format - // advise the user to wait for completion - // part 1 of 2 - string helptext = _(" -Please wait while your hard disk is prepared for installation... - "); - if( !Stage::initial () ) - { - helptext = _(" -Please wait while your hard disk is prepared... - "); - } - // rich-text format help text part 2 of 2 - helptext = helptext + _("\ - -Depending on the size of your hard disk and your processor speed, this action -might take some time. Several minutes are not unusual for really large disks. -Often, the progress meter does not show a linear progress. Even if it looks -slow near the end (\"95 %\"), please be patient. The formatting tool -performs various checks. "); - - // The Wizard module sets a special protection mode for "Accept" - // buttons to prevent sloppy calls to Wizard::SetContents() - // from disabling it. This doesn't apply here, however - - // switching protection mode off. - UI::WizardCommand(`ProtectNextButton( false ) ); - - // hard disk will be made ready for installing Linux - Wizard::SetContents(_("Preparing Your Hard Disk"), - `ProgressBar(`id(`progress), " ", 100), - helptext, false, false); - }; - y2milestone( "BEGINNING of inst_prepdisk" ); // check for ppc-PReP/CHRP system, they need a special boot partition diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/storage/src/modules/FileSystems.ycp new/yast2-storage-2.19.5/storage/src/modules/FileSystems.ycp --- old/yast2-storage-2.19.4/storage/src/modules/FileSystems.ycp 2010-01-18 18:11:32.000000000 +0100 +++ new/yast2-storage-2.19.5/storage/src/modules/FileSystems.ycp 2010-01-25 11:10:29.000000000 +0100 @@ -8,7 +8,7 @@ * These module contains the supported filesystems and their settings. * * - * $Id: FileSystems.ycp 60440 2010-01-18 17:11:31Z aschnell $ + * $Id: FileSystems.ycp 60500 2010-01-25 10:01:22Z aschnell $ */ { module "FileSystems"; @@ -18,9 +18,7 @@ import "Arch"; import "String"; import "Partitions"; - import "Popup"; import "Encoding"; - import "Mode"; import "Stage"; import "LibStorage"; @@ -1018,38 +1016,22 @@ * Return the mount option for each used_fs (-t) * @return string */ - global define string GetMountString(symbol used_fs, string defaultv )``{ - map<symbol,any> fsmap = GetFsMap( used_fs); - string ret = fsmap[`mount_string ]:""; - if( size(ret)==0 ) - { - if( used_fs == `vfat ) - { - ret = "vfat"; - } - else if( used_fs == `ntfs ) - { - ret = "ntfs-3g"; - } - } - if( ret == "" ) ret = defaultv; - y2milestone( "used_fs:%1 ret:%2", used_fs, ret ); - return ret; - } + global string GetMountString(symbol used_fs, string defaultv) + { + map<symbol, any> fsmap = GetFsMap(used_fs); + string ret = fsmap[`mount_string ]:defaultv; + y2milestone("GetMountString used_fs:%1 ret:%2", used_fs, ret); + return ret; + } - global define list<string> GetNeededModules( symbol used_fs )``{ - list<string> ret = []; - map<symbol,any> fsmap = GetFsMap( used_fs); - if( used_fs==`ntfs && size(fsmap)==0 ) - { - ret = ["ntfs"]; - } - else - { - ret = fsmap[`needed_modules ]:[]; - } - return ret; - } + + global list<string> GetNeededModules(symbol used_fs) + { + map<symbol, any> fsmap = GetFsMap(used_fs); + list<string> ret = fsmap[`needed_modules ]:[]; + y2milestone("GetNeededModules used_fs:%1 ret:%2", used_fs, ret); + return ret; + } global integer MinFsSizeK(symbol fsys) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/storage/src/modules/StorageDevices.ycp new/yast2-storage-2.19.5/storage/src/modules/StorageDevices.ycp --- old/yast2-storage-2.19.4/storage/src/modules/StorageDevices.ycp 2009-12-07 15:34:25.000000000 +0100 +++ new/yast2-storage-2.19.5/storage/src/modules/StorageDevices.ycp 2010-02-03 18:43:03.000000000 +0100 @@ -14,7 +14,7 @@ * - removable drives (ZIP) * - floppy devices * - * $Id: StorageDevices.ycp 59976 2009-12-07 11:59:17Z aschnell $ + * $Id: StorageDevices.ycp 60682 2010-02-03 17:43:02Z aschnell $ * * Author: * Klaus Kaempf <kkaempf(a)suse.de> (initial) @@ -73,12 +73,6 @@ //--------------------------------------------------------------- -//--------------------------------------------------------------- -// CD Recorders and CD-ROM links -list idecdrws = []; // list of IDE CD-RW drivers for ide-scsi -list scsicds = []; // list of SCSI CDs - - list<map> AddNormalLinknames( list<map> cddrives ) ``{ map linknum = $[ "cdrom" : 0, @@ -212,20 +206,6 @@ } } - // sort out idecdrws and scsicds - foreach (map e, cd_drives, - ``{ - if( (e["cdr"]:false || e["cdrw"]:false || e["dvdr"]:false ) && - e["bus"]:"" == "IDE" ) - { - y2milestone ("IDE CD-RW %1", idecdrws ); - } - if( e["bus"]:"" == "SCSI" ) - { - scsicds = add (scsicds, e["dev_name"]:""); - } - }); - string boot_device = (string) SCR::Read (.etc.install_inf.Cdrom); if (boot_device == nil) boot_device = ""; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/storage/src/modules/Storage.ycp new/yast2-storage-2.19.5/storage/src/modules/Storage.ycp --- old/yast2-storage-2.19.4/storage/src/modules/Storage.ycp 2010-01-21 17:32:04.000000000 +0100 +++ new/yast2-storage-2.19.5/storage/src/modules/Storage.ycp 2010-02-04 18:28:39.000000000 +0100 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 60473 2010-01-21 16:32:04Z aschnell $ + * $Id: Storage.ycp 60703 2010-02-04 17:28:38Z aschnell $ */ { module "Storage"; @@ -176,6 +176,11 @@ "right_asymmetric" : LibStorage::RIGHT_ASYMMETRIC(), "right_symmetric" : LibStorage::RIGHT_SYMMETRIC() ]; +map<symbol, integer> conv_imsm_driver = + $[ `IMSM_UNDECIDED : LibStorage::IMSM_UNDECIDED(), + `IMSM_DMRAID : LibStorage::IMSM_DMRAID(), + `IMSM_MDADM : LibStorage::IMSM_MDADM() ]; + map DiskMapVersion = $[]; map DiskMap = $[]; map type_order = $[ `CT_DISK : 0, `CT_MD : 1, `CT_MDPART : 2, `CT_DMRAID : 3, @@ -284,6 +289,14 @@ } +symbol imsm_driver = `IMSM_UNDECIDED; + +global void SetImsmDriver(symbol val) +{ + imsm_driver = val; +} + + list<map> getContainers(); global boolean InitLibstorage(boolean readonly) @@ -309,6 +322,8 @@ LibStorage::StorageInterface::setEfiBoot(sint, Partitions::EfiBoot()); + LibStorage::StorageInterface::setImsmDriver(sint, conv_imsm_driver[imsm_driver]:LibStorage::IMSM_UNDECIDED()); + conts = getContainers(); y2milestone("InitLibstorage conts:%1", conts); FileSystems::InitSlib(sint); @@ -1467,7 +1482,7 @@ y2milestone( "ls=%1", ls ); c["devices"] = ls; - integer t = LibStorage::MdPartCoInfo::swig_level_get(infos); + integer t = LibStorage::MdPartCoInfo::swig_type_get(infos); c["raid_type"] = substring(sformat("%1", toSymbol(conv_mdtype, t)), 1); if (c["raid_type"]:"" == "raid5") { @@ -1476,7 +1491,7 @@ if (pt != `par_none) c["parity_algorithm"] = substring(sformat("%1", pt), 1); } - t = LibStorage::MdPartCoInfo::swig_chunk_get(infos); + t = LibStorage::MdPartCoInfo::swig_chunkSizeK_get(infos); if (t > 0) { c["chunk_size"] = t; @@ -3564,7 +3579,7 @@ boolean ret = false; list<symbol> poss_fs = [ `ext2, `ext3, `ext4, `btrfs, `reiser, `xfs, `jfs ]; string device = p["device"]:""; - if( !p["created"]:false && contains( poss_fs, p["detected_fs"]:`unknown ) && + if( !p["create"]:false && contains( poss_fs, p["detected_fs"]:`unknown ) && !isempty(device) ) { map<symbol, any> resize_info = $[]; @@ -3652,7 +3667,7 @@ boolean ret = true; if( Stage::initial() ) { - if( !p["created"]:false && !p["inactive"]:false && + if( !p["create"]:false && !p["inactive"]:false && p["mount"]:""=="swap" ) { ret = false; @@ -4128,9 +4143,8 @@ foreach(map part, data["partitions"]:[], ``{ string device = part["device"]:""; - if( part["type"]:`unknown == `primary && - SCR::Execute (.target.bash, - "/usr/lib/YaST2/bin/check.boot "+device) == 0) + if (part["type"]:`unknown == `primary && !part["create"]:false && + SCR::Execute(.target.bash, "/usr/lib/YaST2/bin/check.boot " + device) == 0) { string text = ""; if( Partitions::IsDosWinNtPartition( part["fsid"]:0 ) && @@ -4269,27 +4283,26 @@ { list<string> pl = hw_packages; - map<string,map> tg = GetTargetMap(); + map<string, map> target_map = GetTargetMap(); boolean need_lvm = false; boolean need_nfs = false; boolean need_quota = false; boolean need_crypt = false; - foreach( string k, map e, tg, { + foreach (string k, map e, target_map, { if (e["type"]:`CT_UNKNOWN == `CT_LVM) need_lvm = true; if (e["type"]:`CT_UNKNOWN == `CT_NFS) need_nfs = true; - if( size(filter( map p, e["partitions"]:[], - ``(FileSystems::HasQuota(p))))>0 ) + if (find(map part, e["partitions"]:[], { return FileSystems::HasQuota(part); }) != nil) need_quota = true; - if( size(filter( map p, e["partitions"]:[], - ``(p["enc_type"]:`none != `none)))>0 ) + if (find(map part, e["partitions"]:[], { return part["enc_type"]:`none != `none; }) != nil) need_crypt = true; }); - y2milestone("AddPackageList need lvm:%1 need nfs: %2 quota:%3 crypt:%4", need_lvm, need_nfs, need_quota, need_crypt); + y2milestone("AddPackageList need_lvm:%1 need_nfs:%2 need_quota:%3 need_crypt:%4", + need_lvm, need_nfs, need_quota, need_crypt); if (need_lvm) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/storage.pot new/yast2-storage-2.19.5/storage.pot --- old/yast2-storage-2.19.4/storage.pot 2010-01-22 10:37:46.000000000 +0100 +++ new/yast2-storage-2.19.5/storage.pot 2010-02-04 18:29:01.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 10:37+0100\n" +"POT-Creation-Date: 2010-02-04 18:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -622,7 +622,7 @@ #. popup text #: storage/src/include/custom_part_dialogs.ycp:313 -#: storage/src/modules/Storage.ycp:5283 +#: storage/src/modules/Storage.ycp:5296 msgid "" "You did not enter a password.\n" "Try again.\n" @@ -630,7 +630,7 @@ #. popup text #: storage/src/include/custom_part_dialogs.ycp:324 -#: storage/src/modules/Storage.ycp:5294 +#: storage/src/modules/Storage.ycp:5307 #, ycp-format msgid "" "The password must have at least %1 characters.\n" @@ -1595,7 +1595,7 @@ #. push button text #. tab heading #. push button text -#: storage/src/include/ep-dm.ycp:171 storage/src/include/ep-hd.ycp:409 +#: storage/src/include/ep-dm.ycp:171 storage/src/include/ep-hd.ycp:419 #: storage/src/include/ep-lvm.ycp:337 storage/src/include/ep-raid.ycp:214 msgid "&Overview" msgstr "" @@ -1603,7 +1603,7 @@ #. push button text #. tab heading #. push button text -#: storage/src/include/ep-dm.ycp:173 storage/src/include/ep-hd.ycp:417 +#: storage/src/include/ep-dm.ycp:173 storage/src/include/ep-hd.ycp:427 #: storage/src/include/ep-raid.ycp:216 msgid "&Used Devices" msgstr "" @@ -1990,58 +1990,58 @@ msgstr "" #. push button text (do not translate 'SMART', it is the name of the tool) -#: storage/src/include/ep-hd.ycp:213 +#: storage/src/include/ep-hd.ycp:223 msgid "Health Test (SMART)..." msgstr "" #. push button text (do not translate 'hdparm', it is the name of the tool) -#: storage/src/include/ep-hd.ycp:215 +#: storage/src/include/ep-hd.ycp:225 msgid "Properties (hdparm)..." msgstr "" #. helptext -#: storage/src/include/ep-hd.ycp:222 +#: storage/src/include/ep-hd.ycp:232 msgid "" "This view shows detailed information about the\n" "selected hard disk." msgstr "" -#: storage/src/include/ep-hd.ycp:241 +#: storage/src/include/ep-hd.ycp:251 msgid "SMART is not available for this disk." msgstr "" -#: storage/src/include/ep-hd.ycp:254 +#: storage/src/include/ep-hd.ycp:264 msgid "hdparm is not available for this disk." msgstr "" #. menu entry text -#: storage/src/include/ep-hd.ycp:285 +#: storage/src/include/ep-hd.ycp:295 msgid "Create New Partition Table" msgstr "" #. menu entry text -#: storage/src/include/ep-hd.ycp:288 +#: storage/src/include/ep-hd.ycp:298 msgid "Clone This Disk" msgstr "" #. menu entry text -#: storage/src/include/ep-hd.ycp:296 +#: storage/src/include/ep-hd.ycp:306 msgid "Execute dasd&fmt on the DASD Device" msgstr "" #. push button text -#: storage/src/include/ep-hd.ycp:307 storage/src/include/ep-lvm.ycp:167 +#: storage/src/include/ep-hd.ycp:317 storage/src/include/ep-lvm.ycp:167 #: storage/src/include/ep-lvm.ycp:257 msgid "Add..." msgstr "" #. menu button text -#: storage/src/include/ep-hd.ycp:311 +#: storage/src/include/ep-hd.ycp:321 msgid "Expert..." msgstr "" #. helptext -#: storage/src/include/ep-hd.ycp:316 +#: storage/src/include/ep-hd.ycp:326 msgid "" "This view shows all partitions of the selected\n" "hard disk. If the hard disk is used by e.g. BIOS RAID or multipath no\n" @@ -2049,7 +2049,7 @@ msgstr "" #. helptext -#: storage/src/include/ep-hd.ycp:382 +#: storage/src/include/ep-hd.ycp:392 msgid "" "This view shows all devices used by the\n" "selected hard disk. The view is only available for BIOS RAIDs, partitioned\n" @@ -2057,24 +2057,24 @@ msgstr "" #. tab heading -#: storage/src/include/ep-hd.ycp:411 +#: storage/src/include/ep-hd.ycp:421 msgid "&Partitions" msgstr "" #. heading -#: storage/src/include/ep-hd.ycp:424 +#: storage/src/include/ep-hd.ycp:434 #, ycp-format msgid "Hard Disk: %1" msgstr "" #. heading -#: storage/src/include/ep-hd.ycp:457 +#: storage/src/include/ep-hd.ycp:467 #, ycp-format msgid "Partition: %1" msgstr "" #. helptext -#: storage/src/include/ep-hd.ycp:468 +#: storage/src/include/ep-hd.ycp:478 msgid "" "This view shows detailed information about the\n" "selected partition." @@ -2137,26 +2137,26 @@ msgstr "" #: storage/src/include/ep-lib.ycp:347 -msgid "Unpartitioned Space" +msgid "Unpartitioned" msgstr "" -#: storage/src/include/ep-lib.ycp:425 -msgid "Unallocated Space" +#: storage/src/include/ep-lib.ycp:413 +msgid "Unallocated" msgstr "" -#: storage/src/include/ep-lib.ycp:438 +#: storage/src/include/ep-lib.ycp:440 msgid "No changes to partitioning." msgstr "" -#: storage/src/include/ep-lib.ycp:440 +#: storage/src/include/ep-lib.ycp:442 msgid "Changes to partitioning:" msgstr "" -#: storage/src/include/ep-lib.ycp:442 +#: storage/src/include/ep-lib.ycp:444 msgid "No changes to storage settings." msgstr "" -#: storage/src/include/ep-lib.ycp:444 +#: storage/src/include/ep-lib.ycp:446 msgid "Storage settings:" msgstr "" @@ -3163,40 +3163,7 @@ msgid "Impossible to create the requested proposal." msgstr "" -#. html-format -#. advise the user to wait for completion -#. part 1 of 2 -#: storage/src/inst_prepdisk.ycp:55 -msgid "" -"\n" -"Please wait while your hard disk is prepared for installation...\n" -" " -msgstr "" - -#: storage/src/inst_prepdisk.ycp:60 -msgid "" -"\n" -"Please wait while your hard disk is prepared...\n" -" " -msgstr "" - -#. rich-text format help text part 2 of 2 -#: storage/src/inst_prepdisk.ycp:65 -msgid "" -"\n" -"Depending on the size of your hard disk and your processor speed, this action\n" -"might take some time. Several minutes are not unusual for really large disks.\n" -"Often, the progress meter does not show a linear progress. Even if it looks\n" -"slow near the end (\"95 %\"), please be patient. The formatting tool \n" -"performs various checks. " -msgstr "" - -#. hard disk will be made ready for installing Linux -#: storage/src/inst_prepdisk.ycp:80 -msgid "Preparing Your Hard Disk" -msgstr "" - -#: storage/src/inst_prepdisk.ycp:97 +#: storage/src/inst_prepdisk.ycp:46 msgid "Preparing disks..." msgstr "" @@ -3619,48 +3586,48 @@ msgstr "" #. button text -#: storage/src/modules/FileSystems.ycp:179 +#: storage/src/modules/FileSystems.ycp:177 msgid "Mount &read-only" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:182 +#: storage/src/modules/FileSystems.ycp:180 msgid "" "Mount Read-Only:\n" "No writing to the file system is possible. Default is false.\n" msgstr "" #. button text -#: storage/src/modules/FileSystems.ycp:191 +#: storage/src/modules/FileSystems.ycp:189 msgid "No &access time" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:194 +#: storage/src/modules/FileSystems.ycp:192 msgid "" "No access time:\n" "Access times are not updated when a file is read. Default is false." msgstr "" #. button text -#: storage/src/modules/FileSystems.ycp:202 +#: storage/src/modules/FileSystems.ycp:200 msgid "Mountable by &user" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:205 +#: storage/src/modules/FileSystems.ycp:203 msgid "" "Mountable by User:\n" "The file system may be mounted by an ordinary user. Default is false.\n" msgstr "" #. button text -#: storage/src/modules/FileSystems.ycp:214 +#: storage/src/modules/FileSystems.ycp:212 msgid "Do Not Mount at System &Start-up" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:217 +#: storage/src/modules/FileSystems.ycp:215 msgid "" "Do Not Mount at System Start-up:\n" "The file system is not automatically mounted when the system starts.\n" @@ -3671,12 +3638,12 @@ msgstr "" #. button text -#: storage/src/modules/FileSystems.ycp:230 +#: storage/src/modules/FileSystems.ycp:228 msgid "Enable &Quota Support" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:233 +#: storage/src/modules/FileSystems.ycp:231 msgid "" "Enable Quota Support:\n" "The file system is mounted with user quotas enabled.\n" @@ -3684,12 +3651,12 @@ msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:249 +#: storage/src/modules/FileSystems.ycp:247 msgid "Data &Journaling Mode" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:256 +#: storage/src/modules/FileSystems.ycp:254 msgid "" "Data Journaling Mode:\n" "Specifies the journaling mode for file data.\n" @@ -3701,36 +3668,36 @@ msgstr "" #. button text -#: storage/src/modules/FileSystems.ycp:276 +#: storage/src/modules/FileSystems.ycp:274 msgid "&Access Control Lists (ACL)" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:279 +#: storage/src/modules/FileSystems.ycp:277 msgid "" "Access Control Lists (ACL):\n" "Enable access control lists on the file system.\n" msgstr "" #. button text -#: storage/src/modules/FileSystems.ycp:289 +#: storage/src/modules/FileSystems.ycp:287 msgid "&Extended User Attributes" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:292 +#: storage/src/modules/FileSystems.ycp:290 msgid "" "Extended User Attributes:\n" "Allow extended user attributes on the file system.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:307 +#: storage/src/modules/FileSystems.ycp:305 msgid "Arbitrary option &value" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:310 +#: storage/src/modules/FileSystems.ycp:308 msgid "" "Arbitrary Option Value:\n" "In this field, type any legal mount option allowed in the fourth field of /etc/fstab.\n" @@ -3738,140 +3705,140 @@ msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:325 +#: storage/src/modules/FileSystems.ycp:323 msgid "Char&set for file names" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:332 +#: storage/src/modules/FileSystems.ycp:330 msgid "" "Charset for File Names:\n" "Set the charset used for display of file names in Windows partitions.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:340 +#: storage/src/modules/FileSystems.ycp:338 msgid "Code&page for short FAT names" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:345 +#: storage/src/modules/FileSystems.ycp:343 msgid "" "Codepage for Short FAT Names:\n" "This codepage is used for converting to shortname characters on FAT file systems.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:357 +#: storage/src/modules/FileSystems.ycp:355 msgid "Number of &FATs" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:361 +#: storage/src/modules/FileSystems.ycp:359 msgid "" "Number of FATs:\n" "Specify the number of file allocation tables in the file system. The default is 2." msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:366 +#: storage/src/modules/FileSystems.ycp:364 msgid "FAT &size" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:373 +#: storage/src/modules/FileSystems.ycp:371 msgid "" "FAT size:\n" "Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST2 will automatically select the value most suitable for the file system size.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:379 +#: storage/src/modules/FileSystems.ycp:377 msgid "Root &dir entries" msgstr "" #. popup text -#: storage/src/modules/FileSystems.ycp:385 +#: storage/src/modules/FileSystems.ycp:383 msgid "The minimum size for \"Root dir entries\" is 112. Please try again." msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:387 +#: storage/src/modules/FileSystems.ycp:385 msgid "" "Root dir entries:\n" "Select the number of entries available in the root directory." msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:396 +#: storage/src/modules/FileSystems.ycp:394 msgid "Hash &function" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:401 +#: storage/src/modules/FileSystems.ycp:399 msgid "" "Hash function:\n" "This specifies the name of the hash function to use to sort the file names in directories." msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:406 +#: storage/src/modules/FileSystems.ycp:404 msgid "FS &revision" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:411 +#: storage/src/modules/FileSystems.ycp:409 msgid "" "FS revision:\n" "This option defines the reiserfs format revision to use. '3.5' is for backwards compatibility with kernels of the 2.2.x series. '3.6' is more recent, but can only be used with kernel versions greater than or equal to 2.4.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:421 -#: storage/src/modules/FileSystems.ycp:526 +#: storage/src/modules/FileSystems.ycp:419 +#: storage/src/modules/FileSystems.ycp:524 msgid "Block &size in bytes" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:425 +#: storage/src/modules/FileSystems.ycp:423 msgid "" "Block size:\n" "Specify the size of blocks in bytes. Valid block size values are 512, 1024, 2048, and 4096 bytes per block. If auto is selected, the standard block size of 4096 is used.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:431 -#: storage/src/modules/FileSystems.ycp:577 +#: storage/src/modules/FileSystems.ycp:429 +#: storage/src/modules/FileSystems.ycp:575 msgid "&Inode Size" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:435 -#: storage/src/modules/FileSystems.ycp:581 +#: storage/src/modules/FileSystems.ycp:433 +#: storage/src/modules/FileSystems.ycp:579 msgid "" "Inode Size:\n" "This option specifies the inode size of the file system.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:440 +#: storage/src/modules/FileSystems.ycp:438 msgid "&Percentage of inode space" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:447 +#: storage/src/modules/FileSystems.ycp:445 msgid "" "Percentage of inode space:\n" "The option \"Percentage of inode space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:453 +#: storage/src/modules/FileSystems.ycp:451 msgid "Inode &aligned" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:458 +#: storage/src/modules/FileSystems.ycp:456 msgid "" "Inode Aligned:\n" "The option \"Inode Aligned\" is used to specify whether inode allocation is or\n" @@ -3880,19 +3847,19 @@ msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:486 +#: storage/src/modules/FileSystems.ycp:484 msgid "&Log size in megabytes" msgstr "" #. popup text -#: storage/src/modules/FileSystems.ycp:493 +#: storage/src/modules/FileSystems.ycp:491 msgid "" "The \"Log size\" value is incorrect.\n" "Please enter a value greater than zero." msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:496 +#: storage/src/modules/FileSystems.ycp:494 #, no-c-format msgid "" "Log size\n" @@ -3900,24 +3867,24 @@ msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:501 +#: storage/src/modules/FileSystems.ycp:499 msgid "Invoke Bad Blocks List &Utility" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:510 +#: storage/src/modules/FileSystems.ycp:508 msgid "Stride &length in blocks" msgstr "" #. popup text -#: storage/src/modules/FileSystems.ycp:516 +#: storage/src/modules/FileSystems.ycp:514 msgid "" "The \"Stride length in blocks\" value is not possible.\n" "Please select a value greater than 1." msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:518 +#: storage/src/modules/FileSystems.ycp:516 msgid "" "Stride Length in Blocks:\n" "Set RAID-related options for the file system. Currently, the only supported\n" @@ -3926,19 +3893,19 @@ msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:530 +#: storage/src/modules/FileSystems.ycp:528 msgid "" "Block size:\n" "Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:535 +#: storage/src/modules/FileSystems.ycp:533 msgid "Bytes per &inode" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:539 +#: storage/src/modules/FileSystems.ycp:537 msgid "" "Bytes per inode:\n" "Specify the bytes to inode ratio. YaST2 creates an inode for every <bytes-per-inode> bytes of space on the disk. The larger the bytes-per-inode ratio, the fewer inodes will be created.\n" @@ -3947,59 +3914,59 @@ msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:547 +#: storage/src/modules/FileSystems.ycp:545 msgid "Percentage of blocks &reserved for root" msgstr "" #. popup text -#: storage/src/modules/FileSystems.ycp:555 +#: storage/src/modules/FileSystems.ycp:553 msgid "" "The \"Percentage of blocks reserved for root\" value is incorrect.\n" "Please use a value between 0 and 99." msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:558 +#: storage/src/modules/FileSystems.ycp:556 #, no-c-format msgid "Percentage of blocks reserved for root: Specify the percentage of blocks reserved for the super user. This value defaults to 5%." msgstr "" #. checkbox text -#: storage/src/modules/FileSystems.ycp:562 +#: storage/src/modules/FileSystems.ycp:560 msgid "Disable regular checks" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:569 +#: storage/src/modules/FileSystems.ycp:567 msgid "" "Disable regular checks:\n" "Disable regular file system check at booting.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:586 +#: storage/src/modules/FileSystems.ycp:584 msgid "&Directory Index Feature" msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:592 +#: storage/src/modules/FileSystems.ycp:590 msgid "" "Directory Index:\n" "Enables use of hashed b-trees to speed up lookups in large directories.\n" msgstr "" #. label text -#: storage/src/modules/FileSystems.ycp:782 +#: storage/src/modules/FileSystems.ycp:780 msgid "Swap &Priority" msgstr "" #. popup text -#: storage/src/modules/FileSystems.ycp:788 +#: storage/src/modules/FileSystems.ycp:786 msgid "Value must be between 0 and 32767. Try again." msgstr "" #. help text, richtext format -#: storage/src/modules/FileSystems.ycp:793 +#: storage/src/modules/FileSystems.ycp:791 msgid "" "Swap Priority:\n" "Enter the swap priority. Higher numbers mean higher priority.\n" @@ -4041,25 +4008,25 @@ msgstr "" #. error popup -#: storage/src/modules/Storage.ycp:264 +#: storage/src/modules/Storage.ycp:269 msgid "" "The storage subsystem is locked by an unknown application.\n" "You must quit that application before you can continue." msgstr "" #. error popup -#: storage/src/modules/Storage.ycp:273 +#: storage/src/modules/Storage.ycp:278 #, ycp-format msgid "" "The storage subsystem is locked by the application \"%1\" (%2).\n" "You must quit that application before you can continue." msgstr "" -#: storage/src/modules/Storage.ycp:870 +#: storage/src/modules/Storage.ycp:885 msgid "Resize Not Possible:" msgstr "" -#: storage/src/modules/Storage.ycp:2306 storage/src/modules/Storage.ycp:5318 +#: storage/src/modules/Storage.ycp:2321 storage/src/modules/Storage.ycp:5331 #, ycp-format msgid "" "Could not set encryption.\n" @@ -4068,7 +4035,7 @@ "The crypt password provided could be incorrect.\n" msgstr "" -#: storage/src/modules/Storage.ycp:3662 +#: storage/src/modules/Storage.ycp:3677 #, ycp-format msgid "" "\n" @@ -4076,7 +4043,7 @@ "that is needed to run the installation.\n" msgstr "" -#: storage/src/modules/Storage.ycp:3675 +#: storage/src/modules/Storage.ycp:3690 #, ycp-format msgid "" "\n" @@ -4084,7 +4051,7 @@ "data needed to perform the installation.\n" msgstr "" -#: storage/src/modules/Storage.ycp:3696 +#: storage/src/modules/Storage.ycp:3711 #, ycp-format msgid "" "\n" @@ -4092,7 +4059,7 @@ "that is needed to run the installation.\n" msgstr "" -#: storage/src/modules/Storage.ycp:3703 +#: storage/src/modules/Storage.ycp:3718 #, ycp-format msgid "" "\n" @@ -4100,7 +4067,7 @@ "data needed to perform the installation.\n" msgstr "" -#: storage/src/modules/Storage.ycp:3729 +#: storage/src/modules/Storage.ycp:3744 #, ycp-format msgid "" "\n" @@ -4109,7 +4076,7 @@ "the installation.\n" msgstr "" -#: storage/src/modules/Storage.ycp:3737 +#: storage/src/modules/Storage.ycp:3752 #, ycp-format msgid "" "\n" @@ -4117,13 +4084,13 @@ "device %2 which contains data needed to perform the installation.\n" msgstr "" -#: storage/src/modules/Storage.ycp:4341 +#: storage/src/modules/Storage.ycp:4354 #, ycp-format msgid "Add the following resolvables failed: %1" msgstr "" #. popup text -#: storage/src/modules/Storage.ycp:5272 +#: storage/src/modules/Storage.ycp:5285 msgid "" "The first and the second version\n" "of the password do not match.\n" @@ -4131,7 +4098,7 @@ msgstr "" #. popup text -#: storage/src/modules/Storage.ycp:5304 +#: storage/src/modules/Storage.ycp:5317 msgid "" "The password may only contain the following characters:\n" "0..9, a..z, A..Z, and any of \"@#* ,.;:._-+!$%&/|?{[()]}^\\<>\".\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.4/VERSION new/yast2-storage-2.19.5/VERSION --- old/yast2-storage-2.19.4/VERSION 2010-01-22 14:28:31.000000000 +0100 +++ new/yast2-storage-2.19.5/VERSION 2010-02-05 11:35:45.000000000 +0100 @@ -1 +1 @@ -2.19.4 +2.19.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 libstorage for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at Fri Feb 5 14:17:34 CET 2010. -------- --- libstorage/libstorage.changes 2010-01-22 14:37:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/libstorage/libstorage.changes 2010-02-05 11:47:20.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Feb 04 11:59:56 CET 2010 - aschnell(a)suse.de + +- fixed writing of mdadm.conf (bnc #565207) +- 2.19.7 + +------------------------------------------------------------------- +Wed Jan 27 16:03:55 CET 2010 - fehr(a)suse.de + +- add "nofail" to dm-encrypted fstab entries and do not set passno + to zero any more (bnc #569895) + +------------------------------------------------------------------- +Wed Jan 27 15:09:27 CET 2010 - aschnell(a)suse.de + +- allow to set driver for IMSM without callback (bnc #574270) + +------------------------------------------------------------------- +Mon Jan 25 17:30:26 CET 2010 - aschnell(a)suse.de + +- fixed default mount-by for multipath (bnc #572209) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libstorage-2.19.6.tar.bz2 New: ---- libstorage-2.19.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.9n1uoO/_old 2010-02-05 14:17:02.000000000 +0100 +++ /var/tmp/diff_new_pack.9n1uoO/_new 2010-02-05 14:17:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libstorage (Version 2.19.6) +# spec file for package libstorage (Version 2.19.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: libstorage -Version: 2.19.6 +Version: 2.19.7 Release: 1 License: GPL Group: System/Libraries ++++++ libstorage-2.19.6.tar.bz2 -> libstorage-2.19.7.tar.bz2 ++++++ ++++ 3976 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gpgme for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package gpgme for openSUSE:Factory checked in at Fri Feb 5 14:16:46 CET 2010. -------- --- gpgme/gpgme.changes 2009-06-23 14:07:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/gpgme/gpgme.changes 2010-02-01 00:27:29.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Jan 31 23:27:18 UTC 2010 - jengelh(a)medozas.de + +- package baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpgme.spec ++++++ --- /var/tmp/diff_new_pack.TnBZG6/_old 2010-02-05 14:14:55.000000000 +0100 +++ /var/tmp/diff_new_pack.TnBZG6/_new 2010-02-05 14:14:55.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gpgme (Version 1.2.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,14 @@ BuildRequires: gpg2 >= 2.0.10 BuildRequires: libpth-devel >= 2.0.7 BuildRequires: libgpg-error-devel >= 1.4 -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Security PreReq: %install_info_prereq AutoReqProv: on Version: 1.2.0 -Release: 1 +Release: 2 Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 +Source2: baselibs.conf Patch1: %{name}-1.1.8-makecheck.patch Url: http://www.gnupg.org/related_software/gpgme/ Summary: A Library Designed to Give Applications Easy Access to GnuPG @@ -63,7 +64,7 @@ - Design and most stuff. %package -n libgpgme11 -License: GPL v2 or later +License: GPLv2+ Summary: A Library Designed to give Applications easy Access to GnuPG Group: Development/Libraries/C and C++ Requires: gpgme = %{version} @@ -98,7 +99,7 @@ - Design and most stuff. %package -n libgpgme-devel -License: GPL v2 or later +License: GPLv2+ Summary: A Library Designed to give Applications easy Access to GnuPG Group: Development/Libraries/C and C++ Requires: libgpgme11 = %{version} libgpg-error-devel glibc-devel libpth-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kernel-source for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Fri Feb 5 14:14:24 CET 2010. -------- --- kernel-source/kernel-debug.changes 2010-01-27 20:12:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-02-04 21:53:32.000000000 +0100 @@ -1,0 +2,135 @@ +Thu Feb 4 13:23:57 CET 2010 - knikanth(a)suse.de + +- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL + if stripe count is zero (bnc#576312). + +------------------------------------------------------------------- +Thu Feb 4 12:17:25 CET 2010 - npiggin(a)suse.de + +- Disable patches.suse/files-slab-rcu.patch. + +------------------------------------------------------------------- +Thu Feb 4 09:46:35 CET 2010 - tiwai(a)suse.de + +- supported.conf: mark snd-wss-lib unsupported + +------------------------------------------------------------------- +Thu Feb 4 09:45:34 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2: + ALSA: hda - Adding support for another IDT 92HD83XXX codec + (bnc#569354). + +------------------------------------------------------------------- +Wed Feb 3 19:17:01 CET 2010 - jbohac(a)suse.cz + +- supported.conf: marked em_cmp supported (bnc#568130) + +------------------------------------------------------------------- +Wed Feb 3 14:57:19 CET 2010 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: automatically install a matching + -devel package if kernel-source is installed. + +------------------------------------------------------------------- +Wed Feb 3 13:06:15 CET 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.33-rc6 and c/s 989. +- patches.xen/xen-netback-generalize: Netback: Generalize + static/global variables into 'struct xen_netbk'. +- patches.xen/xen-netback-kernel-threads: Use Kernel thread to + replace the tasklet. +- patches.xen/xen-netback-multiple-tasklets: Netback: + Multiple tasklets support. + +------------------------------------------------------------------- +Tue Feb 2 15:59:38 CET 2010 - jkosina(a)suse.cz + +- patches.suse/suse-ppc64-branding: the message about crashed kernel + doesn't make sense any more with CONFIG_CRASH_DUMP enabled by + default (bnc#575884). + +------------------------------------------------------------------- +Sat Jan 30 21:51:35 CET 2010 - jeffm(a)suse.com + +- Update to 2.6.33-rc6. + - Eliminated 12 patches. + +------------------------------------------------------------------- +Sat Jan 30 21:30:27 CET 2010 - jeffm(a)suse.com + +- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init + from hugetlb_sysfs_add_hstate instead of adding it elsewhere. + +------------------------------------------------------------------- +Sat Jan 30 09:05:13 CET 2010 - jslaby(a)suse.de + +- patches.suse/kdb-common: Fix hid crash (bnc#570591) + +------------------------------------------------------------------- +Fri Jan 29 12:11:55 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA: + hda - Add support for IDT 92HD88 family codecs (bnc#569354). + +------------------------------------------------------------------- +Fri Jan 29 11:14:39 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + Update patch-mainline tag. + +------------------------------------------------------------------- +Fri Jan 29 10:39:59 CET 2010 - jbenc(a)suse.cz + +- Update config files: fixed vanilla configs. + +------------------------------------------------------------------- +Thu Jan 28 19:27:54 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA: + hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec + (bnc#569354). + +------------------------------------------------------------------- +Thu Jan 28 16:56:02 CET 2010 - jbeulich(a)novell.com + +- patches.suse/supported-flag: Fix -ec2 build. +- patches.suse/supported-flag-enterprise: Refresh. +- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build. + +------------------------------------------------------------------- +Thu Jan 28 16:28:01 CET 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.33-rc5 and c/s 987. +- config.conf: Re-enable Xen. +- Update config files. + +------------------------------------------------------------------- +Thu Jan 28 14:50:18 CET 2010 - jbenc(a)suse.cz + +- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward + user space compatibility and enabled few wireless drivers. + +------------------------------------------------------------------- +Thu Jan 28 14:37:22 CET 2010 - mmarek(a)suse.cz + +- rpm/apply-patches: Add support for an additional series file in + patches.addon/series, this will be applied after the main series. + +------------------------------------------------------------------- +Thu Jan 28 11:17:01 CET 2010 - mmarek(a)suse.cz + +- rpm/apply-patches: put the patch loops from kernel-binary.spec.in + and kernel-source.spec.in to one place. + +------------------------------------------------------------------- +Wed Jan 27 20:24:43 CET 2010 - jeffm(a)suse.de + +- Deleted 28 unused patches. + +------------------------------------------------------------------- +Wed Jan 27 15:56:48 CET 2010 - jeffm(a)suse.com + +- Update config files. + +------------------------------------------------------------------- kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-ec2.changes 2010-02-04 21:53:41.000000000 +0100 @@ -0,0 +1,19397 @@ +------------------------------------------------------------------- +Thu Feb 4 13:23:57 CET 2010 - knikanth(a)suse.de + +- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL + if stripe count is zero (bnc#576312). + +------------------------------------------------------------------- +Thu Feb 4 12:17:25 CET 2010 - npiggin(a)suse.de + +- Disable patches.suse/files-slab-rcu.patch. + +------------------------------------------------------------------- +Thu Feb 4 09:46:35 CET 2010 - tiwai(a)suse.de + +- supported.conf: mark snd-wss-lib unsupported + +------------------------------------------------------------------- +Thu Feb 4 09:45:34 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2: + ALSA: hda - Adding support for another IDT 92HD83XXX codec + (bnc#569354). + +------------------------------------------------------------------- +Wed Feb 3 19:17:01 CET 2010 - jbohac(a)suse.cz + +- supported.conf: marked em_cmp supported (bnc#568130) + +------------------------------------------------------------------- +Wed Feb 3 14:57:19 CET 2010 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: automatically install a matching + -devel package if kernel-source is installed. + +------------------------------------------------------------------- +Wed Feb 3 13:06:15 CET 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.33-rc6 and c/s 989. +- patches.xen/xen-netback-generalize: Netback: Generalize + static/global variables into 'struct xen_netbk'. +- patches.xen/xen-netback-kernel-threads: Use Kernel thread to + replace the tasklet. +- patches.xen/xen-netback-multiple-tasklets: Netback: + Multiple tasklets support. + +------------------------------------------------------------------- +Tue Feb 2 15:59:38 CET 2010 - jkosina(a)suse.cz + +- patches.suse/suse-ppc64-branding: the message about crashed kernel + doesn't make sense any more with CONFIG_CRASH_DUMP enabled by + default (bnc#575884). + +------------------------------------------------------------------- +Sat Jan 30 21:51:35 CET 2010 - jeffm(a)suse.com + +- Update to 2.6.33-rc6. + - Eliminated 12 patches. + +------------------------------------------------------------------- +Sat Jan 30 21:30:27 CET 2010 - jeffm(a)suse.com + +- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init + from hugetlb_sysfs_add_hstate instead of adding it elsewhere. + +------------------------------------------------------------------- +Sat Jan 30 09:05:13 CET 2010 - jslaby(a)suse.de + +- patches.suse/kdb-common: Fix hid crash (bnc#570591) + +------------------------------------------------------------------- +Fri Jan 29 12:11:55 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA: + hda - Add support for IDT 92HD88 family codecs (bnc#569354). + +------------------------------------------------------------------- +Fri Jan 29 11:14:39 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + Update patch-mainline tag. + +------------------------------------------------------------------- +Fri Jan 29 10:39:59 CET 2010 - jbenc(a)suse.cz + +- Update config files: fixed vanilla configs. + +------------------------------------------------------------------- +Thu Jan 28 19:27:54 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA: + hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec + (bnc#569354). + +------------------------------------------------------------------- +Thu Jan 28 16:56:02 CET 2010 - jbeulich(a)novell.com + +- patches.suse/supported-flag: Fix -ec2 build. +- patches.suse/supported-flag-enterprise: Refresh. +- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build. + +------------------------------------------------------------------- +Thu Jan 28 16:28:01 CET 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.33-rc5 and c/s 987. +- config.conf: Re-enable Xen. +- Update config files. + +------------------------------------------------------------------- +Thu Jan 28 14:50:18 CET 2010 - jbenc(a)suse.cz + +- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward + user space compatibility and enabled few wireless drivers. + +------------------------------------------------------------------- +Thu Jan 28 14:37:22 CET 2010 - mmarek(a)suse.cz + +- rpm/apply-patches: Add support for an additional series file in + patches.addon/series, this will be applied after the main series. + +------------------------------------------------------------------- +Thu Jan 28 11:17:01 CET 2010 - mmarek(a)suse.cz + +- rpm/apply-patches: put the patch loops from kernel-binary.spec.in + and kernel-source.spec.in to one place. + +------------------------------------------------------------------- +Wed Jan 27 20:24:43 CET 2010 - jeffm(a)suse.de + +- Deleted 28 unused patches. + +------------------------------------------------------------------- +Wed Jan 27 15:56:48 CET 2010 - jeffm(a)suse.com + +- Update config files. + +------------------------------------------------------------------- +Wed Jan 27 14:55:29 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + pci: fix nested spinlock hang in aer_inject (bnc#573578). + +------------------------------------------------------------------- +Wed Jan 27 14:34:07 CET 2010 - mmarek(a)suse.cz + +- Update config files: disable generic_serial users. +- patches.drivers/reenable-generic_serial: Delete. +- rpm/generic_serial-blacklist: Delete (bnc#569676). + +------------------------------------------------------------------- +Wed Jan 27 12:57:31 CET 2010 - jengelh(a)medozas.de + +- remove patches.suse/netfilter-ipv4options [bnc#490142] + +------------------------------------------------------------------- +Wed Jan 27 00:14:42 CET 2010 - jeffm(a)suse.com + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh. + +------------------------------------------------------------------- +Tue Jan 26 07:00:33 CET 2010 - knikanth(a)suse.de + +- supported.conf: Fix misspelt dm-region-hash and mark it supported + correctly (bnc#565962) + +------------------------------------------------------------------- +Mon Jan 25 21:55:49 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.6 + - security fixes + - bugfixes + - obsoletes: + - patches.drivers/8250_pnp-wacom-add + - patches.drivers/staging-hv-fix-smp-problems-in-the-hyperv-core-code.patch + - patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status… + - patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu… + +------------------------------------------------------------------- +Mon Jan 25 20:43:56 CET 2010 - jeffm(a)suse.com + +- supported.conf: Added sparse_keymap (eeepc_laptop depends on it) + +------------------------------------------------------------------- +Mon Jan 25 20:07:23 CET 2010 - npiggin(a)suse.de + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: slab - + handle memoryless nodes V2a (bnc#436025, bnc#570492). + +------------------------------------------------------------------- +Mon Jan 25 17:54:26 CET 2010 - jeffm(a)suse.com + +- Updated to 2.6.33-rc5. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Mon Jan 25 16:46:19 CET 2010 - trenn(a)suse.de + +- Update config files. ++++ 19200 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-ec2.changes --- kernel-source/kernel-pae.changes 2010-01-27 20:13:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-pae.changes 2010-02-04 21:53:44.000000000 +0100 @@ -1,0 +2,135 @@ +Thu Feb 4 13:23:57 CET 2010 - knikanth(a)suse.de + +- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL + if stripe count is zero (bnc#576312). + +------------------------------------------------------------------- +Thu Feb 4 12:17:25 CET 2010 - npiggin(a)suse.de + +- Disable patches.suse/files-slab-rcu.patch. + +------------------------------------------------------------------- +Thu Feb 4 09:46:35 CET 2010 - tiwai(a)suse.de + +- supported.conf: mark snd-wss-lib unsupported + +------------------------------------------------------------------- +Thu Feb 4 09:45:34 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2: + ALSA: hda - Adding support for another IDT 92HD83XXX codec + (bnc#569354). + +------------------------------------------------------------------- +Wed Feb 3 19:17:01 CET 2010 - jbohac(a)suse.cz + +- supported.conf: marked em_cmp supported (bnc#568130) + +------------------------------------------------------------------- +Wed Feb 3 14:57:19 CET 2010 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: automatically install a matching + -devel package if kernel-source is installed. + +------------------------------------------------------------------- +Wed Feb 3 13:06:15 CET 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.33-rc6 and c/s 989. +- patches.xen/xen-netback-generalize: Netback: Generalize + static/global variables into 'struct xen_netbk'. +- patches.xen/xen-netback-kernel-threads: Use Kernel thread to + replace the tasklet. +- patches.xen/xen-netback-multiple-tasklets: Netback: + Multiple tasklets support. + +------------------------------------------------------------------- +Tue Feb 2 15:59:38 CET 2010 - jkosina(a)suse.cz + +- patches.suse/suse-ppc64-branding: the message about crashed kernel + doesn't make sense any more with CONFIG_CRASH_DUMP enabled by + default (bnc#575884). + +------------------------------------------------------------------- +Sat Jan 30 21:51:35 CET 2010 - jeffm(a)suse.com + +- Update to 2.6.33-rc6. + - Eliminated 12 patches. + +------------------------------------------------------------------- +Sat Jan 30 21:30:27 CET 2010 - jeffm(a)suse.com + +- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init + from hugetlb_sysfs_add_hstate instead of adding it elsewhere. + +------------------------------------------------------------------- +Sat Jan 30 09:05:13 CET 2010 - jslaby(a)suse.de + +- patches.suse/kdb-common: Fix hid crash (bnc#570591) + +------------------------------------------------------------------- +Fri Jan 29 12:11:55 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA: + hda - Add support for IDT 92HD88 family codecs (bnc#569354). + +------------------------------------------------------------------- +Fri Jan 29 11:14:39 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + Update patch-mainline tag. + +------------------------------------------------------------------- +Fri Jan 29 10:39:59 CET 2010 - jbenc(a)suse.cz + +- Update config files: fixed vanilla configs. + +------------------------------------------------------------------- +Thu Jan 28 19:27:54 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA: + hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec + (bnc#569354). + +------------------------------------------------------------------- +Thu Jan 28 16:56:02 CET 2010 - jbeulich(a)novell.com + +- patches.suse/supported-flag: Fix -ec2 build. +- patches.suse/supported-flag-enterprise: Refresh. +- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build. + +------------------------------------------------------------------- +Thu Jan 28 16:28:01 CET 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.33-rc5 and c/s 987. +- config.conf: Re-enable Xen. +- Update config files. + +------------------------------------------------------------------- +Thu Jan 28 14:50:18 CET 2010 - jbenc(a)suse.cz + +- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward + user space compatibility and enabled few wireless drivers. + +------------------------------------------------------------------- +Thu Jan 28 14:37:22 CET 2010 - mmarek(a)suse.cz + +- rpm/apply-patches: Add support for an additional series file in + patches.addon/series, this will be applied after the main series. + +------------------------------------------------------------------- +Thu Jan 28 11:17:01 CET 2010 - mmarek(a)suse.cz + +- rpm/apply-patches: put the patch loops from kernel-binary.spec.in + and kernel-source.spec.in to one place. + +------------------------------------------------------------------- +Wed Jan 27 20:24:43 CET 2010 - jeffm(a)suse.de + +- Deleted 28 unused patches. + +------------------------------------------------------------------- +Wed Jan 27 15:56:48 CET 2010 - jeffm(a)suse.com + +- Update config files. + +------------------------------------------------------------------- kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change kernel-vmi.changes: same change New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-xen.changes 2010-02-04 21:54:08.000000000 +0100 @@ -0,0 +1,19397 @@ +------------------------------------------------------------------- +Thu Feb 4 13:23:57 CET 2010 - knikanth(a)suse.de + +- patches.fixes/dm-stripe-zero-stripes: dm-stripe: return -EINVAL + if stripe count is zero (bnc#576312). + +------------------------------------------------------------------- +Thu Feb 4 12:17:25 CET 2010 - npiggin(a)suse.de + +- Disable patches.suse/files-slab-rcu.patch. + +------------------------------------------------------------------- +Thu Feb 4 09:46:35 CET 2010 - tiwai(a)suse.de + +- supported.conf: mark snd-wss-lib unsupported + +------------------------------------------------------------------- +Thu Feb 4 09:45:34 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2: + ALSA: hda - Adding support for another IDT 92HD83XXX codec + (bnc#569354). + +------------------------------------------------------------------- +Wed Feb 3 19:17:01 CET 2010 - jbohac(a)suse.cz + +- supported.conf: marked em_cmp supported (bnc#568130) + +------------------------------------------------------------------- +Wed Feb 3 14:57:19 CET 2010 - mmarek(a)suse.cz + +- rpm/kernel-binary.spec.in: automatically install a matching + -devel package if kernel-source is installed. + +------------------------------------------------------------------- +Wed Feb 3 13:06:15 CET 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.33-rc6 and c/s 989. +- patches.xen/xen-netback-generalize: Netback: Generalize + static/global variables into 'struct xen_netbk'. +- patches.xen/xen-netback-kernel-threads: Use Kernel thread to + replace the tasklet. +- patches.xen/xen-netback-multiple-tasklets: Netback: + Multiple tasklets support. + +------------------------------------------------------------------- +Tue Feb 2 15:59:38 CET 2010 - jkosina(a)suse.cz + +- patches.suse/suse-ppc64-branding: the message about crashed kernel + doesn't make sense any more with CONFIG_CRASH_DUMP enabled by + default (bnc#575884). + +------------------------------------------------------------------- +Sat Jan 30 21:51:35 CET 2010 - jeffm(a)suse.com + +- Update to 2.6.33-rc6. + - Eliminated 12 patches. + +------------------------------------------------------------------- +Sat Jan 30 21:30:27 CET 2010 - jeffm(a)suse.com + +- patches.rpmify/hugetlbfs-fix-section-mismatches: Removed __init + from hugetlb_sysfs_add_hstate instead of adding it elsewhere. + +------------------------------------------------------------------- +Sat Jan 30 09:05:13 CET 2010 - jslaby(a)suse.de + +- patches.suse/kdb-common: Fix hid crash (bnc#570591) + +------------------------------------------------------------------- +Fri Jan 29 12:11:55 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support: ALSA: + hda - Add support for IDT 92HD88 family codecs (bnc#569354). + +------------------------------------------------------------------- +Fri Jan 29 11:14:39 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + Update patch-mainline tag. + +------------------------------------------------------------------- +Fri Jan 29 10:39:59 CET 2010 - jbenc(a)suse.cz + +- Update config files: fixed vanilla configs. + +------------------------------------------------------------------- +Thu Jan 28 19:27:54 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led: ALSA: + hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec + (bnc#569354). + +------------------------------------------------------------------- +Thu Jan 28 16:56:02 CET 2010 - jbeulich(a)novell.com + +- patches.suse/supported-flag: Fix -ec2 build. +- patches.suse/supported-flag-enterprise: Refresh. +- patches.xen/xen3-patch-2.6.33-rc3: Fix ia64 build. + +------------------------------------------------------------------- +Thu Jan 28 16:28:01 CET 2010 - jbeulich(a)novell.com + +- Update Xen patches to 2.6.33-rc5 and c/s 987. +- config.conf: Re-enable Xen. +- Update config files. + +------------------------------------------------------------------- +Thu Jan 28 14:50:18 CET 2010 - jbenc(a)suse.cz + +- Update config files: enabled CONFIG_CFG80211_WEXT to keep backward + user space compatibility and enabled few wireless drivers. + +------------------------------------------------------------------- +Thu Jan 28 14:37:22 CET 2010 - mmarek(a)suse.cz + +- rpm/apply-patches: Add support for an additional series file in + patches.addon/series, this will be applied after the main series. + +------------------------------------------------------------------- +Thu Jan 28 11:17:01 CET 2010 - mmarek(a)suse.cz + +- rpm/apply-patches: put the patch loops from kernel-binary.spec.in + and kernel-source.spec.in to one place. + +------------------------------------------------------------------- +Wed Jan 27 20:24:43 CET 2010 - jeffm(a)suse.de + +- Deleted 28 unused patches. + +------------------------------------------------------------------- +Wed Jan 27 15:56:48 CET 2010 - jeffm(a)suse.com + +- Update config files. + +------------------------------------------------------------------- +Wed Jan 27 14:55:29 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + pci: fix nested spinlock hang in aer_inject (bnc#573578). + +------------------------------------------------------------------- +Wed Jan 27 14:34:07 CET 2010 - mmarek(a)suse.cz + +- Update config files: disable generic_serial users. +- patches.drivers/reenable-generic_serial: Delete. +- rpm/generic_serial-blacklist: Delete (bnc#569676). + +------------------------------------------------------------------- +Wed Jan 27 12:57:31 CET 2010 - jengelh(a)medozas.de + +- remove patches.suse/netfilter-ipv4options [bnc#490142] + +------------------------------------------------------------------- +Wed Jan 27 00:14:42 CET 2010 - jeffm(a)suse.com + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh. + +------------------------------------------------------------------- +Tue Jan 26 07:00:33 CET 2010 - knikanth(a)suse.de + +- supported.conf: Fix misspelt dm-region-hash and mark it supported + correctly (bnc#565962) + +------------------------------------------------------------------- +Mon Jan 25 21:55:49 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.6 + - security fixes + - bugfixes + - obsoletes: + - patches.drivers/8250_pnp-wacom-add + - patches.drivers/staging-hv-fix-smp-problems-in-the-hyperv-core-code.patch + - patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status… + - patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu… + +------------------------------------------------------------------- +Mon Jan 25 20:43:56 CET 2010 - jeffm(a)suse.com + +- supported.conf: Added sparse_keymap (eeepc_laptop depends on it) + +------------------------------------------------------------------- +Mon Jan 25 20:07:23 CET 2010 - npiggin(a)suse.de + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: slab - + handle memoryless nodes V2a (bnc#436025, bnc#570492). + +------------------------------------------------------------------- +Mon Jan 25 17:54:26 CET 2010 - jeffm(a)suse.com + +- Updated to 2.6.33-rc5. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Mon Jan 25 16:46:19 CET 2010 - trenn(a)suse.de + +- Update config files. ++++ 19200 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-xen.changes calling whatdependson for head-i586 New: ---- apply-patches kernel-ec2.changes kernel-ec2.spec kernel-xen.changes kernel-xen.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:30.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor debug @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-debug Summary: A Debug Version of the Kernel Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -229,15 +229,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -723,6 +719,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:30.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor default @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-default Summary: The Standard Kernel Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -244,15 +244,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -736,6 +732,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:30.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor desktop @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -235,15 +235,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -747,6 +743,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:30.000000000 +0100 @@ -27,7 +27,7 @@ Group: Documentation/Man AutoReqProv: on Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif ++++++ kernel-ec2.spec ++++++ ++++ 766 lines (skipped) ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:30.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor pae @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-pae Summary: Kernel with PAE Support Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -235,15 +235,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -741,6 +737,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:30.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor ppc64 @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -239,15 +239,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -745,6 +741,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:30.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor ps3 @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -227,15 +227,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -725,6 +721,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:31.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor s390 @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-s390 Summary: The Standard Kernel Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -228,15 +228,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -720,6 +716,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:31.000000000 +0100 @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define src_install_dir usr/src/linux-%kernelrelease%variant @@ -29,7 +29,7 @@ Name: kernel-source Summary: The Linux Kernel Sources Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -54,6 +54,7 @@ Source13: post.sh Source14: series.conf Source16: guards +Source17: apply-patches Source21: config.conf Source23: supported.conf Source33: check-for-config-changes @@ -97,7 +98,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Prefix: /usr/src -%(chmod +x %_sourcedir/{guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols}) +%(chmod +x %_sourcedir/{apply-patches,guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols}) %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac) %define do_vanilla "%variant" == "" @@ -140,23 +141,15 @@ # Unpack the vanilla kernel sources tar xjf %_sourcedir/linux-%srcversion.tar.bz2 mv linux-%srcversion linux-%kernelrelease%variant -# generate script to apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" \ - >%my_builddir/apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i %my_builddir/:' \ - >>%my_builddir/apply-patches.sh %if %do_vanilla -egrep '^trap|patches\.(kernel\.org|rpmify)/' %my_builddir/apply-patches.sh \ - >%my_builddir/apply-patches-vanilla.sh cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla cd linux-%kernelrelease-vanilla -bash -ex %my_builddir/apply-patches-vanilla.sh +%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") cd .. %endif cd linux-%kernelrelease%variant -bash -ex %my_builddir/apply-patches.sh +%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:31.000000000 +0100 @@ -23,7 +23,7 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) @@ -48,6 +48,9 @@ %ifarch s390 Requires: kernel-s390-devel = %version-%source_rel %endif +%ifarch %ix86 x86_64 +Requires: kernel-xen-devel = %version-%source_rel +%endif Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-source%variant = %version-%source_rel ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:31.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor trace @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-trace Summary: The Realtime Linux Kernel Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -236,15 +236,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -728,6 +724,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:31.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor vanilla @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -232,15 +232,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -724,6 +720,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-vmi.spec ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:31.000000000 +0100 @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.33-rc5 +%define patchversion 2.6.33-rc6 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor vmi @@ -31,7 +31,7 @@ %define obj_install_dir %src_install_dir-obj %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor # Define some CONFIG variables as rpm macros as well. (rpm cannot handle @@ -49,7 +49,7 @@ Name: kernel-vmi Summary: VMI-enabled kernel Version: 2.6.33 -Release: 1 +Release: 2 %if %using_buildservice %else %endif @@ -225,15 +225,11 @@ } > %kernel_build_dir/Module.supported supported_conf --default=0 base >%kernel_build_dir/Module.base cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir if [ -f %_sourcedir/localversion ] ; then cat %_sourcedir/localversion > localversion @@ -719,6 +715,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-xen.spec ++++++ ++++ 766 lines (skipped) ++++++ apply-patches ++++++ #!/bin/sh # # Given a series.conf file and a directory with patches, applies them to the # current directory. # Used by kernel-source.spec.in and kernel-binary.spec.in USAGE="$0 [--vanilla] <series.conf> <patchdir> [symbol ...]" set -e set -o pipefail vanilla=false if test "$1" == "--vanilla"; then vanilla=true shift fi if test $# -lt 2; then echo "$USAGE" >&2 exit 1 fi DIR="${0%/*}" SERIES_CONF=$1 PATCH_DIR=$2 shift 2 trap 'rm -f "$series"' EXIT series=$(mktemp) # support for patches in patches.addon/series cp "$SERIES_CONF" "$series" if ! $vanilla && test -e "$PATCH_DIR/patches.addon/series"; then # make it user-friendly and automatically prepend "patches.addon/" # if there is no "/" sed -r 's|^([[:space:]]*)([^#[:space:]][^/]*)$|\1patches.addon/\2|' \ "$PATCH_DIR/patches.addon/series" >>"$series" fi ( echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" echo "set -ex" "$DIR"/guards "$@" <"$series" | \ if $vanilla; then egrep '^patches\.(kernel\.org|rpmify)/' else cat fi |\ sed "s|^|patch -s -F0 -E -p1 --no-backup-if-mismatch -i $PATCH_DIR/|" ) | sh ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:31.000000000 +0100 @@ -13,8 +13,8 @@ +i386 i386/pae +i386 -syms i386/vmi +i386 -syms i386/debug -#+i386 i386/xen -#+i386 -syms i386/ec2 ++i386 i386/xen ++i386 -syms i386/ec2 +i386 i386/vanilla +i386 -syms i386/trace @@ -25,8 +25,8 @@ +x86_64 x86_64/default +x86_64 x86_64/desktop -#+x86_64 x86_64/xen -#+x86_64 -syms x86_64/ec2 ++x86_64 x86_64/xen ++x86_64 -syms x86_64/ec2 +x86_64 -syms x86_64/debug +x86_64 x86_64/vanilla +x86_64 -syms x86_64/trace ++++++ config.tar.bz2 ++++++ ++++ 15237 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:31.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:31.000000000 +0100 @@ -35,7 +35,7 @@ %define rpm_install_dir %buildroot%obj_install_dir %define kernel_build_dir %my_builddir/linux-obj -%(chmod +x %_sourcedir/{arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) +%(chmod +x %_sourcedir/{apply-patches,arch-symbols,find-provides,guards,check-for-config-changes,check-supported-list,modversions,kabi.pl,split-modules}) %global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu) %define cpu_arch_flavor %cpu_arch/%build_flavor @@ -247,15 +247,11 @@ cd linux-%srcversion -# Apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" >../apply-patches.sh -%_sourcedir/guards $SYMBOLS <%_sourcedir/series.conf | \ -%if %build_vanilla - egrep '^patches\.(kernel\.org|rpmify)/' | \ +%_sourcedir/apply-patches \ +%if %{build_vanilla} + --vanilla \ %endif - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../:' \ - >>../apply-patches.sh -bash -ex ../apply-patches.sh + %_sourcedir/series.conf .. $SYMBOLS cd %kernel_build_dir @@ -780,6 +776,7 @@ Provides: multiversion(kernel) Provides: %name-devel = %version-%source_rel Requires: kernel-source%variant = %version-%source_rel +Supplements: packageand(%name:kernel-source) AutoReqProv: on %description devel ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:32.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:32.000000000 +0100 @@ -57,6 +57,7 @@ Source13: post.sh Source14: series.conf Source16: guards +Source17: apply-patches Source21: config.conf Source23: supported.conf Source33: check-for-config-changes @@ -101,7 +102,7 @@ BuildArch: noarch Prefix: /usr/src -%(chmod +x %_sourcedir/{guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols}) +%(chmod +x %_sourcedir/{apply-patches,guards,check-for-config-changes,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols}) %define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat %_sourcedir/extra-symbols) ; echo $*) %define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac) @@ -152,25 +153,17 @@ tar xjf %_sourcedir/linux-%srcversion.tar.bz2 mv linux-%srcversion linux-%kernelrelease%variant -# generate script to apply patches -echo "trap 'echo \"*** patch \$_ failed ***\"' ERR" \ - >%my_builddir/apply-patches.sh -%_sourcedir/guards %symbols <%_sourcedir/series.conf | \ - sed 's:^:patch -s -F0 -E -p1 --no-backup-if-mismatch -i %my_builddir/:' \ - >>%my_builddir/apply-patches.sh %if %do_vanilla -egrep '^trap|patches\.(kernel\.org|rpmify)/' %my_builddir/apply-patches.sh \ - >%my_builddir/apply-patches-vanilla.sh cp -al linux-%kernelrelease%variant linux-%kernelrelease-vanilla cd linux-%kernelrelease-vanilla -bash -ex %my_builddir/apply-patches-vanilla.sh +%_sourcedir/apply-patches --vanilla %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") cd .. %endif cd linux-%kernelrelease%variant -bash -ex %my_builddir/apply-patches.sh +%_sourcedir/apply-patches %_sourcedir/series.conf %my_builddir %symbols rm -f $(find . -name ".gitignore") if [ -f %_sourcedir/localversion ] ; then ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:32.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:32.000000000 +0100 @@ -1 +1 @@ -2096000 +1048576 ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:32.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:32.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch new/patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch --- old/patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch 2010-01-26 23:36:11.000000000 +0100 +++ new/patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -Subject: zfcp: introduce BSG timeout callback -References: BNC#572659 -From: Gerald Schaefer <geraldsc(a)de.ibm.com> -Patch-mainline: not yet - -Symptom: Kernel panic after a FC BSG requests is aborted while the - corresponding zfcp request is still being processed. -Problem: With zfcp, the underlying hardware cannot abort CT or ELS - requests, so there is nothing to do when the block layer - timeout expires. -Solution: To avoid interference with the block layer timeout, simply - indicate that the block layer timer should be reset. - The timer running in the hardware for the pending CT or ELS - request will return the request when it expires. -Acked-by: John Jolly <jjolly(a)suse.de> - ---- - drivers/s390/scsi/zfcp_ext.h | 1 + - drivers/s390/scsi/zfcp_fc.c | 6 ++++++ - drivers/s390/scsi/zfcp_scsi.c | 1 + - 3 files changed, 8 insertions(+) - ---- a/drivers/s390/scsi/zfcp_ext.h -+++ b/drivers/s390/scsi/zfcp_ext.h -@@ -108,6 +108,7 @@ extern void zfcp_fc_wka_ports_force_offl - extern int zfcp_fc_gs_setup(struct zfcp_adapter *); - extern void zfcp_fc_gs_destroy(struct zfcp_adapter *); - extern int zfcp_fc_exec_bsg_job(struct fc_bsg_job *); -+extern int zfcp_fc_timeout_bsg_job(struct fc_bsg_job *); - - /* zfcp_fsf.c */ - extern int zfcp_fsf_open_port(struct zfcp_erp_action *); ---- a/drivers/s390/scsi/zfcp_fc.c -+++ b/drivers/s390/scsi/zfcp_fc.c -@@ -767,6 +767,12 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_j - } - } - -+int zfcp_fc_timeout_bsg_job(struct fc_bsg_job *job) -+{ -+ /* hardware tracks timeout, reset bsg timeout to not interfere */ -+ return -EAGAIN; -+} -+ - int zfcp_fc_gs_setup(struct zfcp_adapter *adapter) - { - struct zfcp_fc_wka_ports *wka_ports; ---- a/drivers/s390/scsi/zfcp_scsi.c -+++ b/drivers/s390/scsi/zfcp_scsi.c -@@ -652,6 +652,7 @@ struct fc_function_template zfcp_transpo - .show_host_port_state = 1, - .show_host_active_fc4s = 1, - .bsg_request = zfcp_fc_exec_bsg_job, -+ .bsg_timeout = zfcp_fc_timeout_bsg_job, - /* no functions registered for following dynamic attributes but - directly set by LLDD */ - .show_host_port_type = 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch new/patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch --- old/patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch 2010-01-26 23:36:11.000000000 +0100 +++ new/patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,156 +0,0 @@ -Subject: zfcp: set HW timeout requested by BSG request -References: BNC#572659 -From: Gerald Schaefer <geraldsc(a)de.ibm.com> -Patch-mainline: not yet - -Description: zfcp: set HW timeout requested by BSG request -Symptom: BSG request with a different request timeout then the standard - FC requests would return a false completion code. -Problem: The hardware used with zfcp provides a timer for CT and ELS - requests instead of an abort capability for these commands. -Solution: To correctly handle the FC BSG timeouts, pass the timeout from - the BSG requests to the hardware. -Acked-by: John Jolly <jjolly(a)suse.de> - ---- - drivers/s390/scsi/zfcp_ext.h | 4 ++-- - drivers/s390/scsi/zfcp_fc.c | 12 +++++++----- - drivers/s390/scsi/zfcp_fsf.c | 17 ++++++++++------- - 3 files changed, 19 insertions(+), 14 deletions(-) - -Index: linux-rhel6/drivers/s390/scsi/zfcp_ext.h -=================================================================== ---- linux-rhel6.orig/drivers/s390/scsi/zfcp_ext.h -+++ linux-rhel6/drivers/s390/scsi/zfcp_ext.h -@@ -125,8 +125,8 @@ extern struct zfcp_fsf_req *zfcp_fsf_con - extern void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *); - extern int zfcp_fsf_status_read(struct zfcp_qdio *); - extern int zfcp_status_read_refill(struct zfcp_adapter *adapter); --extern int zfcp_fsf_send_ct(struct zfcp_send_ct *, mempool_t *); --extern int zfcp_fsf_send_els(struct zfcp_send_els *); -+extern int zfcp_fsf_send_ct(struct zfcp_send_ct *, mempool_t *, unsigned int); -+extern int zfcp_fsf_send_els(struct zfcp_send_els *, unsigned int); - extern int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *, - struct scsi_cmnd *); - extern void zfcp_fsf_req_free(struct zfcp_fsf_req *); -Index: linux-rhel6/drivers/s390/scsi/zfcp_fc.c -=================================================================== ---- linux-rhel6.orig/drivers/s390/scsi/zfcp_fc.c -+++ linux-rhel6/drivers/s390/scsi/zfcp_fc.c -@@ -39,6 +39,7 @@ struct gpn_ft_resp_acc { - #define ZFCP_GPN_FT_MAX_SIZE (ZFCP_GPN_FT_BUFFERS * PAGE_SIZE \ - - sizeof(struct ct_hdr)) - #define ZFCP_GPN_FT_MAX_ENTRIES ZFCP_GPN_FT_BUFFERS * (ZFCP_GPN_FT_ENTRIES + 1) -+#define ZFCP_FC_CTELS_TMO (2 * R_A_TOV) - - struct ct_iu_gpn_ft_resp { - struct ct_hdr header; -@@ -302,7 +303,8 @@ static int zfcp_fc_ns_gid_pn_request(str - init_completion(&compl_rec.done); - compl_rec.handler = zfcp_fc_ns_gid_pn_eval; - compl_rec.handler_data = (unsigned long) gid_pn; -- ret = zfcp_fsf_send_ct(&gid_pn->ct, adapter->pool.gid_pn_req); -+ ret = zfcp_fsf_send_ct(&gid_pn->ct, adapter->pool.gid_pn_req, -+ ZFCP_FC_CTELS_TMO); - if (!ret) - wait_for_completion(&compl_rec.done); - return ret; -@@ -453,7 +455,7 @@ static int zfcp_fc_adisc(struct zfcp_por - adisc->ls_adisc.wwnn = fc_host_node_name(adapter->scsi_host); - adisc->ls_adisc.nport_id = fc_host_port_id(adapter->scsi_host); - -- ret = zfcp_fsf_send_els(&adisc->els); -+ ret = zfcp_fsf_send_els(&adisc->els, ZFCP_FC_CTELS_TMO); - if (ret) - kmem_cache_free(zfcp_data.adisc_cache, adisc); - -@@ -568,7 +570,7 @@ static int zfcp_fc_send_gpn_ft(struct zf - - init_completion(&compl_rec.done); - compl_rec.handler = NULL; -- ret = zfcp_fsf_send_ct(ct, NULL); -+ ret = zfcp_fsf_send_ct(ct, NULL, ZFCP_FC_CTELS_TMO); - if (!ret) - wait_for_completion(&compl_rec.done); - return ret; -@@ -771,7 +773,7 @@ int zfcp_fc_execute_els_fc_job(struct fc - els_fc_job->els.handler_data = (unsigned long) els_fc_job; - els_fc_job->job = job; - -- return zfcp_fsf_send_els(&els_fc_job->els); -+ return zfcp_fsf_send_els(&els_fc_job->els, job->req->timeout / HZ); - } - - struct zfcp_ct_fc_job { -@@ -849,7 +851,7 @@ int zfcp_fc_execute_ct_fc_job(struct fc_ - ct_fc_job->ct.completion = NULL; - ct_fc_job->job = job; - -- ret = zfcp_fsf_send_ct(&ct_fc_job->ct, NULL); -+ ret = zfcp_fsf_send_ct(&ct_fc_job->ct, NULL, job->req->timeout / HZ); - if (ret) { - kfree(ct_fc_job); - zfcp_fc_wka_port_put(ct_fc_job->ct.wka_port); -Index: linux-rhel6/drivers/s390/scsi/zfcp_fsf.c -=================================================================== ---- linux-rhel6.orig/drivers/s390/scsi/zfcp_fsf.c -+++ linux-rhel6/drivers/s390/scsi/zfcp_fsf.c -@@ -1063,7 +1063,7 @@ static int zfcp_fsf_setup_ct_els_sbals(s - static int zfcp_fsf_setup_ct_els(struct zfcp_fsf_req *req, - struct scatterlist *sg_req, - struct scatterlist *sg_resp, -- int max_sbals) -+ int max_sbals, unsigned int timeout) - { - int ret; - -@@ -1073,8 +1073,10 @@ static int zfcp_fsf_setup_ct_els(struct - - /* common settings for ct/gs and els requests */ - req->qtcb->bottom.support.service_class = FSF_CLASS_3; -- req->qtcb->bottom.support.timeout = 2 * R_A_TOV; -- zfcp_fsf_start_timer(req, (2 * R_A_TOV + 10) * HZ); -+ if (timeout > 255) -+ timeout = 255; /* max value accepted by hardware */ -+ req->qtcb->bottom.support.timeout = timeout; -+ zfcp_fsf_start_timer(req, (timeout + 10) * HZ); - - return 0; - } -@@ -1084,7 +1086,8 @@ static int zfcp_fsf_setup_ct_els(struct - * @ct: pointer to struct zfcp_send_ct with data for request - * @pool: if non-null this mempool is used to allocate struct zfcp_fsf_req - */ --int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool) -+int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool, -+ unsigned int timeout) - { - struct zfcp_wka_port *wka_port = ct->wka_port; - struct zfcp_qdio *qdio = wka_port->adapter->qdio; -@@ -1104,7 +1107,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct - - req->status |= ZFCP_STATUS_FSFREQ_CLEANUP; - ret = zfcp_fsf_setup_ct_els(req, ct->req, ct->resp, -- FSF_MAX_SBALS_PER_REQ); -+ FSF_MAX_SBALS_PER_REQ, timeout); - if (ret) - goto failed_send; - -@@ -1183,7 +1186,7 @@ skip_fsfstatus: - * zfcp_fsf_send_els - initiate an ELS command (FC-FS) - * @els: pointer to struct zfcp_send_els with data for the command - */ --int zfcp_fsf_send_els(struct zfcp_send_els *els) -+int zfcp_fsf_send_els(struct zfcp_send_els *els, unsigned int timeout) - { - struct zfcp_fsf_req *req; - struct zfcp_qdio *qdio = els->adapter->qdio; -@@ -1201,7 +1204,7 @@ int zfcp_fsf_send_els(struct zfcp_send_e - } - - req->status |= ZFCP_STATUS_FSFREQ_CLEANUP; -- ret = zfcp_fsf_setup_ct_els(req, els->req, els->resp, 2); -+ ret = zfcp_fsf_setup_ct_els(req, els->req, els->resp, 2, timeout); - - if (ret) - goto failed_send; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch new/patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch --- old/patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch 2010-01-26 23:36:11.000000000 +0100 +++ new/patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -From: David Rientjes <rientjes(a)google.com> -Subject: x86: Set hotpluggable nodes in nodes_possible_map -References: bnc#567216 -Patch-Mainline: not mainline yet, but x86-tip - -git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip -Commit-ID: 3a5fc0e40cb467e692737bc798bc99773c81e1e2 - -Signed-off-by: Thomas Renninger <trenn(a)suse.de> - -nodes_possible_map does not currently include nodes that have SRAT -entries that are all ACPI_SRAT_MEM_HOT_PLUGGABLE since the bit is -cleared in nodes_parsed if it does not have an online address range. - -Unequivocally setting the bit in nodes_parsed is insufficient since -existing code, such as acpi_get_nodes(), assumes all nodes in the map -have online address ranges. In fact, all code using nodes_parsed -assumes such nodes represent an address range of online memory. - -nodes_possible_map is created by unioning nodes_parsed and -cpu_nodes_parsed; the former represents nodes with online memory and -the latter represents memoryless nodes. We now set the bit for -hotpluggable nodes in cpu_nodes_parsed so that it also gets set in -nodes_possible_map. - -[ hpa: Haicheng Li points out that this makes the naming of the - variable cpu_nodes_parsed somewhat counterintuitive. However, leave - it as is in the interest of keeping the pure bug fix patch small. ] - -Signed-off-by: David Rientjes <rientjes(a)google.com> -Tested-by: Haicheng Li <haicheng.li(a)linux.intel.com> -LKML-Reference: <alpine.DEB.2.00.1001201152040.30528(a)chino.kir.corp.google.com> -Cc: <stable(a)kernel.org> -Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> - -diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c -index a271241..28c6876 100644 ---- a/arch/x86/mm/srat_64.c -+++ b/arch/x86/mm/srat_64.c -@@ -229,9 +229,11 @@ update_nodes_add(int node, unsigned long start, unsigned long end) - printk(KERN_ERR "SRAT: Hotplug zone not continuous. Partly ignored\n"); - } - -- if (changed) -+ if (changed) { -+ node_set(node, cpu_nodes_parsed); - printk(KERN_INFO "SRAT: hot plug zone found %Lx - %Lx\n", - nd->start, nd->end); -+ } - } - - /* Callback for parsing of the Proximity Domain <-> Memory Area mappings */ ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/aacraid-24701-update new/patches.drivers/aacraid-24701-update --- old/patches.drivers/aacraid-24701-update 2010-01-26 23:37:13.000000000 +0100 +++ new/patches.drivers/aacraid-24701-update 1970-01-01 01:00:00.000000000 +0100 @@ -1,534 +0,0 @@ -From: Penchala Narsimha Reddy Chilakala <ServeRAIDDriver(a)hcl.in> -Subject: Problems with aacraid -References: bnc#524242,FATE#307437 - -The attached patch aac24701 was generated for the following issues only: - -Issue:1 --------- - Behavior of the ternary operation in function aac_send_raw_srb () was -observed incorrect in 64-bit version. This issue was because of missing -parenthesis in the condition to check the sg count. - -Fix details: -------------- - Fixed by adding parentheses. - -Issue:2 --------- - Driver IOCTLs is signaled with EINTR while waiting on response from the -lower layers. Returning “EINTR” will never initiate internal retry. - -Fix details: -------------- - Fixed by replacing “EINTR” with “ERESTARTSYS” for mid-layer retries. - -Issue:3 --------- - The driver tends to not free the memory (FIB) when the management -request exits prematurely. The accumulation of such un-freed memory causes the -driver to fail to allocate anymore memory (FIB) and hence return 0x70000 value -to the upper layer, which puts the file system into read only mode. - -Fix details: -------------- - The fix makes sure to free the memory(FIB) even if the request exits -prematurely hence ensuring the driver wouldn’t run out of memory(FIBs) - -Patch ported from SLES11. - -Signed-off-by: Hannes Reinecke <hare(a)suse.de> - -diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c -index 2a88985..7e26ebc 100644 ---- a/drivers/scsi/aacraid/aachba.c -+++ b/drivers/scsi/aacraid/aachba.c -@@ -293,7 +293,10 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag) - status = -EINVAL; - } - } -- aac_fib_complete(fibptr); -+ /* Do not set XferState to zero unless receives a response from F/W */ -+ if (status >= 0) -+ aac_fib_complete(fibptr); -+ - /* Send a CT_COMMIT_CONFIG to enable discovery of devices */ - if (status >= 0) { - if ((aac_commit == 1) || commit_flag) { -@@ -310,13 +313,18 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag) - FsaNormal, - 1, 1, - NULL, NULL); -- aac_fib_complete(fibptr); -+ /* Do not set XferState to zero unless -+ * receives a response from F/W */ -+ if (status >= 0) -+ aac_fib_complete(fibptr); - } else if (aac_commit == 0) { - printk(KERN_WARNING - "aac_get_config_status: Foreign device configurations are being ignored\n"); - } - } -- aac_fib_free(fibptr); -+ /* FIB should be freed only after getting the response from the F/W */ -+ if (status != -ERESTARTSYS) -+ aac_fib_free(fibptr); - return status; - } - -@@ -355,7 +363,9 @@ int aac_get_containers(struct aac_dev *dev) - maximum_num_containers = le32_to_cpu(dresp->ContainerSwitchEntries); - aac_fib_complete(fibptr); - } -- aac_fib_free(fibptr); -+ /* FIB should be freed only after getting the response from the F/W */ -+ if (status != -ERESTARTSYS) -+ aac_fib_free(fibptr); - - if (maximum_num_containers < MAXIMUM_NUM_CONTAINERS) - maximum_num_containers = MAXIMUM_NUM_CONTAINERS; -@@ -1245,8 +1255,12 @@ int aac_get_adapter_info(struct aac_dev* dev) - NULL); - - if (rcode < 0) { -- aac_fib_complete(fibptr); -- aac_fib_free(fibptr); -+ /* FIB should be freed only after -+ * getting the response from the F/W */ -+ if (rcode != -ERESTARTSYS) { -+ aac_fib_complete(fibptr); -+ aac_fib_free(fibptr); -+ } - return rcode; - } - memcpy(&dev->adapter_info, info, sizeof(*info)); -@@ -1270,6 +1284,12 @@ int aac_get_adapter_info(struct aac_dev* dev) - - if (rcode >= 0) - memcpy(&dev->supplement_adapter_info, sinfo, sizeof(*sinfo)); -+ if (rcode == -ERESTARTSYS) { -+ fibptr = aac_fib_alloc(dev); -+ if (!fibptr) -+ return -ENOMEM; -+ } -+ - } - - -@@ -1470,9 +1490,11 @@ int aac_get_adapter_info(struct aac_dev* dev) - (dev->scsi_host_ptr->sg_tablesize * 8) + 112; - } - } -- -- aac_fib_complete(fibptr); -- aac_fib_free(fibptr); -+ /* FIB should be freed only after getting the response from the F/W */ -+ if (rcode != -ERESTARTSYS) { -+ aac_fib_complete(fibptr); -+ aac_fib_free(fibptr); -+ } - - return rcode; - } -@@ -1633,6 +1655,7 @@ static int aac_read(struct scsi_cmnd * scsicmd) - * Alocate and initialize a Fib - */ - if (!(cmd_fibcontext = aac_fib_alloc(dev))) { -+ printk(KERN_WARNING "aac_read: fib allocation failed\n"); - return -1; - } - -@@ -1712,9 +1735,14 @@ static int aac_write(struct scsi_cmnd * scsicmd) - * Allocate and initialize a Fib then setup a BlockWrite command - */ - if (!(cmd_fibcontext = aac_fib_alloc(dev))) { -- scsicmd->result = DID_ERROR << 16; -- scsicmd->scsi_done(scsicmd); -- return 0; -+ /* FIB temporarily unavailable,not catastrophic failure */ -+ -+ /* scsicmd->result = DID_ERROR << 16; -+ * scsicmd->scsi_done(scsicmd); -+ * return 0; -+ */ -+ printk(KERN_WARNING "aac_write: fib allocation failed\n"); -+ return -1; - } - - status = aac_adapter_write(cmd_fibcontext, scsicmd, lba, count, fua); -diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h -index cdbdec9..587c4e6 100644 ---- a/drivers/scsi/aacraid/aacraid.h -+++ b/drivers/scsi/aacraid/aacraid.h -@@ -12,7 +12,7 @@ - *----------------------------------------------------------------------------*/ - - #ifndef AAC_DRIVER_BUILD --# define AAC_DRIVER_BUILD 2461 -+# define AAC_DRIVER_BUILD 24701 - # define AAC_DRIVER_BRANCH "-ms" - #endif - #define MAXIMUM_NUM_CONTAINERS 32 -@@ -1036,6 +1036,9 @@ struct aac_dev - u8 printf_enabled; - u8 in_reset; - u8 msi; -+ int management_fib_count; -+ spinlock_t manage_lock; -+ - }; - - #define aac_adapter_interrupt(dev) \ -diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c -index 0391d75..7e7e262 100644 ---- a/drivers/scsi/aacraid/commctrl.c -+++ b/drivers/scsi/aacraid/commctrl.c -@@ -153,7 +153,7 @@ cleanup: - fibptr->hw_fib_pa = hw_fib_pa; - fibptr->hw_fib_va = hw_fib; - } -- if (retval != -EINTR) -+ if (retval != -ERESTARTSYS) - aac_fib_free(fibptr); - return retval; - } -@@ -322,7 +322,7 @@ return_fib: - } - if (f.wait) { - if(down_interruptible(&fibctx->wait_sem) < 0) { -- status = -EINTR; -+ status = -ERESTARTSYS; - } else { - /* Lock again and retry */ - spin_lock_irqsave(&dev->fib_lock, flags); -@@ -593,10 +593,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) - u64 addr; - void* p; - if (upsg->sg[i].count > -- (dev->adapter_info.options & -+ ((dev->adapter_info.options & - AAC_OPT_NEW_COMM) ? - (dev->scsi_host_ptr->max_sectors << 9) : -- 65536) { -+ 65536)) { - rcode = -EINVAL; - goto cleanup; - } -@@ -645,10 +645,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) - u64 addr; - void* p; - if (usg->sg[i].count > -- (dev->adapter_info.options & -+ ((dev->adapter_info.options & - AAC_OPT_NEW_COMM) ? - (dev->scsi_host_ptr->max_sectors << 9) : -- 65536) { -+ 65536)) { - rcode = -EINVAL; - goto cleanup; - } -@@ -695,10 +695,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) - uintptr_t addr; - void* p; - if (usg->sg[i].count > -- (dev->adapter_info.options & -+ ((dev->adapter_info.options & - AAC_OPT_NEW_COMM) ? - (dev->scsi_host_ptr->max_sectors << 9) : -- 65536) { -+ 65536)) { - rcode = -EINVAL; - goto cleanup; - } -@@ -734,10 +734,10 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) - dma_addr_t addr; - void* p; - if (upsg->sg[i].count > -- (dev->adapter_info.options & -+ ((dev->adapter_info.options & - AAC_OPT_NEW_COMM) ? - (dev->scsi_host_ptr->max_sectors << 9) : -- 65536) { -+ 65536)) { - rcode = -EINVAL; - goto cleanup; - } -@@ -772,8 +772,8 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) - psg->count = cpu_to_le32(sg_indx+1); - status = aac_fib_send(ScsiPortCommand, srbfib, actual_fibsize, FsaNormal, 1, 1, NULL, NULL); - } -- if (status == -EINTR) { -- rcode = -EINTR; -+ if (status == -ERESTARTSYS) { -+ rcode = -ERESTARTSYS; - goto cleanup; - } - -@@ -810,7 +810,7 @@ cleanup: - for(i=0; i <= sg_indx; i++){ - kfree(sg_list[i]); - } -- if (rcode != -EINTR) { -+ if (rcode != -ERESTARTSYS) { - aac_fib_complete(srbfib); - aac_fib_free(srbfib); - } -@@ -842,13 +842,22 @@ static int aac_get_pci_info(struct aac_dev* dev, void __user *arg) - int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg) - { - int status; -- -+ unsigned long mflags; -+ - /* - * HBA gets first crack - */ - -+ spin_lock_irqsave(&dev->manage_lock, mflags); -+ if (dev->management_fib_count > AAC_NUM_MGT_FIB) { -+ printk(KERN_INFO "No management Fibs Available:%d\n", -+ dev->management_fib_count); -+ spin_unlock_irqrestore(&dev->manage_lock, mflags); -+ return -EBUSY; -+ } -+ spin_unlock_irqrestore(&dev->manage_lock, mflags); - status = aac_dev_ioctl(dev, cmd, arg); -- if(status != -ENOTTY) -+ if (status != -ENOTTY) - return status; - - switch (cmd) { -diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c -index d598eba..f25f29d 100644 ---- a/drivers/scsi/aacraid/comminit.c -+++ b/drivers/scsi/aacraid/comminit.c -@@ -194,7 +194,9 @@ int aac_send_shutdown(struct aac_dev * dev) - - if (status >= 0) - aac_fib_complete(fibctx); -- aac_fib_free(fibctx); -+ /* FIB should be freed only after getting the response from the F/W */ -+ if (status != -ERESTARTSYS) -+ aac_fib_free(fibctx); - return status; - } - -@@ -304,6 +306,8 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) - /* - * Check the preferred comm settings, defaults from template. - */ -+ dev->management_fib_count = 0; -+ spin_lock_init(&dev->manage_lock); - dev->max_fib_size = sizeof(struct hw_fib); - dev->sg_tablesize = host->sg_tablesize = (dev->max_fib_size - - sizeof(struct aac_fibhdr) -diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c -index 956261f..d29af45 100644 ---- a/drivers/scsi/aacraid/commsup.c -+++ b/drivers/scsi/aacraid/commsup.c -@@ -189,7 +189,14 @@ struct fib *aac_fib_alloc(struct aac_dev *dev) - - void aac_fib_free(struct fib *fibptr) - { -- unsigned long flags; -+ unsigned long flags, flagsv; -+ -+ spin_lock_irqsave(&fibptr->event_lock, flagsv); -+ if (fibptr->done == 2) { -+ spin_unlock_irqrestore(&fibptr->event_lock, flagsv); -+ return; -+ } -+ spin_unlock_irqrestore(&fibptr->event_lock, flagsv); - - spin_lock_irqsave(&fibptr->dev->fib_lock, flags); - if (unlikely(fibptr->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) -@@ -473,14 +480,27 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, - - if(wait) - spin_lock_irqsave(&fibptr->event_lock, flags); -- aac_adapter_deliver(fibptr); -+ -+ if (aac_adapter_deliver(fibptr) != 0) { -+ printk(KERN_ERR "aac_fib_send: returned -EBUSY\n"); -+ if (wait) -+ spin_unlock_irqrestore(&fibptr->event_lock, flags); -+ return -EBUSY; -+ } -+ - - /* - * If the caller wanted us to wait for response wait now. - */ - - if (wait) { -+ unsigned long mflags; - spin_unlock_irqrestore(&fibptr->event_lock, flags); -+ -+ spin_lock_irqsave(&dev->manage_lock, mflags); -+ dev->management_fib_count++; -+ spin_unlock_irqrestore(&dev->manage_lock, mflags); -+ - /* Only set for first known interruptable command */ - if (wait < 0) { - /* -@@ -515,15 +535,14 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, - } - udelay(5); - } -- } else if (down_interruptible(&fibptr->event_wait)) { -- fibptr->done = 2; -- up(&fibptr->event_wait); -- } -+ } else -+ down_interruptible(&fibptr->event_wait); -+ - spin_lock_irqsave(&fibptr->event_lock, flags); -- if ((fibptr->done == 0) || (fibptr->done == 2)) { -+ if (fibptr->done == 0) { - fibptr->done = 2; /* Tell interrupt we aborted */ - spin_unlock_irqrestore(&fibptr->event_lock, flags); -- return -EINTR; -+ return -ERESTARTSYS; - } - spin_unlock_irqrestore(&fibptr->event_lock, flags); - BUG_ON(fibptr->done == 0); -@@ -689,6 +708,7 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size) - - int aac_fib_complete(struct fib *fibptr) - { -+ unsigned long flags; - struct hw_fib * hw_fib = fibptr->hw_fib_va; - - /* -@@ -709,6 +729,13 @@ int aac_fib_complete(struct fib *fibptr) - * command is complete that we had sent to the adapter and this - * cdb could be reused. - */ -+ spin_lock_irqsave(&fibptr->event_lock, flags); -+ if (fibptr->done == 2) { -+ spin_unlock_irqrestore(&fibptr->event_lock, flags); -+ return 0; -+ } -+ spin_unlock_irqrestore(&fibptr->event_lock, flags); -+ - if((hw_fib->header.XferState & cpu_to_le32(SentFromHost)) && - (hw_fib->header.XferState & cpu_to_le32(AdapterProcessed))) - { -@@ -1355,7 +1382,10 @@ int aac_reset_adapter(struct aac_dev * aac, int forced) - - if (status >= 0) - aac_fib_complete(fibctx); -- aac_fib_free(fibctx); -+ /* FIB should be freed only after getting -+ * the response from the F/W */ -+ if (status != -ERESTARTSYS) -+ aac_fib_free(fibctx); - } - } - -@@ -1759,6 +1789,7 @@ int aac_command_thread(void *data) - struct fib *fibptr; - - if ((fibptr = aac_fib_alloc(dev))) { -+ int status; - __le32 *info; - - aac_fib_init(fibptr); -@@ -1769,15 +1800,21 @@ int aac_command_thread(void *data) - - *info = cpu_to_le32(now.tv_sec); - -- (void)aac_fib_send(SendHostTime, -+ status = aac_fib_send(SendHostTime, - fibptr, - sizeof(*info), - FsaNormal, - 1, 1, - NULL, - NULL); -- aac_fib_complete(fibptr); -- aac_fib_free(fibptr); -+ /* Do not set XferState to zero unless -+ * receives a response from F/W */ -+ if (status >= 0) -+ aac_fib_complete(fibptr); -+ /* FIB should be freed only after -+ * getting the response from the F/W */ -+ if (status != -ERESTARTSYS) -+ aac_fib_free(fibptr); - } - difference = (long)(unsigned)update_interval*HZ; - } else { -diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c -index abc9ef5..92182f6 100644 ---- a/drivers/scsi/aacraid/dpcsup.c -+++ b/drivers/scsi/aacraid/dpcsup.c -@@ -57,7 +57,7 @@ unsigned int aac_response_normal(struct aac_queue * q) - struct hw_fib * hwfib; - struct fib * fib; - int consumed = 0; -- unsigned long flags; -+ unsigned long flags, mflags; - - spin_lock_irqsave(q->lock, flags); - /* -@@ -125,12 +125,21 @@ unsigned int aac_response_normal(struct aac_queue * q) - } else { - unsigned long flagv; - spin_lock_irqsave(&fib->event_lock, flagv); -- if (!fib->done) -+ if (!fib->done) { - fib->done = 1; -- up(&fib->event_wait); -+ up(&fib->event_wait); -+ } - spin_unlock_irqrestore(&fib->event_lock, flagv); -+ -+ spin_lock_irqsave(&dev->manage_lock, mflags); -+ dev->management_fib_count--; -+ spin_unlock_irqrestore(&dev->manage_lock, mflags); -+ - FIB_COUNTER_INCREMENT(aac_config.NormalRecved); - if (fib->done == 2) { -+ spin_lock_irqsave(&fib->event_lock, flagv); -+ fib->done = 0; -+ spin_unlock_irqrestore(&fib->event_lock, flagv); - aac_fib_complete(fib); - aac_fib_free(fib); - } -@@ -232,6 +241,7 @@ unsigned int aac_command_normal(struct aac_queue *q) - - unsigned int aac_intr_normal(struct aac_dev * dev, u32 index) - { -+ unsigned long mflags; - dprintk((KERN_INFO "aac_intr_normal(%p,%x)\n", dev, index)); - if ((index & 0x00000002L)) { - struct hw_fib * hw_fib; -@@ -320,11 +330,25 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 index) - unsigned long flagv; - dprintk((KERN_INFO "event_wait up\n")); - spin_lock_irqsave(&fib->event_lock, flagv); -- if (!fib->done) -+ if (!fib->done) { - fib->done = 1; -- up(&fib->event_wait); -+ up(&fib->event_wait); -+ } - spin_unlock_irqrestore(&fib->event_lock, flagv); -+ -+ spin_lock_irqsave(&dev->manage_lock, mflags); -+ dev->management_fib_count--; -+ spin_unlock_irqrestore(&dev->manage_lock, mflags); -+ - FIB_COUNTER_INCREMENT(aac_config.NormalRecved); -+ if (fib->done == 2) { -+ spin_lock_irqsave(&fib->event_lock, flagv); -+ fib->done = 0; -+ spin_unlock_irqrestore(&fib->event_lock, flagv); -+ aac_fib_complete(fib); -+ aac_fib_free(fib); -+ } -+ - } - return 0; - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-sp1-hda-55-alc259-hp-pin-fix new/patches.drivers/alsa-sp1-hda-55-alc259-hp-pin-fix --- old/patches.drivers/alsa-sp1-hda-55-alc259-hp-pin-fix 2010-01-26 23:37:13.000000000 +0100 +++ new/patches.drivers/alsa-sp1-hda-55-alc259-hp-pin-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -From 4feabefe53eb3742f0b2773a43200d1686f3a288 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai(a)suse.de> -Date: Tue, 19 Jan 2010 15:38:44 +0100 -Subject: [PATCH] ALSA: hda - Fix parsing pin node 0x21 on ALC259 -Git-commit: 4feabefe53eb3742f0b2773a43200d1686f3a288 -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git -Patch-mainline: Submitted -References: bnc#571879 - -ALC259 has a widget NID 0x21 for the output pin, but it wasn't handled -properly in alc268_new_analog_output(). - -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> - ---- - sound/pci/hda/patch_realtek.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -12296,6 +12296,7 @@ static int alc268_new_analog_output(stru - dac = 0x02; - break; - case 0x15: -+ case 0x21: - dac = 0x03; - break; - default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-sp1-hda-56-realtek-eapd-fix new/patches.drivers/alsa-sp1-hda-56-realtek-eapd-fix --- old/patches.drivers/alsa-sp1-hda-56-realtek-eapd-fix 2010-01-26 23:37:13.000000000 +0100 +++ new/patches.drivers/alsa-sp1-hda-56-realtek-eapd-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -From 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai(a)suse.de> -Date: Tue, 19 Jan 2010 15:46:37 +0100 -Subject: [PATCH] ALSA: hda - Turn on EAPD only if available for Realtek codecs -Git-commit: 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git -Patch-mainline: Submitted -References: bnc#571879 - -Some codecs disable widgets used for output pins and reserve as vendor- -spec widgets. Thus we need to check the widget type and pin cap before -actually sending SET_EAPD verbs in the auto-configuration mode. - -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> - ---- - sound/pci/hda/patch_realtek.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -1087,6 +1087,16 @@ - snd_hda_codec_write(codec, 0x20, 0, AC_VERB_SET_PROC_COEF, tmp|0x2010); - } - -+/* turn on/off EAPD control (only if available) */ -+static void set_eapd(struct hda_codec *codec, hda_nid_t nid, int on) -+{ -+ if (get_wcaps_type(get_wcaps(codec, nid)) != AC_WID_PIN) -+ return; -+ if (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_EAPD) -+ snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_EAPD_BTLENABLE, -+ on ? 2 : 0); -+} -+ - static void alc_auto_init_amp(struct hda_codec *codec, int type) - { - unsigned int tmp; -@@ -1104,25 +1114,22 @@ - case ALC_INIT_DEFAULT: - switch (codec->vendor_id) { - case 0x10ec0260: -- snd_hda_codec_write(codec, 0x0f, 0, -- AC_VERB_SET_EAPD_BTLENABLE, 2); -- snd_hda_codec_write(codec, 0x10, 0, -- AC_VERB_SET_EAPD_BTLENABLE, 2); -+ set_eapd(codec, 0x0f, 1); -+ set_eapd(codec, 0x10, 1); - break; - case 0x10ec0262: - case 0x10ec0267: - case 0x10ec0268: - case 0x10ec0269: -+ case 0x10ec0270: - case 0x10ec0272: - case 0x10ec0660: - case 0x10ec0662: - case 0x10ec0663: - case 0x10ec0862: - case 0x10ec0889: -- snd_hda_codec_write(codec, 0x14, 0, -- AC_VERB_SET_EAPD_BTLENABLE, 2); -- snd_hda_codec_write(codec, 0x15, 0, -- AC_VERB_SET_EAPD_BTLENABLE, 2); -+ set_eapd(codec, 0x14, 1); -+ set_eapd(codec, 0x15, 1); - break; - } - switch (codec->vendor_id) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led new/patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led --- old/patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led 2010-02-04 09:45:38.000000000 +0100 @@ -0,0 +1,37 @@ +From e108c7b79e91b45a3f04762c44fd404a5d9be069 Mon Sep 17 00:00:00 2001 +From: Vitaliy Kulikov <Vitaliy.Kulikov(a)idt.com> +Date: Thu, 28 Jan 2010 19:21:07 +0100 +Subject: [PATCH] ALSA: hda - Add mute LED check for HP laptops with IDT 92HD83xxx codec +Git-commit: e108c7b79e91b45a3f04762c44fd404a5d9be069 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git +Patch-mainline: Submitted +References: bnc#569354 + +This patch adds HP mute LED support for IDT 92HD81/3 family of the codecs. + +Signed-off-by: Vitaliy Kulikov <Vitaliy.Kulikov(a)idt.com> +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_sigmatel.c | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c +index dbffb5b..cb9802f 100644 +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -5332,6 +5332,11 @@ again: + if (spec->board_config == STAC_92HD83XXX_HP) + spec->gpio_led = 0x01; + ++ if (find_mute_led_gpio(codec)) ++ snd_printd("mute LED gpio %d polarity %d\n", ++ spec->gpio_led, ++ spec->gpio_led_polarity); ++ + #ifdef CONFIG_SND_HDA_POWER_SAVE + if (spec->gpio_led) { + spec->gpio_mask |= spec->gpio_led; +-- +1.6.6.1 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support new/patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support --- old/patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support 2010-02-04 09:45:38.000000000 +0100 @@ -0,0 +1,77 @@ +From 36706005d90642bccabfaacbb24d135155e984a8 Mon Sep 17 00:00:00 2001 +From: Charles Chin <Charles.Chin(a)idt.com> +Date: Fri, 29 Jan 2010 12:05:51 +0100 +Subject: [PATCH] ALSA: hda - Add support for IDT 92HD88 family codecs +Git-commit: 36706005d90642bccabfaacbb24d135155e984a8 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git +Patch-mainline: Submitted +References: bnc#569354 + +Signed-off-by: Charles Chin <Charles.Chin(a)idt.com> +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_sigmatel.c | 26 ++++++++++++++++++++++++++ + 1 files changed, 26 insertions(+), 0 deletions(-) + +diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c +index cb9802f..9694675 100644 +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -568,6 +568,11 @@ static hda_nid_t stac92hd83xxx_pin_nids[10] = { + 0x0f, 0x10, 0x11, 0x1f, 0x20, + }; + ++static hda_nid_t stac92hd88xxx_pin_nids[10] = { ++ 0x0a, 0x0b, 0x0c, 0x0d, ++ 0x0f, 0x11, 0x1f, 0x20, ++}; ++ + #define STAC92HD71BXX_NUM_PINS 13 + static hda_nid_t stac92hd71bxx_pin_nids_4port[STAC92HD71BXX_NUM_PINS] = { + 0x0a, 0x0b, 0x0c, 0x0d, 0x00, +@@ -2873,6 +2878,13 @@ static hda_nid_t get_unassigned_dac(struct hda_codec *codec, hda_nid_t nid) + + conn_len = snd_hda_get_connections(codec, nid, conn, + HDA_MAX_CONNECTIONS); ++ /* 92HD88: trace back up the link of nids to find the DAC */ ++ while (conn_len == 1 && (get_wcaps_type(get_wcaps(codec, conn[0])) ++ != AC_WID_AUD_OUT)) { ++ nid = conn[0]; ++ conn_len = snd_hda_get_connections(codec, nid, conn, ++ HDA_MAX_CONNECTIONS); ++ } + for (j = 0; j < conn_len; j++) { + wcaps = get_wcaps(codec, conn[j]); + wtype = get_wcaps_type(wcaps); +@@ -5318,6 +5330,16 @@ again: + stac92hd83xxx_brd_tbl[spec->board_config]); + + switch (codec->vendor_id) { ++ case 0x111d7666: ++ case 0x111d7667: ++ case 0x111d7668: ++ case 0x111d7669: ++ spec->num_pins = ARRAY_SIZE(stac92hd88xxx_pin_nids); ++ spec->pin_nids = stac92hd88xxx_pin_nids; ++ spec->mono_nid = 0; ++ spec->digbeep_nid = 0; ++ spec->num_pwrs = 0; ++ break; + case 0x111d7604: + case 0x111d7605: + case 0x111d76d5: +@@ -6243,6 +6265,10 @@ static struct hda_codec_preset snd_hda_preset_sigmatel[] = { + { .id = 0x111d7604, .name = "92HD83C1X5", .patch = patch_stac92hd83xxx}, + { .id = 0x111d7605, .name = "92HD81B1X5", .patch = patch_stac92hd83xxx}, + { .id = 0x111d76d5, .name = "92HD81B1C5", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d7666, .name = "92HD88B3", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d7667, .name = "92HD88B1", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d7668, .name = "92HD88B2", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d7669, .name = "92HD88B4", .patch = patch_stac92hd83xxx}, + { .id = 0x111d7608, .name = "92HD75B2X5", .patch = patch_stac92hd71bxx}, + { .id = 0x111d7674, .name = "92HD73D1X5", .patch = patch_stac92hd73xx }, + { .id = 0x111d7675, .name = "92HD73C1X5", .patch = patch_stac92hd73xx }, +-- +1.6.6.1 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2 new/patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2 --- old/patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2 2010-02-04 09:45:38.000000000 +0100 @@ -0,0 +1,34 @@ +From a9694faa287888b4fb10849649b6c94d0a1c9940 Mon Sep 17 00:00:00 2001 +From: Vitaliy Kulikov <Vitaliy.Kulikov(a)idt.com> +Date: Thu, 4 Feb 2010 08:58:23 +0100 +Subject: [PATCH] ALSA: hda - Adding support for another IDT 92HD83XXX codec +Git-commit: a9694faa287888b4fb10849649b6c94d0a1c9940 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git +Patch-mainline: Submitted +References: bnc#569354 + +Signed-off-by: Vitaliy Kulikov <Vitaliy.Kulikov(a)idt.com> +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_sigmatel.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/pci/hda/patch_sigmatel.c ++++ b/sound/pci/hda/patch_sigmatel.c +@@ -5290,6 +5290,7 @@ + spec->num_pwrs = 0; + break; + case 0x111d7604: ++ case 0x111d76d4: + case 0x111d7605: + case 0x111d76d5: + if (spec->board_config == STAC_92HD83XXX_PWR_REF) +@@ -6148,6 +6149,7 @@ + { .id = 0x838476a7, .name = "STAC9254D", .patch = patch_stac9205 }, + { .id = 0x111d7603, .name = "92HD75B3X5", .patch = patch_stac92hd71bxx}, + { .id = 0x111d7604, .name = "92HD83C1X5", .patch = patch_stac92hd83xxx}, ++ { .id = 0x111d76d4, .name = "92HD83C1C5", .patch = patch_stac92hd83xxx}, + { .id = 0x111d7605, .name = "92HD81B1X5", .patch = patch_stac92hd83xxx}, + { .id = 0x111d76d5, .name = "92HD81B1C5", .patch = patch_stac92hd83xxx}, + { .id = 0x111d7666, .name = "92HD88B3", .patch = patch_stac92hd83xxx}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/qlge-0026-Add-firmware-core-dump.patch new/patches.drivers/qlge-0026-Add-firmware-core-dump.patch --- old/patches.drivers/qlge-0026-Add-firmware-core-dump.patch 2010-01-26 23:37:13.000000000 +0100 +++ new/patches.drivers/qlge-0026-Add-firmware-core-dump.patch 2010-02-04 09:45:38.000000000 +0100 @@ -3,7 +3,7 @@ Date: Thu, 5 Nov 2009 13:29:16 -0800 Subject: [PATCH] qlge: Add firmware core dump. References: bnc#560420, FATE#307130 -Patch-mainline: ??? +Patch-mainline: Unknown Signed-off-by: Ron Mercer <ron.mercer(a)qlogic.com> Signed-off-by: Brandon Philips <bphilips(a)suse.de> @@ -1772,7 +1772,7 @@ + if (qdev->mpi_coredump == NULL) { + dev_err(&pdev->dev, "Coredump alloc failed.\n"); + err = -ENOMEM; -+ goto err_out; ++ goto err_out2; + } + } /* make sure the EEPROM is good */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/sky2-optima-fix-pci-cfg new/patches.drivers/sky2-optima-fix-pci-cfg --- old/patches.drivers/sky2-optima-fix-pci-cfg 2010-01-26 23:37:13.000000000 +0100 +++ new/patches.drivers/sky2-optima-fix-pci-cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -From: Takashi Iwai <tiwai(a)suse.de> -Subject: net: Add missing TST_CFG_WRITE bits around sky2_pci_write -Patch-mainline: -References: bnc#544760 - -Add missing TST_CFG_WRITE bits around sky2_pci_write*() in Optima -setup routines. Without the cfg-write bits, the driver may spew endless -link-up messages through qlink irq. - -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> - ---- - drivers/net/sky2.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/net/sky2.c -+++ b/drivers/net/sky2.c -@@ -2121,7 +2121,9 @@ static void sky2_qlink_intr(struct sky2_ - - /* reset PHY Link Detect */ - phy = sky2_pci_read16(hw, PSM_CONFIG_REG4); -+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); - sky2_pci_write16(hw, PSM_CONFIG_REG4, phy | 1); -+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); - - sky2_link_up(sky2); - } -@@ -3042,6 +3044,7 @@ static void sky2_reset(struct sky2_hw *h - reg <<= PSM_CONFIG_REG4_TIMER_PHY_LINK_DETECT_BASE; - - /* reset PHY Link Detect */ -+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON); - sky2_pci_write16(hw, PSM_CONFIG_REG4, - reg | PSM_CONFIG_REG4_RST_PHY_LINK_DETECT); - sky2_pci_write16(hw, PSM_CONFIG_REG4, reg); -@@ -3060,6 +3063,7 @@ static void sky2_reset(struct sky2_hw *h - /* restore the PCIe Link Control register */ - sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg); - } -+ sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF); - - /* re-enable PEX PM in PEX PHY debug reg. 8 (clear bit 12) */ - sky2_write32(hw, Y2_PEX_PHY_DATA, PEX_DB_ACCESS | (0x08UL << 16)); ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/aic79xx-null-scb-in-nonpkt-busfree new/patches.fixes/aic79xx-null-scb-in-nonpkt-busfree --- old/patches.fixes/aic79xx-null-scb-in-nonpkt-busfree 2010-01-27 14:55:38.000000000 +0100 +++ new/patches.fixes/aic79xx-null-scb-in-nonpkt-busfree 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -From: Hannes Reinecke <hare(a)suse.de> -Subject: aic79xx: check for non-NULL scb in ahd_handle_nonpkt_busfree -References: bnc#542568 -Patch-Mainline: Merged in scsi-misc - -When removing several devices aic79xx will occasionally Oops -in ahd_handle_nonpkt_busfree during rescan. Looking at the -code I found that we're indeed not checking if the scb in -question is NULL. So check for it before accessing it. - -Signed-off-by: Hannes Reinecke <hare(a)suse.de> - -diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c -index 4d419c1..92cc866 100644 ---- a/drivers/scsi/aic7xxx/aic79xx_core.c -+++ b/drivers/scsi/aic7xxx/aic79xx_core.c -@@ -3171,13 +3171,16 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) - tinfo->curr.transport_version = 2; - tinfo->goal.transport_version = 2; - tinfo->goal.ppr_options = 0; -- /* -- * Remove any SCBs in the waiting for selection -- * queue that may also be for this target so -- * that command ordering is preserved. -- */ -- ahd_freeze_devq(ahd, scb); -- ahd_qinfifo_requeue_tail(ahd, scb); -+ if (scb != NULL) { -+ /* -+ * Remove any SCBs in the waiting -+ * for selection queue that may -+ * also be for this target so that -+ * command ordering is preserved. -+ */ -+ ahd_freeze_devq(ahd, scb); -+ ahd_qinfifo_requeue_tail(ahd, scb); -+ } - printerror = 0; - } - } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE) -@@ -3194,13 +3197,16 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) - MSG_EXT_WDTR_BUS_8_BIT, - AHD_TRANS_CUR|AHD_TRANS_GOAL, - /*paused*/TRUE); -- /* -- * Remove any SCBs in the waiting for selection -- * queue that may also be for this target so that -- * command ordering is preserved. -- */ -- ahd_freeze_devq(ahd, scb); -- ahd_qinfifo_requeue_tail(ahd, scb); -+ if (scb != NULL) { -+ /* -+ * Remove any SCBs in the waiting for -+ * selection queue that may also be for -+ * this target so that command ordering -+ * is preserved. -+ */ -+ ahd_freeze_devq(ahd, scb); -+ ahd_qinfifo_requeue_tail(ahd, scb); -+ } - printerror = 0; - } else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE) - && ppr_busfree == 0) { -@@ -3217,13 +3223,16 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) - /*ppr_options*/0, - AHD_TRANS_CUR|AHD_TRANS_GOAL, - /*paused*/TRUE); -- /* -- * Remove any SCBs in the waiting for selection -- * queue that may also be for this target so that -- * command ordering is preserved. -- */ -- ahd_freeze_devq(ahd, scb); -- ahd_qinfifo_requeue_tail(ahd, scb); -+ if (scb != NULL) { -+ /* -+ * Remove any SCBs in the waiting for -+ * selection queue that may also be for -+ * this target so that command ordering -+ * is preserved. -+ */ -+ ahd_freeze_devq(ahd, scb); -+ ahd_qinfifo_requeue_tail(ahd, scb); -+ } - printerror = 0; - } else if ((ahd->msg_flags & MSG_FLAG_EXPECT_IDE_BUSFREE) != 0 - && ahd_sent_msg(ahd, AHDMSG_1B, -@@ -3251,7 +3260,7 @@ ahd_handle_nonpkt_busfree(struct ahd_softc *ahd) - * the message phases. We check it last in case we - * had to send some other message that caused a busfree. - */ -- if (printerror != 0 -+ if (scb != NULL && printerror != 0 - && (lastphase == P_MESGIN || lastphase == P_MESGOUT) - && ((ahd->msg_flags & MSG_FLAG_EXPECT_PPR_BUSFREE) != 0)) { - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/dm-stripe-zero-stripes new/patches.fixes/dm-stripe-zero-stripes --- old/patches.fixes/dm-stripe-zero-stripes 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/dm-stripe-zero-stripes 2010-02-04 13:24:08.000000000 +0100 @@ -0,0 +1,76 @@ +From: Nikanth Karthikesan <knikanth(a)suse.de> +Subject: dm-stripe: return -EINVAL if stripe count is zero +References: bnc#576312 +Patch-mainline: Not yet. https://www.redhat.com/archives/dm-devel/2010-February/msg00041.html + +If zero is passed as stripe count to the stripe_ctr, it segfaults with +a divide by zero error. + +divide error: 0000 [#1] PREEMPT SMP +last sysfs file: /sys/kernel/uevent_seqnum +CPU 1 +Pid: 3252, comm: dmsetup Not tainted 2.6.33-rc5-9-default #3 / +RIP: 0010:[<ffffffffa00e6ad7>] [<ffffffffa00e6ad7>] stripe_ctr+0xd5/0x28d [dm_mod] +RSP: 0018:ffff88003cb7dce8 EFLAGS: 00010246 +RAX: 0000000000000400 RBX: 0000000000000200 RCX: 0000000000000000 +RDX: 0000000000000000 RSI: ffff88003cb7dd08 RDI: ffffc900008fb165 +RBP: ffff88003cb7dd38 R08: 0000000000000200 R09: 000000000000000a +R10: ffffffffa00ec630 R11: ffffffffa00ec638 R12: 0000000000000004 +R13: 0000000000000200 R14: ffffc900008f0040 R15: 0000000000000000 +FS: 00007f9551621780(0000) GS:ffff880003600000(0000) knlGS:0000000000000000 +CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +CR2: 00007f95514f7000 CR3: 00000000343c9000 CR4: 00000000000006e0 +DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 +Process dmsetup (pid: 3252, threadinfo ffff88003cb7c000, task ffff880034004f40) +Stack: + ffff88003cb7dd38 ffff88003d8d0400 ffff88003cb7dd60 ffffc900008f0040 +<0> ffffc900008fb165 0000000000000400 ffffc900008f0040 0000000000000000 +<0> ffff88003d8d0200 ffffc900008fb150 ffff88003cb7dd98 ffffffffa00e5dec +Call Trace: + [<ffffffffa00e5dec>] dm_table_add_target+0x152/0x1cf [dm_mod] + [<ffffffffa00e7cca>] table_load+0x257/0x266 [dm_mod] + [<ffffffffa00e7a73>] ? table_load+0x0/0x266 [dm_mod] + [<ffffffffa00e89c6>] ctl_ioctl+0x1ce/0x226 [dm_mod] + [<ffffffff8106a218>] ? sched_clock_cpu+0xe3/0xeb + [<ffffffffa00e8a2c>] dm_ctl_ioctl+0xe/0x12 [dm_mod] + [<ffffffff81117c08>] vfs_ioctl+0x2a/0x9e + [<ffffffff811181bd>] do_vfs_ioctl+0x4b7/0x4f4 + [<ffffffff81306b3a>] ? _raw_spin_unlock_irqrestore+0x76/0x92 + [<ffffffff811bbe57>] ? __up_write+0x12d/0x13c + [<ffffffff81306f39>] ? retint_swapgs+0x13/0x1b + [<ffffffff8111824f>] sys_ioctl+0x55/0x77 + [<ffffffff81002d82>] system_call_fastpath+0x16/0x1b +Code: 07 77 0a 49 c7 46 38 14 b2 0e a0 eb 9f 49 8b 56 18 8d 43 ff 48 85 d0 74 0a 49 c7 46 38 27 b2 0e a0 eb 89 48 89 d0 44 89 f9 31 d2 <48> f7 f1 44 89 7d c4 48 85 d2 48 +89 45 b0 74 0d 49 c7 46 38 51 +RIP [<ffffffffa00e6ad7>] stripe_ctr+0xd5/0x28d [dm_mod] + RSP <ffff88003cb7dce8> +---[ end trace fa87918cd9541274 ]--- + +This patch returns -EINVAL, if zero is passed as stripe count. + +With this patch we get the following error message. +device-mapper: table: 253:0: striped: Invalid stripe count +device-mapper: ioctl: error adding target to table + +And dmsetup exits gracefully with following error message. +device-mapper: reload ioctl failed: Invalid argument +Command failed + +Signed-off-by: Nikanth Karthikesan <knikanth suse de> + +--- + +Index: linux-2.6.32-master/drivers/md/dm-stripe.c +=================================================================== +--- linux-2.6.32-master.orig/drivers/md/dm-stripe.c ++++ linux-2.6.32-master/drivers/md/dm-stripe.c +@@ -110,7 +110,7 @@ static int stripe_ctr(struct dm_target * + } + + stripes = simple_strtoul(argv[0], &end, 10); +- if (*end) { ++ if (!stripes || *end) { + ti->error = "Invalid stripe count"; + return -EINVAL; + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch new/patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch --- old/patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch 2010-01-27 14:55:38.000000000 +0100 +++ new/patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -From: Andrew Patterson <andrew.patterson(a)hp.com> -Subject: pci: fix nested spinlock hang in aer_inject -References: bnc#573578 -Patch-mainline: bd1f46deba615 in PCI subsystem tree - -The aer_inject module hangs in aer_inject() when checking the device's -error masks. The hang is due to a recursive use of the aer_inject lock. -The aer_inject() routine grabs the lock while processing the error and then -calls pci_read_config_dword to read the masks. The pci_read_config_dword -routine is earlier overridden by pci_read_aer, which among other things, -grabs the aer_inject lock. - -Fixed by moving the pci_read_config_dword calls to read the masks to before -the lock is taken. - -Signed-off-by: Andrew Patterson <andrew.patterson(a)hp.com> -Acked-by: Huang Ying <ying.huang(a)intel.com> -Acked-by: Jiri Kosina <jkosina(a)suse.cz> - -diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c -index 8c30a95..223052b 100644 ---- a/drivers/pci/pcie/aer/aer_inject.c -+++ b/drivers/pci/pcie/aer/aer_inject.c -@@ -321,7 +321,7 @@ static int aer_inject(struct aer_error_inj *einj) - unsigned long flags; - unsigned int devfn = PCI_DEVFN(einj->dev, einj->fn); - int pos_cap_err, rp_pos_cap_err; -- u32 sever, mask; -+ u32 sever, cor_mask, uncor_mask; - int ret = 0; - - dev = pci_get_domain_bus_and_slot((int)einj->domain, einj->bus, devfn); -@@ -339,6 +339,9 @@ static int aer_inject(struct aer_error_inj *einj) - goto out_put; - } - pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_SEVER, &sever); -+ pci_read_config_dword(dev, pos_cap_err + PCI_ERR_COR_MASK, &cor_mask); -+ pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_MASK, -+ &uncor_mask); - - rp_pos_cap_err = pci_find_ext_capability(rpdev, PCI_EXT_CAP_ID_ERR); - if (!rp_pos_cap_err) { -@@ -374,17 +377,14 @@ static int aer_inject(struct aer_error_inj *einj) - err->header_log2 = einj->header_log2; - err->header_log3 = einj->header_log3; - -- pci_read_config_dword(dev, pos_cap_err + PCI_ERR_COR_MASK, &mask); -- if (einj->cor_status && !(einj->cor_status & ~mask)) { -+ if (einj->cor_status && !(einj->cor_status & ~cor_mask)) { - ret = -EINVAL; - printk(KERN_WARNING "The correctable error(s) is masked " - "by device\n"); - spin_unlock_irqrestore(&inject_lock, flags); - goto out_put; - } -- -- pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_MASK, &mask); -- if (einj->uncor_status && !(einj->uncor_status & ~mask)) { -+ if (einj->uncor_status && !(einj->uncor_status & ~uncor_mask)) { - ret = -EINVAL; - printk(KERN_WARNING "The uncorrectable error(s) is masked " - "by device\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-fc-class-allow-LLD-bsg-timeout new/patches.fixes/scsi-fc-class-allow-LLD-bsg-timeout --- old/patches.fixes/scsi-fc-class-allow-LLD-bsg-timeout 2010-01-27 14:55:38.000000000 +0100 +++ new/patches.fixes/scsi-fc-class-allow-LLD-bsg-timeout 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -From: Gerald Schaefer <geraldsc(a)de.ibm.com> -Subject: scsi_transport_fc: Allow LLD to reset FC BSG timeout -References: bnc#572658 -Patch-Mainline: 2.6.33 - -The hardware used with zfcp cannot abort a currently pending CT or ELS -request. Therefore we need the option to postpone the timeout -triggered request abort within the fc layer, since there is nothing -zfcp can do to stop the request at this point. - -Cc: James Smart <James.Smart(a)emulex.com> -Signed-off-by: Swen Schillig <swen(a)vnet.ibm.com> -Signed-off-by: Christof Schmitt <christof.schmitt(a)de.ibm.com> -Signed-off-by: James Bottomley <James.Bottomley(a)suse.de> ---- - drivers/scsi/scsi_transport_fc.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/scsi/scsi_transport_fc.c -+++ b/drivers/scsi/scsi_transport_fc.c -@@ -3543,7 +3543,10 @@ fc_bsg_job_timeout(struct request *req) - if (!done && i->f->bsg_timeout) { - /* call LLDD to abort the i/o as it has timed out */ - err = i->f->bsg_timeout(job); -- if (err) -+ if (err == -EAGAIN) { -+ job->ref_cnt--; -+ return BLK_EH_RESET_TIMER; -+ } else if (err) - printk(KERN_ERR "ERROR: FC BSG request timeout - LLD " - "abort failed with status %d\n", err); - } ++++++ patches.kernel.org.tar.bz2 ++++++ kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: byte 11, line 1 ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/hugetlbfs-fix-section-mismatches new/patches.rpmify/hugetlbfs-fix-section-mismatches --- old/patches.rpmify/hugetlbfs-fix-section-mismatches 2010-01-26 23:36:39.000000000 +0100 +++ new/patches.rpmify/hugetlbfs-fix-section-mismatches 2010-01-30 21:52:44.000000000 +0100 @@ -1,42 +1,31 @@ From: Jeff Mahoney <jeffm(a)suse.com> Subject: hugetlb: Fix section mismatches +Patch-mainline: Submitted 30 Jan 2010 - hugetlb_register_node calls hugetlb_sysfs_add_hstate, which is marked with - __init. Since hugetlb_register_node is only called by - hugetlb_register_all_nodes, which in turn is only called by hugetlb_init, - it's safe to mark both of them as __init. + hugetlb_sysfs_add_hstate is called by hugetlb_register_node directly + during init and also indirectly via sysfs after init. + + This patch removes the __init tag from hugetlb_sysfs_add_hstate. Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +Cc: Lee.Schermerhorn(a)hp.com <Lee.Schermerhorn(a)hp.com> --- - mm/hugetlb.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + mm/hugetlb.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) --- a/mm/hugetlb.c +++ b/mm/hugetlb.c -@@ -1648,7 +1648,7 @@ void hugetlb_unregister_node(struct node - * hugetlb module exit: unregister hstate attributes from node sysdevs - * that have them. - */ --static void hugetlb_unregister_all_nodes(void) -+static void __init hugetlb_unregister_all_nodes(void) - { - int nid; +@@ -1515,10 +1515,9 @@ static struct attribute_group hstate_att + .attrs = hstate_attrs, + }; -@@ -1668,7 +1668,7 @@ static void hugetlb_unregister_all_nodes - * Register hstate attributes for a single node sysdev. - * No-op if attributes already registered. - */ --void hugetlb_register_node(struct node *node) -+void __init hugetlb_register_node(struct node *node) +-static int __init hugetlb_sysfs_add_hstate(struct hstate *h, +- struct kobject *parent, +- struct kobject **hstate_kobjs, +- struct attribute_group *hstate_attr_group) ++static int hugetlb_sysfs_add_hstate(struct hstate *h, struct kobject *parent, ++ struct kobject **hstate_kobjs, ++ struct attribute_group *hstate_attr_group) { - struct hstate *h; - struct node_hstate *nhs = &node_hstates[node->sysdev.id]; -@@ -1683,7 +1683,7 @@ void hugetlb_register_node(struct node * - * sysdevs of nodes that have memory. All on-line nodes should have - * registered their associated sysdev by this time. - */ --static void hugetlb_register_all_nodes(void) -+static void __init hugetlb_register_all_nodes(void) - { - int nid; - + int retval; + int hi = h - hstates; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/smsc47m1-fix-section-mismatch new/patches.rpmify/smsc47m1-fix-section-mismatch --- old/patches.rpmify/smsc47m1-fix-section-mismatch 2010-01-26 23:36:39.000000000 +0100 +++ new/patches.rpmify/smsc47m1-fix-section-mismatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: smsc47m1: Fix section mismatch - - smsc47m1_restore is called from sm_smsc47m1_exit, which is an __exit - function, so it can't be __init. - -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> ---- - drivers/hwmon/smsc47m1.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/hwmon/smsc47m1.c -+++ b/drivers/hwmon/smsc47m1.c -@@ -488,7 +488,7 @@ static int __init smsc47m1_find(unsigned - } - - /* Restore device to its initial state */ --static void __init smsc47m1_restore(const struct smsc47m1_sio_data *sio_data) -+static void smsc47m1_restore(const struct smsc47m1_sio_data *sio_data) - { - if ((sio_data->activate & 0x01) == 0) { - superio_enter(); ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/kdb-common new/patches.suse/kdb-common --- old/patches.suse/kdb-common 2010-01-27 00:14:47.000000000 +0100 +++ new/patches.suse/kdb-common 2010-02-02 17:08:49.000000000 +0100 @@ -3,6 +3,7 @@ Subject: kdb-v4.4-2.6.32-common-3 References: FATE#303971 X-URL: ftp://oss.sgi.com/www/projects/kdb/download/v4.4/ +Patch-mainline: Probably never The KDB common code. @@ -61,7 +62,7 @@ kdb/kdb_id.c | 236 + kdb/kdb_io.c | 859 ++++ kdb/kdbdereference.c | 7257 ++++++++++++++++++++++++++++++++++ - kdb/kdbmain.c | 4335 ++++++++++++++++++++ + kdb/kdbmain.c | 4332 ++++++++++++++++++++ kdb/kdbsupport.c | 1154 +++++ kdb/modules/Makefile | 14 kdb/modules/kdbm_debugtypes.c | 388 + @@ -102,16 +103,16 @@ kdb/modules/lcrash/lc_eval.h | 225 + kernel/exit.c | 3 kernel/kallsyms.c | 23 - kernel/kexec.c | 16 + kernel/kexec.c | 15 kernel/module.c | 19 - kernel/panic.c | 8 + kernel/panic.c | 9 kernel/sched.c | 109 kernel/signal.c | 49 lib/bug.c | 8 mm/hugetlb.c | 22 mm/mmzone.c | 4 mm/swapfile.c | 22 - 96 files changed, 31713 insertions(+), 9 deletions(-) + 96 files changed, 31710 insertions(+), 9 deletions(-) --- /dev/null +++ b/Documentation/kdb/bt_x86 @@ -5133,7 +5134,7 @@ +LOCKED page_struct index cnt flags --- a/Makefile +++ b/Makefile -@@ -666,6 +666,7 @@ export mod_strip_cmd +@@ -672,6 +672,7 @@ export mod_strip_cmd ifeq ($(KBUILD_EXTMOD),) core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ @@ -5153,7 +5154,7 @@ extern void ctrl_alt_del(void); -@@ -1187,6 +1190,13 @@ static void kbd_keycode(unsigned int key +@@ -1204,6 +1207,13 @@ static void kbd_keycode(unsigned int key } #endif @@ -5169,7 +5170,7 @@ if (!sysrq_down) { --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c -@@ -46,6 +46,10 @@ +@@ -44,6 +44,10 @@ #define DRIVER_DESC "USB HID core driver" #define DRIVER_LICENSE "GPL" @@ -5180,24 +5181,9 @@ /* * Module parameters. */ -@@ -1031,6 +1035,14 @@ static void usbhid_stop(struct hid_devic - - if (WARN_ON(!usbhid)) - return; -+#ifdef CONFIG_KDB_USB -+ /* -+ * If the URB was for a Keyboard, detach it from kdb. -+ * If the URB was for another type of device, just -+ * allow kdb_usb_keyboard_detach() to silently fail. -+ */ -+ kdb_usb_keyboard_detach(usbhid->urbin); -+#endif - - clear_bit(HID_STARTED, &usbhid->iofl); - spin_lock_irq(&usbhid->lock); /* Sync with error handler */ -@@ -1164,6 +1176,34 @@ static int usbhid_probe(struct usb_inter - goto err_free; - } +@@ -1010,6 +1014,34 @@ static int usbhid_start(struct hid_devic + USB_INTERFACE_PROTOCOL_KEYBOARD) + usbhid_set_leds(hid); +#ifdef CONFIG_KDB_USB + /* Attach USB keyboards to kdb */ @@ -5228,8 +5214,23 @@ +#endif /* CONFIG_KDB_USB */ + return 0; - err_free: - kfree(usbhid); + + fail: +@@ -1029,6 +1061,14 @@ static void usbhid_stop(struct hid_devic + + if (WARN_ON(!usbhid)) + return; ++#ifdef CONFIG_KDB_USB ++ /* ++ * If the URB was for a Keyboard, detach it from kdb. ++ * If the URB was for another type of device, just ++ * allow kdb_usb_keyboard_detach() to silently fail. ++ */ ++ kdb_usb_keyboard_detach(usbhid->urbin); ++#endif + + clear_bit(HID_STARTED, &usbhid->iofl); + spin_lock_irq(&usbhid->lock); /* Sync with error handler */ --- a/drivers/hid/usbhid/usbkbd.c +++ b/drivers/hid/usbhid/usbkbd.c @@ -30,6 +30,9 @@ @@ -5321,7 +5322,7 @@ flag = TTY_NORMAL; up->port.icount.rx++; -@@ -2742,7 +2771,7 @@ serial8250_console_write(struct console +@@ -2744,7 +2773,7 @@ serial8250_console_write(struct console if (up->port.sysrq) { /* serial8250_handle_port() already took the lock */ locked = 0; @@ -5330,7 +5331,7 @@ locked = spin_trylock(&up->port.lock); } else spin_lock(&up->port.lock); -@@ -2800,6 +2829,30 @@ static int __init serial8250_console_set +@@ -2802,6 +2831,30 @@ static int __init serial8250_console_set if (!port->iobase && !port->membase) return -ENODEV; @@ -5508,7 +5509,7 @@ +#endif /* CONFIG_KDB */ --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c -@@ -38,6 +38,9 @@ +@@ -39,6 +39,9 @@ #include <linux/platform_device.h> #include <linux/workqueue.h> #include <linux/mutex.h> @@ -5518,7 +5519,7 @@ #include <linux/usb.h> -@@ -2212,6 +2215,74 @@ usb_hcd_platform_shutdown(struct platfor +@@ -2262,6 +2265,74 @@ usb_hcd_platform_shutdown(struct platfor } EXPORT_SYMBOL_GPL(usb_hcd_platform_shutdown); @@ -5605,7 +5606,7 @@ #define MAX_TOPO_LEVEL 6 -@@ -272,6 +275,14 @@ struct hc_driver { +@@ -286,6 +289,14 @@ struct hc_driver { */ int (*update_hub_device)(struct usb_hcd *, struct usb_device *hdev, struct usb_tt *tt, gfp_t mem_flags); @@ -5622,7 +5623,7 @@ extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb); --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1089,6 +1089,48 @@ static int ehci_get_frame (struct usb_hc +@@ -1092,6 +1092,48 @@ static int ehci_get_frame (struct usb_hc ehci->periodic_size; } @@ -6329,7 +6330,7 @@ /* * Store the current frame number in uhci->frame_number if the controller * is runnning. Expand from 11 bits (of which we use only 10) to a -@@ -921,6 +1133,12 @@ static const struct hc_driver uhci_drive +@@ -934,6 +1146,12 @@ static const struct hc_driver uhci_drive .hub_status_data = uhci_hub_status_data, .hub_control = uhci_hub_control, @@ -7886,7 +7887,7 @@ static int __init obsolete_checksetup(char *line) { struct obs_kernel_param *p; -@@ -652,6 +676,14 @@ asmlinkage void __init start_kernel(void +@@ -647,6 +671,14 @@ asmlinkage void __init start_kernel(void calibrate_delay(); pidmap_init(); anon_vma_init(); @@ -32153,7 +32154,7 @@ #include <linux/interrupt.h> --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c -@@ -527,3 +527,26 @@ static int __init kallsyms_init(void) +@@ -528,3 +528,26 @@ static int __init kallsyms_init(void) return 0; } device_initcall(kallsyms_init); @@ -32182,7 +32183,7 @@ +#endif /* CONFIG_KDB */ --- a/kernel/kexec.c +++ b/kernel/kexec.c -@@ -38,6 +38,12 @@ +@@ -40,6 +40,12 @@ #include <asm/system.h> #include <asm/sections.h> @@ -32195,11 +32196,8 @@ /* Per cpu memory for storing cpu states in case of system crash. */ note_buf_t* crash_notes; -@@ -1073,9 +1079,19 @@ void crash_kexec(struct pt_regs *regs) - if (mutex_trylock(&kexec_mutex)) { - if (kexec_crash_image) { - struct pt_regs fixed_regs; -+ +@@ -1080,7 +1086,16 @@ void crash_kexec(struct pt_regs *regs) + crash_setup_regs(&fixed_regs, regs); crash_save_vmcoreinfo(); + /* @@ -32217,7 +32215,7 @@ mutex_unlock(&kexec_mutex); --- a/kernel/module.c +++ b/kernel/module.c -@@ -2868,12 +2868,23 @@ out: +@@ -2721,12 +2721,23 @@ out: return -ERANGE; } @@ -32242,7 +32240,7 @@ list_for_each_entry_rcu(mod, &modules, list) { if (symnum < mod->num_symtab) { *value = mod->symtab[symnum].st_value; -@@ -2882,12 +2893,14 @@ int module_get_kallsym(unsigned int symn +@@ -2735,12 +2746,14 @@ int module_get_kallsym(unsigned int symn KSYM_NAME_LEN); strlcpy(module_name, mod->name, MODULE_NAME_LEN); *exported = is_exported(name, *value, mod); @@ -32261,7 +32259,7 @@ --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -22,6 +22,9 @@ +@@ -23,6 +23,9 @@ #include <linux/init.h> #include <linux/nmi.h> #include <linux/dmi.h> @@ -32271,10 +32269,10 @@ int panic_on_oops; static unsigned long tainted_mask; -@@ -74,6 +77,12 @@ NORET_TYPE void panic(const char * fmt, +@@ -75,6 +78,12 @@ NORET_TYPE void panic(const char * fmt, + dump_stack(); #endif - kmsg_dump(KMSG_DUMP_PANIC); + +#ifdef CONFIG_KDB_KDUMP + if (kdb_kdump_state == KDB_KDUMP_RESET) { @@ -32286,7 +32284,7 @@ * everything else. --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -9743,7 +9743,7 @@ void normalize_rt_tasks(void) +@@ -9787,7 +9787,7 @@ void normalize_rt_tasks(void) #endif /* CONFIG_MAGIC_SYSRQ */ @@ -32295,7 +32293,7 @@ /* * These functions are only useful for the IA64 MCA handling. * -@@ -10975,3 +10975,110 @@ void synchronize_sched_expedited(void) +@@ -11024,3 +11024,110 @@ void synchronize_sched_expedited(void) EXPORT_SYMBOL_GPL(synchronize_sched_expedited); #endif /* #else #ifndef CONFIG_SMP */ @@ -32408,7 +32406,7 @@ +#endif /* CONFIG_KDB */ --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -2680,3 +2680,52 @@ void __init signals_init(void) +@@ -2718,3 +2718,52 @@ void __init signals_init(void) { sigqueue_cachep = KMEM_CACHE(sigqueue, SLAB_PANIC); } @@ -32486,7 +32484,7 @@ } --- a/mm/hugetlb.c +++ b/mm/hugetlb.c -@@ -1593,6 +1593,28 @@ int hugetlb_overcommit_handler(struct ct +@@ -1930,6 +1930,28 @@ int hugetlb_overcommit_handler(struct ct #endif /* CONFIG_SYSCTL */ @@ -32541,7 +32539,7 @@ #include <linux/namei.h> #include <linux/shm.h> #include <linux/blkdev.h> -@@ -2085,6 +2089,24 @@ void si_swapinfo(struct sysinfo *val) +@@ -2092,6 +2096,24 @@ void si_swapinfo(struct sysinfo *val) spin_unlock(&swap_lock); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/rlim-0008-SPARC-use-helpers-for-rlimits.patch new/patches.suse/rlim-0008-SPARC-use-helpers-for-rlimits.patch --- old/patches.suse/rlim-0008-SPARC-use-helpers-for-rlimits.patch 2010-01-27 00:14:47.000000000 +0100 +++ new/patches.suse/rlim-0008-SPARC-use-helpers-for-rlimits.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -From 493c8842d11e3faf56e228ab0897a7007ffdb279 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby(a)suse.cz> -Date: Sat, 14 Nov 2009 16:47:34 +0100 -Subject: [PATCH] SPARC: use helpers for rlimits -References: FATE#305733 -Patch-mainline: no (later) - -Make sure compiler won't do weird things with limits. E.g. fetching -them twice may return 2 different values after writable limits are -implemented. - -I.e. either use rlimit helpers added in -3e10e716abf3c71bdb5d86b8f507f9e72236c9cd -or ACCESS_ONCE if not applicable. - -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> -Cc: "David S. Miller" <davem(a)davemloft.net> -Cc: sparclinux(a)vger.kernel.org ---- - arch/sparc/kernel/sys_sparc_64.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/arch/sparc/kernel/sys_sparc_64.c -+++ b/arch/sparc/kernel/sys_sparc_64.c -@@ -365,6 +365,7 @@ EXPORT_SYMBOL(get_fb_unmapped_area); - void arch_pick_mmap_layout(struct mm_struct *mm) - { - unsigned long random_factor = 0UL; -+ unsigned long gap; - - if (current->flags & PF_RANDOMIZE) { - random_factor = get_random_int(); -@@ -379,9 +380,10 @@ void arch_pick_mmap_layout(struct mm_str - * Fall back to the standard layout if the personality - * bit is set, or if the expected stack growth is unlimited: - */ -+ gap = rlimit(RLIMIT_STACK); - if (!test_thread_flag(TIF_32BIT) || - (current->personality & ADDR_COMPAT_LAYOUT) || -- current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY || -+ gap == RLIM_INFINITY || - sysctl_legacy_va_layout) { - mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; - mm->get_unmapped_area = arch_get_unmapped_area; -@@ -389,9 +391,7 @@ void arch_pick_mmap_layout(struct mm_str - } else { - /* We know it's 32-bit */ - unsigned long task_size = STACK_TOP32; -- unsigned long gap; - -- gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; - if (gap < 128 * 1024 * 1024) - gap = 128 * 1024 * 1024; - if (gap > (task_size / 6 * 5)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/supported-flag new/patches.suse/supported-flag --- old/patches.suse/supported-flag 2010-01-27 00:14:47.000000000 +0100 +++ new/patches.suse/supported-flag 2010-02-02 17:08:49.000000000 +0100 @@ -1,5 +1,6 @@ From: Andreas Gruenbacher <agruen(a)suse.de> Subject: Novell/external support flag in modules +Patch-mainline: Never, SLES feature Upon module load, check if a module is supported, and set the N (TAINT_NO_SUPPORT) or X (TAINT_EXTERNAL_SUPPORT) tail flags @@ -192,13 +193,12 @@ */ --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -646,6 +646,16 @@ static struct ctl_table kern_table[] = { +@@ -646,6 +646,15 @@ static struct ctl_table kern_table[] = { .extra1 = &pid_max_min, .extra2 = &pid_max_max, }, +#ifdef CONFIG_MODULES + { -+ .ctl_name = CTL_UNNUMBERED, + .procname = "unsupported", + .data = &unsupported, + .maxlen = sizeof(int), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/supported-flag-enterprise new/patches.suse/supported-flag-enterprise --- old/patches.suse/supported-flag-enterprise 2010-01-27 00:14:47.000000000 +0100 +++ new/patches.suse/supported-flag-enterprise 2010-02-02 17:08:49.000000000 +0100 @@ -209,8 +209,8 @@ -#ifdef CONFIG_MODULES +#if defined(CONFIG_MODULES) && defined(CONFIG_ENTERPRISE_SUPPORT) { - .ctl_name = CTL_UNNUMBERED, .procname = "unsupported", + .data = &unsupported, --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -82,8 +82,9 @@ modpost = scripts/mod/modpost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/suse-ppc64-branding new/patches.suse/suse-ppc64-branding --- old/patches.suse/suse-ppc64-branding 2010-01-27 00:14:47.000000000 +0100 +++ new/patches.suse/suse-ppc64-branding 2010-02-02 17:08:49.000000000 +0100 @@ -8,18 +8,16 @@ arch/powerpc/platforms/pseries/setup.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---- a/arch/powerpc/platforms/pseries/setup.c -+++ b/arch/powerpc/platforms/pseries/setup.c -@@ -319,7 +319,11 @@ static void __init pSeries_setup_arch(vo +Index: linux-2.6.32-SLE11-SP1/arch/powerpc/platforms/pseries/setup.c +=================================================================== +--- linux-2.6.32-SLE11-SP1.orig/arch/powerpc/platforms/pseries/setup.c ++++ linux-2.6.32-SLE11-SP1/arch/powerpc/platforms/pseries/setup.c +@@ -319,7 +319,7 @@ static void __init pSeries_setup_arch(vo static int __init pSeries_init_panel(void) { /* Manually leave the kernel version on the panel. */ - ppc_md.progress("Linux ppc64\n", 0); -+#ifdef CONFIG_CRASH_DUMP -+ ppc_md.progress("SuSE Linux crashed :-(\n", 0); -+#else -+ ppc_md.progress("SuSE Linux\n", 0); -+#endif ++ ppc_md.progress("SUSE Linux\n", 0); ppc_md.progress(init_utsname()->version, 0); return 0; ++++++ patches.xen.tar.bz2 ++++++ ++++ 39592 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:36.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:36.000000000 +0100 @@ -30,6 +30,7 @@ patches.kernel.org/patch-2.6.33-rc3 patches.kernel.org/patch-2.6.33-rc3-rc4 patches.kernel.org/patch-2.6.33-rc4-rc5 + patches.kernel.org/patch-2.6.33-rc5-rc6 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -46,7 +47,6 @@ patches.rpmify/rt2860-use-skb_tail_pointer patches.rpmify/rtl8192e-use-skb_tail_pointer - patches.rpmify/smsc47m1-fix-section-mismatch patches.rpmify/hugetlbfs-fix-section-mismatches patches.rpmify/rtl8192e-fix-section-mismatches patches.rpmify/dmar-fix-section-mismatch @@ -107,7 +107,6 @@ # writable limits patches.suse/rlim-0005-core-posix-cpu-timers-cleanup-rlimits-usage.patch - patches.suse/rlim-0008-SPARC-use-helpers-for-rlimits.patch patches.suse/rlim-0009-X86-use-helpers-for-rlimits.patch patches.suse/rlim-0010-FS-use-helpers-for-rlimits.patch patches.suse/rlim-0011-MM-use-helpers-for-rlimits.patch @@ -250,9 +249,6 @@ patches.arch/s390-05-13-qeth-blkt-defaults.patch - patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch -+needs_update-33 patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch - ######################################################## # VM/FS patches ######################################################## @@ -268,7 +264,7 @@ patches.suse/reiser4-set_page_dirty_notag patches.suse/file-capabilities-disable-by-default.diff - patches.suse/files-slab-rcu.patch ++npiggin patches.suse/files-slab-rcu.patch patches.suse/mm-tune-dirty-limits.patch patches.suse/mm-devzero-optimisation.patch @@ -321,7 +317,6 @@ patches.arch/acpi_srat-pxm-rev-store.patch patches.arch/acpi_srat-pxm-rev-ia64.patch patches.arch/acpi_srat-pxm-rev-x86-64.patch - patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch ######################################################## # CPUFREQ @@ -527,12 +522,9 @@ patches.suse/fc-transport-allow-dev_loss_tmo-disable patches.fixes/scsi-check-host-lookup-failure - patches.drivers/aacraid-24701-update patches.drivers/lpfc-add-raywire-id patches.drivers/megaraid-mbox-fix-SG_IO patches.drivers/qla4xxx-5.01.00-k9-5.01.00.00.11.01-k10.patch - patches.fixes/aic79xx-null-scb-in-nonpkt-busfree - patches.fixes/scsi-fc-class-allow-LLD-bsg-timeout # Remaining SCSI patches (garloff) patches.suse/scsi-error-test-unit-ready-timeout @@ -568,15 +560,13 @@ patches.drivers/ixgbe-entropy-source.patch patches.drivers/tg3-entropy-source.patch - patches.drivers/sky2-optima-fix-pci-cfg - - # qlge patches from 2.6.33 bnc#560420, fate#307130 + # qlge patches from 1.6.33 bnc#560420, fate#307130 # These patches are not in 2.6.33 as of -rc3. patches.drivers/qlge-0025-Add-performance-change-for-non-split-headers.patch patches.drivers/qlge-0026-Add-firmware-core-dump.patch - patches.drivers/e1000-enhance-frame-fragment-detection.patch - patches.drivers/e1000e-enhance-frame-fragment-detection.patch ++needs_update patches.drivers/e1000-enhance-frame-fragment-detection.patch ++needs_update patches.drivers/e1000e-enhance-frame-fragment-detection.patch ######################################################## # Wireless Networking @@ -618,10 +608,11 @@ ########################################################## # Sound ########################################################## - patches.drivers/alsa-sp1-hda-55-alc259-hp-pin-fix - patches.drivers/alsa-sp1-hda-56-realtek-eapd-fix patches.drivers/alsa-sp1-hda-57-cx5051-toshiba-quirk patches.drivers/alsa-sp1-hda-58-cx5051-lenovo-mute-fix + patches.drivers/alsa-sp1-hda-59-idt92hd83xxx-hp-mute-led + patches.drivers/alsa-sp1-hda-60-add-idt92hd88x-support + patches.drivers/alsa-sp1-hda-61-add-idt92hd88x-support2 ######################################################## # Other driver fixes @@ -635,7 +626,6 @@ # Allow setting maximum number of raw devices patches.suse/raw_device_max_minors_param.diff patches.suse/no-partition-scan - patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch ######################################################## # Other drivers we have added to the tree @@ -661,6 +651,7 @@ patches.fixes/dm-release-map_lock-before-set_disk_ro patches.suse/dm-mpath-no-activate-for-offlined-paths patches.suse/dm-mpath-no-partitions-feature + patches.fixes/dm-stripe-zero-stripes ######################################################## # md @@ -840,115 +831,111 @@ # re-basing to a newer xen tree. # ### both uml framebuffer and xen need this one. -+xen_needs_update patches.xen/add-console-use-vt + patches.xen/add-console-use-vt # split out patches -+xen_needs_update patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch -+xen_needs_update patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch -+xen_needs_update patches.xen/ipv6-no-autoconf -+xen_needs_update patches.xen/pci-guestdev -+xen_needs_update patches.xen/pci-reserve -+xen_needs_update patches.xen/sfc-driverlink -+xen_needs_update patches.xen/sfc-resource-driver -+xen_needs_update patches.xen/sfc-driverlink-conditional -+xen_needs_update patches.xen/sfc-external-sram -+xen_needs_update patches.xen/tmem + patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch + patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch + patches.xen/ipv6-no-autoconf + patches.xen/pci-guestdev + patches.xen/pci-reserve ++needs_update-33 patches.xen/sfc-driverlink ++needs_update-33 patches.xen/sfc-resource-driver ++needs_update-33 patches.xen/sfc-driverlink-conditional ++needs_update-33 patches.xen/sfc-external-sram + patches.xen/tmem # bulk stuff, new files for xen -+xen_needs_update patches.xen/xen3-auto-xen-arch.diff -+xen_needs_update patches.xen/xen3-auto-xen-drivers.diff -+xen_needs_update patches.xen/xen3-auto-include-xen-interface.diff + patches.xen/xen3-auto-xen-arch.diff + patches.xen/xen3-auto-xen-drivers.diff + patches.xen/xen3-auto-include-xen-interface.diff # kconfig bits for xen -+xen_needs_update patches.xen/xen3-auto-xen-kconfig.diff + patches.xen/xen3-auto-xen-kconfig.diff # common code changes -+xen_needs_update patches.xen/xen3-auto-common.diff -+xen_needs_update patches.xen/xen3-auto-arch-x86.diff -+xen_needs_update patches.xen/xen3-auto-arch-i386.diff -+xen_needs_update patches.xen/xen3-auto-arch-x86_64.diff + patches.xen/xen3-auto-common.diff + patches.xen/xen3-auto-arch-x86.diff + patches.xen/xen3-auto-arch-i386.diff + patches.xen/xen3-auto-arch-x86_64.diff # fixups due to upstream Xen parts -+xen_needs_update patches.xen/xen3-fixup-xen + patches.xen/xen3-fixup-xen -+xen_needs_update patches.xen/sfc-set-arch -+xen_needs_update patches.xen/sfc-endianness ++needs_update-33 patches.xen/sfc-set-arch ++needs_update-33 patches.xen/sfc-endianness # newer changeset backports # changes outside arch/{i386,x86_64}/xen -+xen_needs_update patches.xen/xen3-fixup-kconfig -+xen_needs_update patches.xen/xen3-fixup-common -+xen_needs_update patches.xen/xen3-fixup-arch-x86 + patches.xen/xen3-fixup-kconfig + patches.xen/xen3-fixup-common + patches.xen/xen3-fixup-arch-x86 # ports of other patches -+xen_needs_update patches.xen/xen3-patch-2.6.18 -+xen_needs_update patches.xen/xen3-patch-2.6.19 -+xen_needs_update patches.xen/xen3-patch-2.6.20 -+xen_needs_update patches.xen/xen3-patch-2.6.21 -+xen_needs_update patches.xen/xen3-patch-2.6.22 -+xen_needs_update patches.xen/xen3-patch-2.6.23 -+xen_needs_update patches.xen/xen3-patch-2.6.24 -+xen_needs_update patches.xen/xen3-patch-2.6.25 -+xen_needs_update patches.xen/xen3-patch-2.6.26 -+xen_needs_update patches.xen/xen3-patch-2.6.27 -+xen_needs_update patches.xen/xen3-patch-2.6.28 -+xen_needs_update patches.xen/xen3-patch-2.6.29 -+xen_needs_update patches.xen/xen3-patch-2.6.30 -+xen_needs_update patches.xen/xen3-patch-2.6.31 -+xen_needs_update patches.xen/xen3-patch-2.6.32 -+xen_needs_update patches.xen/xen3-patch-2.6.32.1-2 -+xen_needs_update patches.xen/xen3-patch-2.6.32.2-3 -+xen_needs_update patches.xen/xen3-patch-2.6.32.3-4 -+xen_needs_update patches.xen/xen3-seccomp-disable-tsc-option -+xen_needs_update patches.xen/xen3-x86-mcp51-no-dac -+xen_needs_update patches.xen/xen3-x86-64-preserve-large-page-mapping-for-1st-2mb-kernel-txt-with-config_debug_rodata -+xen_needs_update patches.xen/xen3-x86-64-align-rodata-kernel-section-to-2mb-with-config_debug_rodata -+xen_needs_update patches.xen/xen3-x86-mark_rodata_rw.patch -+xen_needs_update patches.xen/xen3-x86-Remove-CPU-cache-size-output-for-non-Intel-too.patch -+xen_needs_update patches.xen/xen3-x86-cpu-mv-display_cacheinfo-cpu_detect_cache_sizes.patch -+xen_needs_update patches.xen/xen3-x86-Limit-the-number-of-processor-bootup-messages.patch -+xen_needs_update patches.xen/xen3-vmw_pvscsi-scsi-driver-for-vmware-s-virtual-hba.patch -+xen_needs_update patches.xen/xen3-kdb-x86 -+xen_needs_update patches.xen/xen3-stack-unwind -+xen_needs_update patches.xen/xen3-x86_64-unwind-annotations + patches.xen/xen3-patch-2.6.18 + patches.xen/xen3-patch-2.6.19 + patches.xen/xen3-patch-2.6.20 + patches.xen/xen3-patch-2.6.21 + patches.xen/xen3-patch-2.6.22 + patches.xen/xen3-patch-2.6.23 + patches.xen/xen3-patch-2.6.24 + patches.xen/xen3-patch-2.6.25 + patches.xen/xen3-patch-2.6.26 + patches.xen/xen3-patch-2.6.27 + patches.xen/xen3-patch-2.6.28 + patches.xen/xen3-patch-2.6.29 + patches.xen/xen3-patch-2.6.30 + patches.xen/xen3-patch-2.6.31 + patches.xen/xen3-patch-2.6.32 + patches.xen/xen3-patch-2.6.33-rc3 + patches.xen/xen3-patch-2.6.33-rc3-rc4 + patches.xen/xen3-patch-2.6.33-rc4-rc5 + patches.xen/xen3-patch-2.6.33-rc5-rc6 + patches.xen/xen3-seccomp-disable-tsc-option + patches.xen/xen3-x86-mcp51-no-dac + patches.xen/xen3-x86-mark_rodata_rw.patch + patches.xen/xen3-kdb-x86 + patches.xen/xen3-stack-unwind + patches.xen/xen3-x86_64-unwind-annotations # bugfixes and enhancements -+xen_needs_update patches.xen/xen-balloon-max-target -+xen_needs_update patches.xen/xen-modular-blktap -+xen_needs_update patches.xen/xen-blkback-bimodal-suse -+xen_needs_update patches.xen/xen-blkif-protocol-fallback-hack -+xen_needs_update patches.xen/xen-blkback-cdrom -+xen_needs_update patches.xen/xen-blktap-write-barriers -+xen_needs_update patches.xen/xen-op-packet -+xen_needs_update patches.xen/xen-blkfront-cdrom -+xen_needs_update patches.xen/xen-sections -+xen_needs_update patches.xen/xen-swiotlb-heuristics -+xen_needs_update patches.xen/xen-kconfig-compat -+xen_needs_update patches.xen/xen-cpufreq-report -+xen_needs_update patches.xen/xen-staging-build -+xen_needs_update patches.xen/xen-sysdev-suspend -+xen_needs_update patches.xen/xen-ipi-per-cpu-irq -+xen_needs_update patches.xen/xen-virq-per-cpu-irq -+xen_needs_update patches.xen/xen-spinlock-poll-early -+xen_needs_update patches.xen/xen-configurable-guest-devices -+xen_needs_update patches.xen/xen-netback-nr-irqs -+xen_needs_update patches.xen/xen-netback-notify-multi -+xen_needs_update patches.xen/xen-pciback-sriov -+xen_needs_update patches.xen/xen-unpriv-build -+xen_needs_update patches.xen/xen-vmalloc_32 -+xen_needs_update patches.xen/xen-dcdbas -+xen_needs_update patches.xen/xen-privcmd-mmap-batch-clear -+xen_needs_update patches.xen/xen-x86-panic-no-reboot -+xen_needs_update patches.xen/xen-x86-dcr-fallback -+xen_needs_update patches.xen/xen-x86-consistent-nmi -+xen_needs_update patches.xen/xen-x86-no-lapic -+xen_needs_update patches.xen/xen-x86-pmd-handling -+xen_needs_update patches.xen/xen-x86-bigmem -+xen_needs_update patches.xen/xen-x86-machphys-prediction -+xen_needs_update patches.xen/xen-x86-exit-mmap -+xen_needs_update patches.xen/xen-x86-per-cpu-vcpu-info -+xen_needs_update patches.xen/xen-x86_64-pgd-pin -+xen_needs_update patches.xen/xen-x86_64-pgd-alloc-order -+xen_needs_update patches.xen/xen-x86_64-dump-user-pgt -+xen_needs_update patches.xen/xen-x86_64-note-init-p2m + patches.xen/xen-balloon-max-target + patches.xen/xen-modular-blktap + patches.xen/xen-blkback-bimodal-suse + patches.xen/xen-blkif-protocol-fallback-hack + patches.xen/xen-blkback-cdrom + patches.xen/xen-blktap-write-barriers + patches.xen/xen-op-packet + patches.xen/xen-blkfront-cdrom + patches.xen/xen-sections + patches.xen/xen-swiotlb-heuristics + patches.xen/xen-kconfig-compat + patches.xen/xen-cpufreq-report + patches.xen/xen-staging-build + patches.xen/xen-sysdev-suspend + patches.xen/xen-ipi-per-cpu-irq + patches.xen/xen-virq-per-cpu-irq + patches.xen/xen-spinlock-poll-early + patches.xen/xen-configurable-guest-devices + patches.xen/xen-netback-nr-irqs + patches.xen/xen-netback-notify-multi + patches.xen/xen-netback-generalize + patches.xen/xen-netback-multiple-tasklets + patches.xen/xen-netback-kernel-threads + patches.xen/xen-pciback-sriov + patches.xen/xen-unpriv-build + patches.xen/xen-dcdbas + patches.xen/xen-x86-panic-no-reboot + patches.xen/xen-x86-dcr-fallback + patches.xen/xen-x86-consistent-nmi + patches.xen/xen-x86-no-lapic + patches.xen/xen-x86-pmd-handling + patches.xen/xen-x86-bigmem + patches.xen/xen-x86-machphys-prediction + patches.xen/xen-x86-exit-mmap + patches.xen/xen-x86-per-cpu-vcpu-info + patches.xen/xen-x86_64-pgd-pin + patches.xen/xen-x86_64-pgd-alloc-order + patches.xen/xen-x86_64-dump-user-pgt + patches.xen/xen-x86_64-note-init-p2m ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:36.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:36.000000000 +0100 @@ -1,3 +1,3 @@ -2010-01-27 14:55:38 +0100 -GIT Revision: 2b3dccc0787e3003e55784678dcf8aa5c6503f95 +2010-02-04 13:24:08 +0100 +GIT Revision: 69aad1a30e31d4f33ab56a1f195c7c4229c9dd66 GIT Branch: master ++++++ supported.conf ++++++ --- /var/tmp/diff_new_pack.YkgIEX/_old 2010-02-05 14:11:36.000000000 +0100 +++ /var/tmp/diff_new_pack.YkgIEX/_new 2010-02-05 14:11:36.000000000 +0100 @@ -106,6 +106,7 @@ kernel/crypto/ecb kernel/crypto/eseqiv kernel/crypto/fcrypt + kernel/crypto/hmac kernel/crypto/gcm kernel/crypto/gf128mul kernel/crypto/crypto_hash @@ -2462,7 +2463,7 @@ kernel/net/sched/cls_rsvp6 kernel/net/sched/cls_tcindex kernel/net/sched/cls_u32 -- kernel/net/sched/em_cmp + kernel/net/sched/em_cmp - kernel/net/sched/em_meta - kernel/net/sched/em_nbyte - kernel/net/sched/em_text @@ -2588,6 +2589,7 @@ +isa kernel/sound/isa/snd-sgalaxy +isa kernel/sound/isa/snd-sscape +isa kernel/sound/isa/wavefront/snd-wavefront ++isa kernel/sound/isa/wss/snd-wss-lib - kernel/sound/oss/ad1848 - kernel/sound/oss/aedsp16 # Audio Excel DSP 16 Driver Version 1.3 - kernel/sound/oss/kahlua # Kahlua VSA1 PCI Audio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libzypp for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at Fri Feb 5 14:10:04 CET 2010. -------- --- libzypp/libzypp.changes 2009-12-08 20:05:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2010-02-03 16:19:17.000000000 +0100 @@ -1,0 +2,40 @@ +Wed Feb 3 15:57:13 CET 2010 - ma(a)suse.de + +- Remember the enabled state of removed service repositories. This + way we are able to restore service repositories correctly after a + subscrition expired and gets renewed. (bnc #572634) +- version 6.29.2 (19) + +------------------------------------------------------------------- +Thu Jan 28 16:12:25 CET 2010 - jkupec(a)suse.cz + +- Abort aria2c download when the progress callback receives 'false' + (bnc #545106) + +------------------------------------------------------------------- +Tue Jan 19 14:50:15 CET 2010 - ma(a)suse.de + +- Evaluate SolvAttr::repositoryToolVersion to prevent loading + outdated solv files. (bnc #570623) +- version 6.29.0 (19) + +------------------------------------------------------------------- +Fri Jan 15 18:15:26 CET 2010 - jkupec(a)suse.cz + +- Use regex to parse aria2c progress lines (bnc #570917) +- version 6.28.1 (19) + +------------------------------------------------------------------- +Thu Jan 7 12:25:24 CET 2010 - jkupec(a)suse.cz + +- Set SignatureFileChecker context even if the key is not known + (bnc #495977) +- version 6.28.0 (19) + +------------------------------------------------------------------- +Thu Dec 10 17:18:34 CET 2009 - jkupec(a)suse.cz + +- RepoInfoBase::label() added for use in UI messages, plus + ZConfig::repoLabelIsAlias() + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzypp-6.27.1.tar.bz2 New: ---- libzypp-6.29.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.AbbfiT/_old 2010-02-05 14:09:33.000000000 +0100 +++ /var/tmp/diff_new_pack.AbbfiT/_new 2010-02-05 14:09:33.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libzypp (Version 6.27.1) +# spec file for package libzypp (Version 6.29.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Summary: Package, Patch, Pattern, and Product Management -Version: 6.27.1 +Version: 6.29.2 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -35,7 +35,7 @@ BuildRequires: cmake BuildRequires: openssl-devel BuildRequires: boost-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel -BuildRequires: libsatsolver-devel >= 0.14.9 +BuildRequires: libsatsolver-devel >= 0.14.13 %requires_eq satsolver-tools # required for testsuite, webrick BuildRequires: ruby ++++++ libzypp-6.27.1.tar.bz2 -> libzypp-6.29.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/libzypp.spec.cmake new/libzypp-6.29.2/libzypp.spec.cmake --- old/libzypp-6.27.1/libzypp.spec.cmake 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/libzypp.spec.cmake 2010-02-03 16:04:23.000000000 +0100 @@ -28,7 +28,7 @@ BuildRequires: openssl-devel BuildRequires: boost-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel -BuildRequires: libsatsolver-devel >= 0.14.9 +BuildRequires: libsatsolver-devel >= 0.14.13 %requires_eq satsolver-tools # required for testsuite, webrick diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/package/libzypp.changes new/libzypp-6.29.2/package/libzypp.changes --- old/libzypp-6.27.1/package/libzypp.changes 2009-12-08 19:43:43.000000000 +0100 +++ new/libzypp-6.29.2/package/libzypp.changes 2010-02-03 16:04:23.000000000 +0100 @@ -1,4 +1,44 @@ ------------------------------------------------------------------- +Wed Feb 3 15:57:13 CET 2010 - ma(a)suse.de + +- Remember the enabled state of removed service repositories. This + way we are able to restore service repositories correctly after a + subscrition expired and gets renewed. (bnc #572634) +- version 6.29.2 (19) + +------------------------------------------------------------------- +Thu Jan 28 16:12:25 CET 2010 - jkupec(a)suse.cz + +- Abort aria2c download when the progress callback receives 'false' + (bnc #545106) + +------------------------------------------------------------------- +Tue Jan 19 14:50:15 CET 2010 - ma(a)suse.de + +- Evaluate SolvAttr::repositoryToolVersion to prevent loading + outdated solv files. (bnc #570623) +- version 6.29.0 (19) + +------------------------------------------------------------------- +Fri Jan 15 18:15:26 CET 2010 - jkupec(a)suse.cz + +- Use regex to parse aria2c progress lines (bnc #570917) +- version 6.28.1 (19) + +------------------------------------------------------------------- +Thu Jan 7 12:25:24 CET 2010 - jkupec(a)suse.cz + +- Set SignatureFileChecker context even if the key is not known + (bnc #495977) +- version 6.28.0 (19) + +------------------------------------------------------------------- +Thu Dec 10 17:18:34 CET 2009 - jkupec(a)suse.cz + +- RepoInfoBase::label() added for use in UI messages, plus + ZConfig::repoLabelIsAlias() + +------------------------------------------------------------------- Tue Dec 8 19:41:17 CET 2009 - ma(a)suse.de - Fix transaction building in presence of multiversion installable items. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/tests/zypp/Capabilities_test.cc new/libzypp-6.29.2/tests/zypp/Capabilities_test.cc --- old/libzypp-6.27.1/tests/zypp/Capabilities_test.cc 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/tests/zypp/Capabilities_test.cc 2010-02-03 16:04:23.000000000 +0100 @@ -125,12 +125,16 @@ // With no libzypp in the pool, no guess should succeed: BOOST_REQUIRE( sat::WhatProvides(Capability("libzypp")).empty() ); + // these must be guessed BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp-1-2" ), Capability( "", "libzypp-1-2", "", "" ) ); BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp-1-2.i586" ), Capability( "i586", "libzypp-1-2", "", "" ) ); BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp.i586-1-2" ), Capability( "", "libzypp.i586-1-2", "", "" ) ); - // now load some repo prividing libzypp and csee how the guessing - // changes: + // these are unambiguous + BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "patch:swmgmt=12" ), Capability( "", "swmgmt", "=", "12", ResKind::patch ) ); + BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp=0:1.0.2-2" ), Capability( "", "libzypp", "=", "0:1.0.2-2" ) ); + + // now load some repo providing libzypp and see how the guessing changes: test.loadRepo( TESTS_SRC_DIR "/data/openSUSE-11.1", "opensuse" ); BOOST_REQUIRE( ! sat::WhatProvides(Capability("libzypp")).empty() ); @@ -138,6 +142,9 @@ BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp-1-2" ), Capability( "", "libzypp", "=", "1-2" ) ); BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp-1-2.i586" ), Capability( "i586", "libzypp", "=", "1-2" ) ); BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp.i586-1-2" ), Capability( "i586", "libzypp", "=", "1-2" ) ); + BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp<=1.0.2-2" ), Capability( "", "libzypp", "<=", "1.0.2-2" ) ); + BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp<=1:1.0.2-2" ), Capability( "", "libzypp", "<=", "1:1.0.2-2" ) ); + BOOST_CHECK_EQUAL( Capability::guessPackageSpec( "libzypp-0:1.0.2-2" ), Capability( "", "libzypp", "=", "0:1.0.2-2" ) ); // Double arch spec: the trailing one succeeds, the other one gets part of the name. // As "libzypp.i586' is not in the pool, guessing fails. Result is a named cap. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/tools/NameReqPrv.cc new/libzypp-6.29.2/tools/NameReqPrv.cc --- old/libzypp-6.27.1/tools/NameReqPrv.cc 2009-12-08 19:43:43.000000000 +0100 +++ new/libzypp-6.29.2/tools/NameReqPrv.cc 2010-02-03 16:04:23.000000000 +0100 @@ -103,12 +103,14 @@ message << str::form( "*** Load Testcase from '%s'", sysRoot.c_str() ) << endl; TestSetup test; test.loadTestcaseRepos( sysRoot ); + dumpRange( message, satpool.reposBegin(), satpool.reposEnd() ) << endl; } else if ( TestSetup::isTestSetup( sysRoot ) ) { message << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl; TestSetup test( sysRoot, Arch_x86_64 ); test.loadRepos(); + dumpRange( message, satpool.reposBegin(), satpool.reposEnd() ) << endl; } else { @@ -183,6 +185,8 @@ } PoolQuery q; + if ( onlyInstalled ) + q.setInstalledOnly(); std::string qstr( *argv ); if ( *argv == ResKind::product ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/VERSION.cmake new/libzypp-6.29.2/VERSION.cmake --- old/libzypp-6.27.1/VERSION.cmake 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/VERSION.cmake 2010-02-03 16:04:23.000000000 +0100 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "19") -SET(LIBZYPP_MINOR "27") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_MINOR "29") +SET(LIBZYPP_PATCH "2") # -# LAST RELEASED: 6.27.1 (19) +# LAST RELEASED: 6.29.2 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/FileChecker.cc new/libzypp-6.29.2/zypp/FileChecker.cc --- old/libzypp-6.27.1/zypp/FileChecker.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/FileChecker.cc 2010-02-03 16:04:23.000000000 +0100 @@ -105,6 +105,9 @@ { } + void SignatureFileChecker::setKeyContext(const KeyContext & keycontext) + { _context = keycontext; } + void SignatureFileChecker::addPublicKey( const Pathname & publickey, const KeyContext & keycontext ) { addPublicKey( PublicKey(publickey), keycontext ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/FileChecker.h new/libzypp-6.29.2/zypp/FileChecker.h --- old/libzypp-6.27.1/zypp/FileChecker.h 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/zypp/FileChecker.h 2010-02-03 16:04:23.000000000 +0100 @@ -99,6 +99,14 @@ */ SignatureFileChecker(); + /** + * Set context for this checker. + * + * Use this method if you're not adding the key (with context) via + * one of the addPublicKey methods. The addPublicKey method overwrites + * the context. + */ + void setKeyContext(const KeyContext & keycontext); /** * add a public key to the list of known keys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/media/MediaAria2c.cc new/libzypp-6.29.2/zypp/media/MediaAria2c.cc --- old/libzypp-6.27.1/zypp/media/MediaAria2c.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/media/MediaAria2c.cc 2010-02-03 16:04:23.000000000 +0100 @@ -17,6 +17,7 @@ #include <boost/lexical_cast.hpp> #include "zypp/base/Logger.h" +#include "zypp/base/Regex.h" #include "zypp/ExternalProgram.h" #include "zypp/ProgressData.h" #include "zypp/base/String.h" @@ -316,36 +317,78 @@ ExternalProgram aria(args, ExternalProgram::Stderr_To_Stdout); + // extended regex for parsing of progress lines // progress line like: [#1 SIZE:8.3MiB/10.1MiB(82%) CN:5 SPD:6899.88KiB/s] // but since 1.4.0: [#1 SIZE:8.3MiB/10.1MiB(82%) CN:5 SPD:899.8KiBs] // (bnc #513944) [#1 SIZE:8.3MiB/10.1MiB(82%) CN:5 SPD:3.8MiBs] // [#1 SIZE:8.3MiB/10.1MiB(82%) CN:5 SPD:38Bs] - // we save it until we find a string with FILE: later - string progressLine; + // later got also ETA: [#1 SIZE:8.3MiB/10.1MiB(82%) CN:5 SPD:38Bs ETA:02s] + static str::regex rxProgress( + "^\\[#[0-9]+ SIZE:[0-9\\.]+(|Ki|Mi|Ti)B/[0-9\\.]+(|Ki|Mi|Ti)B\$?([0-9]+)?%?\$? CN:[0-9]+ SPD:([0-9\\.]+)(|Ki|Mi|Ti)Bs.*\\]$"); + + // whether we received correct progress line before corresponding FILE line + bool gotProgress = false; + // download progress in % int progress = 0; - // file line, which tell which file is the previous progress - // ie: FILE: ./packages.FL.gz + // current download speed in bytes + double current_speed = 0; + // download speed in bytes double average_speed = 0; + // number of speed measurements long average_speed_count = 0; // here we capture aria output exceptions vector<string> ariaExceptions; - // TODO: Detect partial downloads! - bool partialDownload = false; // Whether it makes sense to retry with --continue! + // whether it makes sense to retry with --continue + bool partialDownload = false; + // whether user request abort of the download + bool userAbort = false; //Process response for(std::string ariaResponse( aria.receiveLine()); ariaResponse.length(); ariaResponse = aria.receiveLine()) { - //cout << ariaResponse; string line = str::trim(ariaResponse); + // INT << line << endl; - // look for the progress line and save it for later + // look for the progress line and save parsed values until we find + // a string with FILE: later. if ( str::hasPrefix(line, "[#") ) { - progressLine = line; + str::smatch progressValues; + if (( gotProgress = str::regex_match(line, progressValues, rxProgress) )) + { + // INT << "got: progress: '" << progressValues[3] + // << "' speed: '" << progressValues[4] << " " + // << progressValues[5] << "Bs'" << endl; + + // get the percentage (progress) data + progress = std::atoi(progressValues[3].c_str()); + + // get the speed + + int factor = 1; // B/KiB/MiB multiplication factor + if (progressValues[5] == "Ki") + factor = 1024; + else if (progressValues[5] == "Mi") + factor = 0x100000; + else if (progressValues[5] == "Ti") + factor = 0x40000000; + + try { + current_speed = boost::lexical_cast<double>(progressValues[4]); + // convert to and work with bytes everywhere (bnc #537870) + current_speed *= factor; + } + catch (const std::exception&) { + ERR << "Can't parse speed from '" << progressValues[4] << "'" << endl; + current_speed = 0; + } + } + else + ERR << "Can't parse progress line '" << line << "'" << endl; } // save error messages for later else if ( str::hasPrefix(line, "Exception: ") ) @@ -362,6 +405,8 @@ DBG << "aria2c reported: '" << excpMsg << "'" << endl; ariaExceptions.push_back(excpMsg); } + // The file line tells which file corresponds to the previous progress, + // eg.: FILE: ./packages.FL.gz else if ( str::hasPrefix(line, "FILE: ") ) { // get the FILE name @@ -375,48 +420,8 @@ { // once we find the FILE: line, progress has to be // non empty - if ( ! progressLine.empty() ) + if ( gotProgress ) { - // get the percentage (progress) data - progress = 0; - size_t left_bound = progressLine.find('(',0) + 1; - size_t count = progressLine.find('%',left_bound) - left_bound; - string progressStr = progressLine.substr(left_bound, count); - - if ( count != string::npos ) - progress = std::atoi(progressStr.c_str()); - else - ERR << "Can't parse progress from '" << progressStr << "'" << endl; - - // get the speed - double current_speed = 0; - int factor = 1; // B/KiB/MiB multiplication factor - - left_bound = progressLine.find("SPD:",0) + 4; - if ((count = progressLine.find("KiB",left_bound)) != string::npos) - factor = 1024; - else if ((count = progressLine.find("MiB",left_bound)) != string::npos) - factor = 0x100000; - else - count = progressLine.find("Bs",left_bound); - - if ( count != string::npos ) - { // convert the string to a double - count -= left_bound; - string speedStr = progressLine.substr(left_bound, count); - try { - current_speed = boost::lexical_cast<double>(speedStr); - // convert to and work with bytes everywhere (bnc #537870) - current_speed *= factor; - } - catch (const std::exception&) { - ERR << "Can't parse speed from '" << speedStr << "'" << endl; - current_speed = 0; - } - } - else - ERR << "Can't parse speed from '" << progressLine << "'" << endl; - // we have a new average speed average_speed_count++; @@ -426,16 +431,19 @@ (((average_speed_count - 1)*average_speed) + current_speed) / average_speed_count; - report->progress ( progress, fileurl, average_speed, current_speed ); - // clear the progress line to detect mismatches between - // [# and FILE: lines - progressLine.clear(); + if (!partialDownload && progress > 0) + partialDownload = true; + + if ( ! report->progress ( progress, fileurl, average_speed, current_speed ) ) + userAbort = true; + + // clear the flag to detect mismatches between [# and FILE: lines + gotProgress = false; } else { WAR << "aria2c reported a file, but no progress data available" << endl; } - } else { @@ -448,7 +456,14 @@ } } - int code = aria.close(); + int code; + if (userAbort) + { + aria.kill(); + code = 7; + } + else + code = aria.close(); switch ( code ) { @@ -492,8 +507,15 @@ } } - // TranslatorExplanation: Failed to download <FILENAME> from <SERVERURL>. - MediaException e(str::form(_("Failed to download %s from %s"), filename.c_str(), _url.asString().c_str())); + string msg; + if (userAbort) + msg = _("Download interrupted by user"); + else + // TranslatorExplanation: Failed to download <FILENAME> from <SERVERURL>. + msg = str::form(_("Failed to download %s from %s"), + filename.c_str(), _url.asString().c_str()); + + MediaException e(msg); for_(it, ariaExceptions.begin(), ariaExceptions.end()) e.addHistory(*it); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/media/MediaDIR.cc new/libzypp-6.29.2/zypp/media/MediaDIR.cc --- old/libzypp-6.27.1/zypp/media/MediaDIR.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/media/MediaDIR.cc 2010-02-03 16:04:23.000000000 +0100 @@ -84,7 +84,7 @@ else { ZYPP_THROW(MediaBadUrlException(url(), - "Specified path '" + url().getPathName() + "' is not allowed as media source" + "Specified path '" + url().getPathName() + "' is not a directory" )); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/misc/CheckAccessDeleted.cc new/libzypp-6.29.2/zypp/misc/CheckAccessDeleted.cc --- old/libzypp-6.27.1/zypp/misc/CheckAccessDeleted.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/misc/CheckAccessDeleted.cc 2010-02-03 16:04:23.000000000 +0100 @@ -88,7 +88,7 @@ pinfo.command = command.basename(); } - MIL << " Take " << pinfo << endl; + //MIL << " Take " << pinfo << endl; } /** Add line to cache if it refers to a deleted executable or library file: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/Pathname.cc new/libzypp-6.29.2/zypp/Pathname.cc --- old/libzypp-6.27.1/zypp/Pathname.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/Pathname.cc 2010-02-03 16:04:23.000000000 +0100 @@ -154,7 +154,7 @@ } // rel or abs path - if ( *R_pci == '/' || *R_pci == '\\' ) { + if ( *R_pci == '/' ) { Stack_Ci.Push( "" ); ++R_pci; } else { @@ -164,7 +164,6 @@ do { switch ( *R_pci ) { case '/': - case '\\': case '\0': if ( W_pci != Buf_aci ) { *W_pci = '\0'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/repo/RepoInfoBase.cc new/libzypp-6.29.2/zypp/repo/RepoInfoBase.cc --- old/libzypp-6.27.1/zypp/repo/RepoInfoBase.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/repo/RepoInfoBase.cc 2010-02-03 16:04:23.000000000 +0100 @@ -11,6 +11,7 @@ */ #include <iostream> +#include "zypp/ZConfig.h" #include "zypp/repo/RepoVariables.h" #include "zypp/repo/RepoInfoBase.h" @@ -135,6 +136,13 @@ return replacer(_pimpl->name); } + std::string RepoInfoBase::label() const + { + if ( ZConfig::instance().repoLabelIsAlias() ) + return alias(); + return name(); + } + Pathname RepoInfoBase::filepath() const { return _pimpl->filepath; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/repo/RepoInfoBase.h new/libzypp-6.29.2/zypp/repo/RepoInfoBase.h --- old/libzypp-6.27.1/zypp/repo/RepoInfoBase.h 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/repo/RepoInfoBase.h 2010-02-03 16:04:23.000000000 +0100 @@ -59,13 +59,19 @@ /** * \short Repository short label * - * Short label or description of the repository, to be used on - * the user interface. + * Short label or description of the repository. * ie: "SUSE Linux 10.2 updates" */ std::string name() const; /** + * \short Label for use in messages for the user interface. + * + * Returns an alias or name, according to ZConfig::repoLabelIsAlias(). + */ + std::string label() const; + + /** * If enabled is false, then this repository must be ignored as if does * not exists, except when checking for duplicate alias. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/repo/susetags/Downloader.cc new/libzypp-6.29.2/zypp/repo/susetags/Downloader.cc --- old/libzypp-6.27.1/zypp/repo/susetags/Downloader.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/repo/susetags/Downloader.cc 2010-02-03 16:04:23.000000000 +0100 @@ -63,13 +63,17 @@ this->enqueue( OnMediaLocation( key, 1 ).setOptional(true) ); this->start( dest_dir, media ); + + KeyContext context; + context.setRepoInfo(repoInfo()); // only if there is a key in the destination directory if ( PathInfo(dest_dir / key).isExist() ) - { - KeyContext context; - context.setRepoInfo(repoInfo()); sigchecker.addPublicKey(dest_dir + key, context); - } + // set the checker context even if the key is not known (unsigned repo, key + // file missing; bnc #495977) + else + sigchecker.setKeyContext(context); + this->reset(); if ( ! repoInfo().gpgCheck() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/repo/yum/Downloader.cc new/libzypp-6.29.2/zypp/repo/yum/Downloader.cc --- old/libzypp-6.27.1/zypp/repo/yum/Downloader.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/repo/yum/Downloader.cc 2010-02-03 16:04:23.000000000 +0100 @@ -134,13 +134,17 @@ this->enqueue( OnMediaLocation(keypath,1).setOptional(true) ); this->start( dest_dir, *_media_ptr); - // only add the key if it exists + + KeyContext context; + context.setRepoInfo(repoInfo()); + // only add the key if it exists if ( PathInfo(dest_dir / keypath).isExist() ) - { - KeyContext context; - context.setRepoInfo(repoInfo()); - sigchecker.addPublicKey(dest_dir + keypath, context); - } + sigchecker.addPublicKey(dest_dir + keypath, context); + // set the checker context even if the key is not known (unsigned repo, key + // file missing; bnc #495977) + else + sigchecker.setKeyContext(context); + this->reset(); if ( ! progress.tick() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/RepoManager.cc new/libzypp-6.29.2/zypp/RepoManager.cc --- old/libzypp-6.27.1/zypp/RepoManager.cc 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/zypp/RepoManager.cc 2010-02-03 16:04:23.000000000 +0100 @@ -939,7 +939,7 @@ MediaSetAccess media(url); shared_ptr<repo::Downloader> downloader_ptr; - MIL << "Creating downloader for [ " << info.name() << " ]" << endl; + MIL << "Creating downloader for [ " << info.alias() << " ]" << endl; if ( repokind.toEnum() == RepoType::RPMMD_e ) downloader_ptr.reset(new yum::Downloader(info)); @@ -1074,7 +1074,7 @@ ProgressData progress(100); callback::SendReport<ProgressReport> report; progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); - progress.name(str::form(_("Building repository '%s' cache"), info.name().c_str())); + progress.name(str::form(_("Building repository '%s' cache"), info.label().c_str())); progress.toMin(); if (needs_cleaning) @@ -1304,7 +1304,21 @@ try { - sat::Pool::instance().addRepoSolv( solvfile, info ); + Repository repo = sat::Pool::instance().addRepoSolv( solvfile, info ); + // test toolversion in order to rebuild solv file in case + // it was written by an old satsolver-tool parser. + // + // Known version strings used: + // - <no string> + // - "1.0" + // + sat::LookupRepoAttr toolversion( sat::SolvAttr::repositoryToolVersion, repo ); + if ( toolversion.begin().asString().empty() ) + { + repo.eraseFromPool(); + ZYPP_THROW(Exception("Solv-file was created by old parser.")); + } + // else: up-to-date (or even newer). } catch ( const Exception & exp ) { @@ -1327,7 +1341,7 @@ ProgressData progress(100); callback::SendReport<ProgressReport> report; progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); - progress.name(str::form(_("Adding repository '%s'"), info.name().c_str())); + progress.name(str::form(_("Adding repository '%s'"), info.label().c_str())); progress.toMin(); MIL << "Try adding repo " << info << endl; @@ -1474,7 +1488,7 @@ ProgressData progress; callback::SendReport<ProgressReport> report; progress.sendTo( ProgressReportAdaptor( progressrcv, report ) ); - progress.name(str::form(_("Removing repository '%s'"), info.name().c_str())); + progress.name(str::form(_("Removing repository '%s'"), info.label().c_str())); MIL << "Going to delete repo " << info.alias() << endl; @@ -1801,7 +1815,7 @@ // Either when probing the type, or when adjusting the repositories // enable/disable state.: bool serviceModified = false; - MIL << "going to refresh service '" << service.alias() << "', url: "<< service.url() << endl; + MIL << "Going to refresh service '" << service.alias() << "', url: "<< service.url() << endl; //! \todo add callbacks for apps (start, end, repo removed, repo added, repo changed) @@ -1827,7 +1841,7 @@ std::string servicesTargetDistro = _pimpl->options.servicesTargetDistro; if ( servicesTargetDistro.empty() && getZYpp()->getTarget() ) servicesTargetDistro = getZYpp()->target()->targetDistribution(); - DBG << "servicesTargetDistro: " << servicesTargetDistro << endl; + DBG << "ServicesTargetDistro: " << servicesTargetDistro << endl; // parse it RepoCollector collector(servicesTargetDistro); @@ -1880,6 +1894,16 @@ { if ( ! foundAliasIn( it->alias(), collector.repos ) ) { + if ( it->enabled() ) + { + DBG << "Service removes enabled repo " << it->alias() << endl; + service.addRepoToEnable( it->alias() ); + serviceModified = true; + } + else + { + DBG << "Service removes disabled repo " << it->alias() << endl; + } removeRepository( *it ); } } @@ -1916,6 +1940,7 @@ // At that point check whether a repo with the same alias // exists outside this service. Maybe forcefully re-alias // the existing repo? + DBG << "Service adds repo " << it->alias() << " " << (beEnabled?"enabled":"disabled") << endl; addRepository( *it ); // save repo credentials @@ -1931,23 +1956,38 @@ { if ( ! oldRepo->enabled() ) { + DBG << "Service repo " << it->alias() << " gets enabled" << endl; oldRepo->setEnabled( true ); oldRepoModified = true; } + else + { + DBG << "Service repo " << it->alias() << " stays enabled" << endl; + } } else if ( beDisabled ) { if ( oldRepo->enabled() ) { + DBG << "Service repo " << it->alias() << " gets disabled" << endl; oldRepo->setEnabled( false ); oldRepoModified = true; } + else + { + DBG << "Service repo " << it->alias() << " stays disabled" << endl; + } + } + else + { + DBG << "Service repo " << it->alias() << " stays " << (oldRepo->enabled()?"enabled":"disabled") << endl; } // changed url? // service repo can contain only one URL now, so no need to iterate. if ( oldRepo->url() != it->url() ) { + DBG << "Service repo " << it->alias() << " gets new URL " << it->url() << endl; oldRepo->setBaseUrl( it->url() ); oldRepoModified = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/RepoManager.h new/libzypp-6.29.2/zypp/RepoManager.h --- old/libzypp-6.27.1/zypp/RepoManager.h 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/RepoManager.h 2010-02-03 16:04:23.000000000 +0100 @@ -612,6 +612,9 @@ * \throws Exception if have problems with files */ void modifyService( const std::string & oldAlias, const ServiceInfo & service ); + /** \overload Take alias from ServiceInfo. */ + void modifyService( const ServiceInfo & service ) + { modifyService( service.alias(), service ); } private: /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/sat/SolvAttr.cc new/libzypp-6.29.2/zypp/sat/SolvAttr.cc --- old/libzypp-6.27.1/zypp/sat/SolvAttr.cc 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/zypp/sat/SolvAttr.cc 2010-02-03 16:04:23.000000000 +0100 @@ -136,6 +136,8 @@ const SolvAttr SolvAttr::repositoryRpmDbCookie ( REPOSITORY_RPMDBCOOKIE ); const SolvAttr SolvAttr::repositoryDeltaInfo ( REPOSITORY_DELTAINFO ); + const SolvAttr SolvAttr::repositoryToolVersion ( REPOSITORY_TOOLVERSION ); + ///////////////////////////////////////////////////////////////// SolvAttr SolvAttr::parent() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/sat/SolvAttr.h new/libzypp-6.29.2/zypp/sat/SolvAttr.h --- old/libzypp-6.27.1/zypp/sat/SolvAttr.h 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/zypp/sat/SolvAttr.h 2010-02-03 16:04:23.000000000 +0100 @@ -165,6 +165,7 @@ static const SolvAttr repositoryAddedFileProvides; static const SolvAttr repositoryRpmDbCookie; static const SolvAttr repositoryDeltaInfo; + static const SolvAttr repositoryToolVersion; //@} //@} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/ServiceInfo.cc new/libzypp-6.29.2/zypp/ServiceInfo.cc --- old/libzypp-6.27.1/zypp/ServiceInfo.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/ServiceInfo.cc 2010-02-03 16:04:23.000000000 +0100 @@ -125,7 +125,10 @@ { return( _pimpl->reposToEnable.find( alias_r ) != _pimpl->reposToEnable.end() ); } void ServiceInfo::addRepoToEnable( const std::string & alias_r ) - { _pimpl->reposToEnable.insert( alias_r ); } + { + _pimpl->reposToEnable.insert( alias_r ); + _pimpl->reposToDisable.erase( alias_r ); + } void ServiceInfo::delRepoToEnable( const std::string & alias_r ) { _pimpl->reposToEnable.erase( alias_r ); } @@ -150,7 +153,10 @@ { return( _pimpl->reposToDisable.find( alias_r ) != _pimpl->reposToDisable.end() ); } void ServiceInfo::addRepoToDisable( const std::string & alias_r ) - { _pimpl->reposToDisable.insert( alias_r ); } + { + _pimpl->reposToDisable.insert( alias_r ); + _pimpl->reposToEnable.erase( alias_r ); + } void ServiceInfo::delRepoToDisable( const std::string & alias_r ) { _pimpl->reposToDisable.erase( alias_r ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/target/TargetImpl.cc new/libzypp-6.29.2/zypp/target/TargetImpl.cc --- old/libzypp-6.27.1/zypp/target/TargetImpl.cc 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/zypp/target/TargetImpl.cc 2010-02-03 16:04:23.000000000 +0100 @@ -514,7 +514,6 @@ repo::PackageProvider pkgProvider( _access, p, deltas, packageProviderPolicy ); ManagedFile ret( pkgProvider.providePackage() ); - INT << ret << " (" << ret.getDispose() << ")" << endl; return ret; } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/ui/SelectableImpl.cc new/libzypp-6.29.2/zypp/ui/SelectableImpl.cc --- old/libzypp-6.27.1/zypp/ui/SelectableImpl.cc 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/zypp/ui/SelectableImpl.cc 2010-02-03 16:04:23.000000000 +0100 @@ -313,7 +313,7 @@ return( installedObj().status().isByUser() ? S_Del : S_AutoDel ); } - if ( installedObj() && installedObj().status().isLocked() ) + if ( installedObj() && allInstalledLocked() ) return S_Protected; if ( !installedObj() && allCandidatesLocked() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/ui/SelectableImpl.h new/libzypp-6.29.2/zypp/ui/SelectableImpl.h --- old/libzypp-6.27.1/zypp/ui/SelectableImpl.h 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/zypp/ui/SelectableImpl.h 2010-02-03 16:04:23.000000000 +0100 @@ -396,6 +396,18 @@ return( ! _availableItems.empty() ); } + bool allInstalledLocked() const + { + for ( installed_const_iterator it = installedBegin(); + it != installedEnd(); ++it ) + { + if ( ! (*it).status().isLocked() ) + return false; + } + return( ! _installedItems.empty() ); + } + + private: const IdString _ident; const ResObject::Kind _kind; @@ -446,7 +458,7 @@ if ( obj.availableEmpty() ) { - str << "(A 0) {}"; + str << "(A 0) {}" << endl << " "; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/ZConfig.cc new/libzypp-6.29.2/zypp/ZConfig.cc --- old/libzypp-6.27.1/zypp/ZConfig.cc 2009-12-08 19:43:40.000000000 +0100 +++ new/libzypp-6.29.2/zypp/ZConfig.cc 2010-02-03 16:04:23.000000000 +0100 @@ -216,6 +216,7 @@ , updateMessagesNotify ( "single | /usr/lib/zypp/notify-message -p %p" ) , repo_add_probe ( false ) , repo_refresh_delay ( 10 ) + , repoLabelIsAlias ( false ) , download_use_deltarpm ( true ) , download_use_deltarpm_always ( false ) , download_media_prefer_download( true ) @@ -461,6 +462,7 @@ bool repo_add_probe; unsigned repo_refresh_delay; + bool repoLabelIsAlias; bool download_use_deltarpm; bool download_use_deltarpm_always; @@ -654,6 +656,12 @@ return _pimpl->repo_refresh_delay; } + bool ZConfig::repoLabelIsAlias() const + { return _pimpl->repoLabelIsAlias; } + + void ZConfig::repoLabelIsAlias( bool yesno_r ) + { _pimpl->repoLabelIsAlias = yesno_r; } + bool ZConfig::download_use_deltarpm() const { return _pimpl->download_use_deltarpm; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/ZConfig.h new/libzypp-6.29.2/zypp/ZConfig.h --- old/libzypp-6.27.1/zypp/ZConfig.h 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/zypp/ZConfig.h 2010-02-03 16:04:23.000000000 +0100 @@ -161,6 +161,22 @@ unsigned repo_refresh_delay() const; /** + * Whether to use repository alias or name in user messages (progress, + * exceptions, ...). + * True: use alias, false: use name. + */ + bool repoLabelIsAlias() const; + + /** + * Whether to use repository alias or name in user messages (progress, + * exceptions, ...). Console applications might prefer to use and display + * the shorter alias instead of full repository name. + * + * Default: false; i.e. repo label is 'name' + */ + void repoLabelIsAlias( bool yesno_r ); + + /** * Maximum number of concurrent connections for a single transfer */ long download_max_concurrent_connections() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp/ZYppFactory.cc new/libzypp-6.29.2/zypp/ZYppFactory.cc --- old/libzypp-6.27.1/zypp/ZYppFactory.cc 2009-12-08 19:43:41.000000000 +0100 +++ new/libzypp-6.29.2/zypp/ZYppFactory.cc 2010-02-03 16:04:23.000000000 +0100 @@ -25,14 +25,19 @@ #include "zypp/zypp_detail/ZYppImpl.h" #include "zypp/zypp_detail/ZYppReadOnlyHack.h" -#define ZYPP_LOCK_FILE "/var/run/zypp.pid" - using std::endl; /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// + namespace env + { + /** Hack to circumvent the currently poor --root support. */ + inline Pathname ZYPP_LOCKFILE_ROOT() + { return getenv("ZYPP_LOCKFILE_ROOT") ? getenv("ZYPP_LOCKFILE_ROOT") : "/"; } + } + /////////////////////////////////////////////////////////////////// namespace zypp_readonly_hack { ///////////////////////////////////////////////////////////////// @@ -61,9 +66,12 @@ ZYppGlobalLock() : _clean_lock(false) + , _zyppLockFilePath( env::ZYPP_LOCKFILE_ROOT() / "/var/run/zypp.pid" ) , _zypp_lockfile(0) , _locker_pid(0) - {} + { + filesystem::assert_dir(_zyppLockFilePath.dirname()); + } ~ZYppGlobalLock() { @@ -72,14 +80,13 @@ pid_t curr_pid = getpid(); if ( _zypp_lockfile ) { - Pathname lock_file = Pathname(ZYPP_LOCK_FILE); unLockFile(); closeLockFile(); if ( _clean_lock ) { MIL << "Cleaning lock file. (" << curr_pid << ")" << std::endl; - if ( filesystem::unlink(lock_file) == 0 ) + if ( filesystem::unlink(_zyppLockFilePath) == 0 ) MIL << "Lockfile cleaned. (" << curr_pid << ")" << std::endl; else ERR << "Cant clean lockfile. (" << curr_pid << ")" << std::endl; @@ -99,16 +106,17 @@ bool _clean_lock; private: + Pathname _zyppLockFilePath; FILE *_zypp_lockfile; pid_t _locker_pid; std::string _locker_name; void openLockFile(const char *mode) { - Pathname lock_file = Pathname(ZYPP_LOCK_FILE); - _zypp_lockfile = fopen(lock_file.asString().c_str(), mode); + + _zypp_lockfile = fopen(_zyppLockFilePath.asString().c_str(), mode); if (_zypp_lockfile == 0) - ZYPP_THROW (Exception( "Cant open " + lock_file.asString() + " in mode " + std::string(mode) ) ); + ZYPP_THROW (Exception( "Cant open " + _zyppLockFilePath.asString() + " in mode " + std::string(mode) ) ); } void closeLockFile() @@ -150,11 +158,10 @@ bool lockFileExists() { - Pathname lock_file = Pathname(ZYPP_LOCK_FILE); // check if the file already existed. - INT << PathInfo(lock_file) << endl; - bool exists = PathInfo(lock_file).isExist(); - return exists; + PathInfo pi(_zyppLockFilePath); + DBG << pi << endl; + return pi.isExist(); } void createLockFile() @@ -203,7 +210,7 @@ long readpid = 0; fscanf(_zypp_lockfile, "%ld", &readpid); - MIL << "read: Lockfile " << ZYPP_LOCK_FILE << " has pid " << readpid << " (our pid: " << curr_pid << ") "<< std::endl; + MIL << "read: Lockfile " << _zyppLockFilePath << " has pid " << readpid << " (our pid: " << curr_pid << ") "<< std::endl; locker_pid = (pid_t) readpid; return locker_pid; } @@ -213,11 +220,10 @@ bool zyppLocked() { pid_t curr_pid = getpid(); - Pathname lock_file = Pathname(ZYPP_LOCK_FILE); if ( lockFileExists() ) { - MIL << "found lockfile " << lock_file << std::endl; + MIL << "found lockfile " << _zyppLockFilePath << std::endl; openLockFile("r"); shLockFile(); @@ -250,7 +256,7 @@ if ( geteuid() == 0 ) { MIL << locker_pid << " has a ZYpp lock, but process is not running. Cleaning lock file." << std::endl; - if ( filesystem::unlink(lock_file) == 0 ) + if ( filesystem::unlink(_zyppLockFilePath) == 0 ) { createLockFile(); // now open it for reading @@ -274,10 +280,10 @@ } else { - MIL << "no lockfile " << lock_file << " found" << std::endl; + MIL << "no lockfile " << _zyppLockFilePath << " found" << std::endl; if ( geteuid() == 0 ) { - MIL << "running as root. Will attempt to create " << lock_file << std::endl; + MIL << "running as root. Will attempt to create " << _zyppLockFilePath << std::endl; createLockFile(); // now open it for reading openLockFile("r"); @@ -285,7 +291,7 @@ } else { - MIL << "running as user. Skipping creating " << lock_file << std::endl; + MIL << "running as user. Skipping creating " << _zyppLockFilePath << std::endl; } return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.27.1/zypp.conf new/libzypp-6.29.2/zypp.conf --- old/libzypp-6.27.1/zypp.conf 2009-12-08 19:43:43.000000000 +0100 +++ new/libzypp-6.29.2/zypp.conf 2010-02-03 16:04:23.000000000 +0100 @@ -214,7 +214,7 @@ ## traditional behaviour. ## ## <UNSET> If a value is not set, empty or unknown, we pick -## some save default. +## some sane default. ## ## commit.downloadMode = ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libsatsolver for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package libsatsolver for openSUSE:Factory checked in at Fri Feb 5 14:09:20 CET 2010. -------- --- libsatsolver/libsatsolver.changes 2009-12-07 14:33:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsatsolver/libsatsolver.changes 2010-01-29 15:34:11.000000000 +0100 @@ -1,0 +2,22 @@ +Fri Jan 29 14:48:34 CET 2010 - mls(a)suse.de + +- speed up createwhatprovides when many solvables provide the same dep +- fix choice rule creation for real (bnc#551637) +- 0.14.14 + +------------------------------------------------------------------- +Mon Jan 18 14:42:27 CET 2010 - mls(a)suse.de + +- set repository:toolversion to 1.0 in common_write +- 0.14.13 + +------------------------------------------------------------------- +Mon Dec 21 14:29:24 CET 2009 - mls(a)suse.de + +- disable update rule in noobsoletes case if installed package is to + be kept [bnc#564239] +- work around rpm bug when --prefix is used [bnc#565525] +- add support for sparc architecture [bnc#566291] +- 0.14.12 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- satsolver-0.14.11.tar.bz2 New: ---- satsolver-0.14.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsatsolver.spec ++++++ --- /var/tmp/diff_new_pack.lHzJYe/_old 2010-02-05 14:09:00.000000000 +0100 +++ /var/tmp/diff_new_pack.lHzJYe/_new 2010-02-05 14:09:00.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libsatsolver (Version 0.14.11) +# spec file for package libsatsolver (Version 0.14.14) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libsatsolver -Version: 0.14.11 +Version: 0.14.14 Release: 1 License: BSD3c Url: git://git.opensuse.org/projects/zypp/sat-solver.git ++++++ satsolver-0.14.11.tar.bz2 -> satsolver-0.14.14.tar.bz2 ++++++ libsatsolver/satsolver-0.14.11.tar.bz2 /mounts/work_src_done/STABLE/libsatsolver/satsolver-0.14.14.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit net-snmp for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package net-snmp for openSUSE:Factory checked in at Fri Feb 5 14:08:43 CET 2010. -------- --- net-snmp/net-snmp.changes 2009-12-22 11:16:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/net-snmp/net-snmp.changes 2010-02-03 11:04:19.000000000 +0100 @@ -1,0 +2,18 @@ +Wed Feb 3 11:03:39 CET 2010 - jdelvare(a)suse.de + +- build for libsensors4 instead of libsensors3 + +------------------------------------------------------------------- +Mon Feb 1 12:06:49 UTC 2010 - jengelh(a)medozas.de + +- remove sparcv9-specific baselib exceptions (not needed) + +------------------------------------------------------------------- +Tue Jan 19 12:01:54 UTC 2010 - lchiquitto(a)novell.com + +- remove net-snmp-5.4.1.2-rmon-mib-revised_3.patch from sources + (upstream since 5.5) +- refresh net-snmp-5.5.0_autoconf.patch +- spec file cleanup: update package description + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- net-snmp-5.5.0_autoconf.patch net-snmp-5.5.0_use_lmsensors_v3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-snmp.spec ++++++ --- /var/tmp/diff_new_pack.VKrZek/_old 2010-02-05 14:06:34.000000000 +0100 +++ /var/tmp/diff_new_pack.VKrZek/_new 2010-02-05 14:06:34.000000000 +0100 @@ -20,7 +20,7 @@ Name: net-snmp Version: 5.5 -Release: 1 +Release: 2 # License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Other @@ -41,7 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel rpm-devel tcpd-devel %if 0%{?with_sensors} -BuildRequires: libsensors3-devel +BuildRequires: libsensors4-devel %endif Requires: perl-TermReadKey logrotate Requires: perl-SNMP = %{version} @@ -66,7 +66,7 @@ Source8: net-snmp-rpmlintrc Source9: baselibs.conf Patch: net-snmp-5.4.2_audit.patch -#Patch1: net-snmp-5.4.2_autoconf.patch +Patch1: net-snmp-5.5.0_autoconf.patch # unused patch atm Patch2: net-snmp-5.2.1-socket_path.diff Patch3: net-snmp-5.4.rc2-versinfo.diff @@ -79,16 +79,25 @@ Patch10: net-snmp-5.4.2_snmpconf-selinux.patch Patch11: net-snmp-5.4.2_velocity-mib.patch Patch12: net-snmp-5.4.2.1-rpm4.7.patch +Patch13: net-snmp-5.5.0_use_lmsensors_v3.patch # Summary: SNMP Daemon %description -This package was originally based on the CMU 2.1.2.1 snmp code. It has -been greatly modified, restructured, enhanced, and fixed. It hardly -looks the same as anything that CMU has ever released. It was renamed -from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to -net-snmp in November 2000. +Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c +and SNMP v3 using both IPv4 and IPv6. The suite includes: +- An extensible agent for responding to SNMP queries including built-in + support for a wide range of MIB information modules +- Command-line applications to retrieve and manipulate information from + SNMP-capable devices +- A daemon application for receiving SNMP notifications +- A library for developing new SNMP applications, with C and Perl APIs +- A graphical MIB browser. + +This package was originally based on the CMU 2.1.2.1 snmp code. It was +renamed from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp +to net-snmp in November 2000. Authors: @@ -107,14 +116,18 @@ Summary: Shared Libraries from net-snmp %description -n libsnmp15 -This package was originally based on the CMU 2.1.2.1 snmp code. It has -been greatly modified, restructured, enhanced, and fixed. It hardly -looks the same as anything that CMU has ever released. It was renamed -from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to -net-snmp in November 2000. +Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c +and SNMP v3 using both IPv4 and IPv6. The suite includes: -This package holds the shared libraries from the net-snmp package. +* An extensible agent for responding to SNMP queries including built-in + support for a wide range of MIB information modules +* Command-line applications to retrieve and manipulate information from + SNMP-capable devices +* A daemon application for receiving SNMP notifications +* A library for developing new SNMP applications, with C and Perl APIs +* A graphical MIB browser. +This package holds the shared libraries from the net-snmp package. Authors: @@ -134,18 +147,25 @@ Requires: perl-SNMP = %{version} Requires: libopenssl-devel rpm-devel tcpd-devel perl zlib-devel %if 0%{?with_sensors} -Requires: libsensors3-devel +Requires: libsensors4-devel %endif # -Summary: SNMP Daemon +Summary: Development files from net-snmp %description devel -This package was originally based on the CMU 2.1.2.1 snmp code. It has -been greatly modified, restructured, enhanced, and fixed. It hardly -looks the same as anything that CMU has ever released. It was renamed -from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to -net-snmp in November 2000. +Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c +and SNMP v3 using both IPv4 and IPv6. The suite includes: + +* An extensible agent for responding to SNMP queries including built-in + support for a wide range of MIB information modules +* Command-line applications to retrieve and manipulate information from + SNMP-capable devices +* A daemon application for receiving SNMP notifications +* A library for developing new SNMP applications, with C and Perl APIs +* A graphical MIB browser. +This package holds the development headers, libraries and API documentation +from the net-snmp package. Authors: @@ -159,14 +179,18 @@ Summary: MIB files from net-snmp %description -n snmp-mibs -This package was originally based on the CMU 2.1.2.1 snmp code. It has -been greatly modified, restructured, enhanced, and fixed. It hardly -looks the same as anything that CMU has ever released. It was renamed -from cmu-snmp to ucd-snmp in 1995 and later renamed from ucd-snmp to -net-snmp in November 2000. +Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c +and SNMP v3 using both IPv4 and IPv6. The suite includes: -This package holds the MIB files from the net-snmp package. +- An extensible agent for responding to SNMP queries including built-in + support for a wide range of MIB information modules +- Command-line applications to retrieve and manipulate information from + SNMP-capable devices +- A daemon application for receiving SNMP notifications +- A library for developing new SNMP applications, with C and Perl APIs +- A graphical MIB browser. +This package holds the MIB files from the net-snmp package. Authors: @@ -185,7 +209,6 @@ The Perl5 'SNMP' Extension Module v3.1.0 for the UCD SNMPv3 library. - Authors: -------- G.S. Marzot <gmarzot(a)nortelnetworks.com> @@ -193,7 +216,7 @@ %prep %setup -q -n %{pkg_name}-%{version} %patch -#%patch1 +%patch1 %patch2 %patch3 %patch4 @@ -205,6 +228,7 @@ %patch10 %patch11 %patch12 +%patch13 find -name "CVS" -type d | xargs -r %{__rm} -rfv find -name ".cvsignore" | xargs -r %{__rm} -fv @@ -225,7 +249,7 @@ etherlike-mib rmon-mib \ velocity \ %if 0%{?with_sensors} - ucd-snmp/lmSensors \ + ucd-snmp/lmsensorsMib \ %endif smux \ ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.VKrZek/_old 2010-02-05 14:06:34.000000000 +0100 +++ /var/tmp/diff_new_pack.VKrZek/_new 2010-02-05 14:06:34.000000000 +0100 @@ -2,6 +2,3 @@ arch ppc package net-snmp-devel requires -net-snmp-<targettype> requires "libsnmp15-<targettype> = <version>" -arch sparcv9 package net-snmp-devel - requires -net-snmp-<targettype> - requires "libsnmp15-<targettype> = <version>" ++++++ net-snmp-5.5.0_autoconf.patch ++++++ Index: configure.d/config_os_progs =================================================================== --- configure.d/config_os_progs +++ configure.d/config_os_progs @@ -153,7 +153,7 @@ AC_SUBST(NON_GNU_VPATH) # What system are we building for # -AC_CANONICAL_TARGET +AC_CANONICAL_TARGET([]) changequote(, ) PARTIALTARGETOS=`echo $target_os | sed 's/[-._].*//'` changequote([, ]) Index: configure.d/config_os_libs =================================================================== --- configure.d/config_os_libs +++ configure.d/config_os_libs @@ -235,8 +235,6 @@ if test "$with_libwrap" != "no"; then _wraplibs="$_wraplibs -lwrap"], [AC_MSG_RESULT([no]) # Linux RedHat 6.1 won't link libwrap without libnsl - AC_CHECK_FUNC(yp_get_default_domain, , - AC_CHECK_LIB(nsl, yp_get_default_domain)) AC_MSG_CHECKING([for TCP wrappers library -lwrap linked with -lnsl]) AC_TRY_LINK( [#include <sys/types.h> Index: configure.d/config_os_misc4 =================================================================== --- configure.d/config_os_misc4 +++ configure.d/config_os_misc4 @@ -205,7 +205,7 @@ fi # # used in agent only # -AC_CACHE_CHECK([whether TCP timers depend on \`hz'], +AC_CACHE_CHECK([whether TCP timers depend on hz], ac_cv_TCPTV_NEEDS_HZ, [AC_EGREP_CPP(hz, [ Index: configure.d/config_project_manual =================================================================== --- configure.d/config_project_manual +++ configure.d/config_project_manual @@ -35,7 +35,7 @@ fi ME=`$WHOAMI` if test -f /etc/resolv.conf; then - LOC=`cat /etc/resolv.conf | $GREP '^domain' | tail -1 | awk '{print $NF}'` + LOC=`cat /etc/resolv.conf | $GREP '^domain' | tail -n 1 | awk '{print $NF}'` else LOC="@no.where" fi ++++++ net-snmp-5.5.0_use_lmsensors_v3.patch ++++++ --- agent/mibgroup/hardware/sensors.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- agent/mibgroup/hardware/sensors.h.orig +++ agent/mibgroup/hardware/sensors.h @@ -7,7 +7,7 @@ config_require(hardware/sensors/picld_se config_require(hardware/sensors/kstat_sensors) # endif #else -config_require(hardware/sensors/lmsensors_v2) +config_require(hardware/sensors/lmsensors_v3) #endif /* config_require(hardware/sensors/dummy_sensors) */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnutls for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package gnutls for openSUSE:Factory checked in at Fri Feb 5 14:05:04 CET 2010. -------- --- gnutls/gnutls.changes 2009-03-13 13:32:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnutls/gnutls.changes 2010-02-04 16:46:56.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Feb 4 16:46:45 CET 2010 - meissner(a)suse.de + +- some build fixes. + +------------------------------------------------------------------- +Thu Feb 4 16:44:52 CET 2010 - per(a)osbeck.com + +- updated to stable 2.8.5 + +------------------------------------------------------------------- +Fri Dec 25 22:11:03 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source +- enable parallel building + +------------------------------------------------------------------- +Wed Sep 2 05:52:45 CEST 2009 - gjhe(a)novell.com + +- update to lastest stable version 2.8.3 + [bnc#532750] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- CVE-2008-4989.patch gnutls-2.4.1-disable_cxx.patch gnutls-2.4.1.tar.bz2 New: ---- gnutls-2.8.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnutls.spec ++++++ --- /var/tmp/diff_new_pack.CmpCFa/_old 2010-02-05 14:03:14.000000000 +0100 +++ /var/tmp/diff_new_pack.CmpCFa/_new 2010-02-05 14:03:14.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gnutls (Version 2.4.1) +# spec file for package gnutls (Version 2.8.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,14 +20,13 @@ Name: gnutls BuildRequires: gcc-c++ libgcrypt-devel libopencdk-devel -Version: 2.4.1 -Release: 25 -License: GPL v3 or later; LGPL v2.1 or later +Version: 2.8.5 +Release: 1 +License: GPLv3+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.gnutls.org/ Source0: %name-%version.tar.bz2 -Patch1: gnutls-2.4.1-disable_cxx.patch -Patch2: CVE-2008-4989.patch +Source1: baselibs.conf Summary: The GNU Transport Layer Security Library Group: Productivity/Networking/Security AutoReqProv: on @@ -52,7 +51,7 @@ Andrew McDonald %package -n libgnutls26 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: The GNU Transport Layer Security Library Group: Productivity/Networking/Security @@ -71,7 +70,7 @@ Andrew McDonald %package -n libgnutls-extra26 -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Transport Layer Security Library Group: Productivity/Networking/Security @@ -90,7 +89,7 @@ Andrew McDonald %package -n libgnutls-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Development package for gnutls Group: Development/Libraries/C and C++ Requires: libgnutls26 = %version glibc-devel libopencdk-devel libgcrypt-devel @@ -109,7 +108,7 @@ Andrew McDonald %package -n libgnutls-extra-devel -License: GPL v3 or later +License: GPLv3+ Summary: The GNU Transport Layer Security Library Group: Development/Libraries/C and C++ Requires: libgnutls-extra26 = %version libgnutls-devel @@ -138,8 +137,8 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 +#%patch2 -p1 %build autoreconf -fi @@ -154,7 +153,7 @@ --disable-rpath \ CFLAGS="$RPM_OPT_FLAGS" \ CXXFLAGS="$RPM_OPT_FLAGS" -make +make %{?_smp_mflags} make check %install @@ -164,7 +163,7 @@ rm -rf %{buildroot}/usr/share/locale/en@{,bold}quot # Do not package static libs and libtool files rm -f %{buildroot}%{_libdir}/*.{a,la} -%find_lang %name +%find_lang libgnutls %clean rm -rf %buildroot @@ -187,9 +186,9 @@ %postun -n libgnutls-devel %install_info_delete --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz -%files -f %name.lang +%files -f libgnutls.lang %defattr(-, root, root) -%doc THANKS README NEWS ChangeLog COPYING.LIB COPYING AUTHORS doc/TODO +%doc THANKS README NEWS ChangeLog COPYING AUTHORS doc/TODO %_bindir/certtool %_bindir/gnutls-cli %_bindir/gnutls-cli-debug @@ -200,6 +199,7 @@ %files -n libgnutls26 %defattr(-,root,root) %_libdir/libgnutls.so.26* +%_libdir/libgnutlsxx.so.26* %files -n libgnutls-extra26 %defattr(-,root,root) @@ -208,10 +208,11 @@ %files -n libgnutls-devel %defattr(-, root, root) -%_bindir/libgnutls-config +#%_bindir/libgnutls-config %_includedir/* %_libdir/libgnutls.so -%_datadir/aclocal/libgnutls.m4 +%_libdir/libgnutlsxx.so +#%_datadir/aclocal/libgnutls.m4 %_libdir/pkgconfig/gnutls.pc %_mandir/man3/* %_infodir/%{name}* @@ -219,10 +220,10 @@ %files -n libgnutls-extra-devel %defattr(-, root, root) -%_bindir/libgnutls-extra-config +#%_bindir/libgnutls-extra-config %_libdir/libgnutls-extra.so %_libdir/libgnutls-openssl.so -%_datadir/aclocal/libgnutls-extra.m4 +#%_datadir/aclocal/libgnutls-extra.m4 %_libdir/pkgconfig/gnutls-extra.pc %changelog ++++++ gnutls-2.4.1.tar.bz2 -> gnutls-2.8.5.tar.bz2 ++++++ ++++ 673476 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_5_0-gcj-compat for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package java-1_5_0-gcj-compat for openSUSE:Factory checked in at Fri Feb 5 14:03:01 CET 2010. -------- --- java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes 2009-10-14 14:42:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_5_0-gcj-compat/java-1_5_0-gcj-compat.changes 2010-02-01 01:16:25.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 1 00:16:20 UTC 2010 - jengelh(a)medozas.de + +- package baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_5_0-gcj-compat.spec ++++++ --- /var/tmp/diff_new_pack.336Tzw/_old 2010-02-05 14:02:54.000000000 +0100 +++ /var/tmp/diff_new_pack.336Tzw/_new 2010-02-05 14:02:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package java-1_5_0-gcj-compat (Version 1.5.0.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,7 +39,7 @@ %define _jvmjardir %{_libdir}/jvm-exports %endif Version: 1.5.0.0 -Release: 107 +Release: 108 %define section free %define gccsuffix %{nil} %define gccbinsuffix %(rpm -q --qf "-%{VERSION}" gcc) @@ -62,9 +62,10 @@ %define sdkjardir %{_jvmdir}/%{sdkdir}/lib Summary: JPackage Runtime Scripts for GCJ Group: Development/Languages/Java -License: GPL v2 or later +License: GPLv2+ Url: ftp://sources.redhat.com/pub/rhug/java-gcj-compat Source0: java-gcj-compat-%{jgcver}.tar.bz2 +Source1: baselibs.conf # Call gij instead of gcj in the "java" wrapper script: Patch0: gcc43-fixes.patch Patch1: python_prefix.patch @@ -139,7 +140,7 @@ Thomas Fitzsimmons <fitzsim(a)redhat.com> %package devel -License: GPL v2 or later +License: GPLv2+ Summary: JPackage development scripts for GCJ Group: Development/Languages/Java PreReq: update-alternatives ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 postfix for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at Fri Feb 5 14:02:41 CET 2010. -------- --- postfix/postfix.changes 2010-01-06 15:03:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/postfix/postfix.changes 2010-02-02 16:48:09.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 2 15:45:26 UTC 2010 - varkoly(a)novell.com + +- bnc#567569 - Postfix: move ldap support to a separate package +- bnc#557239 - postfix delivers mail to user's home instead of /var/spool/mail + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.tyrKty/_old 2010-02-05 13:59:47.000000000 +0100 +++ /var/tmp/diff_new_pack.tyrKty/_new 2010-02-05 13:59:47.000000000 +0100 @@ -22,7 +22,7 @@ Name: postfix Summary: A fast, secure, and flexible mailer Version: 2.6.1 -Release: 4 +Release: 5 License: IBM Public License .. Group: Productivity/Networking/Email/Servers Url: http://www.postfix.org/ @@ -43,7 +43,7 @@ PreReq: /usr/bin/getent PreReq: /usr/sbin/useradd /usr/sbin/groupadd PreReq: /bin/sed /bin/awk /bin/grep -PreReq: textutils sh-utils fileutils pcre openldap2-client netcfg +PreReq: textutils sh-utils fileutils pcre openldap2-devel netcfg BuildRequires: db-devel BuildRequires: mysql-devel BuildRequires: openldap2-devel pcre-devel postgresql-devel ++++++ postfix-2.2.9-main.cf.patch ++++++ --- /var/tmp/diff_new_pack.tyrKty/_old 2010-02-05 13:59:47.000000000 +0100 +++ /var/tmp/diff_new_pack.tyrKty/_new 2010-02-05 13:59:47.000000000 +0100 @@ -1,15 +1,5 @@ -diff -ruN postfix-2.2.9-orig/conf/main.cf postfix-2.2.9/conf/main.cf --- postfix-2.2.9-orig/conf/main.cf 2005-03-04 17:48:25.000000000 +0000 +++ postfix-2.2.9/conf/main.cf 2008-08-04 19:08:01.086201423 +0000 -@@ -405,7 +405,7 @@ - # "Maildir/" for qmail-style delivery (the / is required). - # - #home_mailbox = Mailbox --#home_mailbox = Maildir/ -+home_mailbox = Maildir/ - - # The mail_spool_directory parameter specifies the directory where - # UNIX-style mailboxes are kept. The default setting depends on the @@ -642,3 +642,29 @@ # readme_directory: The location of the Postfix README files. # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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