July 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-backup
by root＠suse.de 31 Jul '06

31 Jul '06

Hello community, here is the log from the commit of package yast2-backup checked in at Mon Jul 31 16:45:40 CEST 2006. -------- --- yast2-backup/yast2-backup.changes 2006-05-09 15:21:24.000000000 +0200 +++ yast2-backup/yast2-backup.changes 2006-07-31 11:27:00.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Jul 31 11:09:11 CEST 2006 - locilka(a)suse.cz + +- Do not add the suffix .tar to a backup destination if the file is + a block device or lies under the /dev/ path (#185042). +- Adjusted testsuite. +- 2.13.3 + +------------------------------------------------------------------- Old: ---- yast2-backup-2.13.2.tar.bz2 New: ---- yast2-backup-2.13.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-backup.spec ++++++ --- /var/tmp/diff_new_pack.Mwtr5i/_old 2006-07-31 16:45:24.000000000 +0200 +++ /var/tmp/diff_new_pack.Mwtr5i/_new 2006-07-31 16:45:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-backup (Version 2.13.2) +# spec file for package yast2-backup (Version 2.13.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-backup -Version: 2.13.2 -Release: 2 +Version: 2.13.3 +Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-backup-2.13.2.tar.bz2 +Source0: yast2-backup-2.13.3.tar.bz2 prefix: /usr BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-network yast2-nfs-client yast2-testsuite yast2-tune yast2-update Summary: YaST2 - System Backup @@ -38,7 +38,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-backup-2.13.2 +%setup -n yast2-backup-2.13.3 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,11 @@ %doc %{prefix}/share/doc/packages/yast2-backup %changelog -n yast2-backup +* Mon Jul 31 2006 - locilka(a)suse.cz +- Do not add the suffix .tar to a backup destination if the file is + a block device or lies under the /dev/ path (#185042). +- Adjusted testsuite. +- 2.13.3 * Tue May 09 2006 - locilka(a)suse.cz - Fixing UI behavior when searching for modified files. Now it does not cut filenames off and a seach progress is bigger (#172406). ++++++ yast2-backup-2.13.2.tar.bz2 -> yast2-backup-2.13.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-backup-2.13.2/VERSION new/yast2-backup-2.13.3/VERSION --- old/yast2-backup-2.13.2/VERSION 2006-05-09 15:14:18.000000000 +0200 +++ new/yast2-backup-2.13.3/VERSION 2006-07-31 11:08:58.000000000 +0200 @@ -1 +1 @@ -2.13.2 +2.13.3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-backup-2.13.2/configure new/yast2-backup-2.13.3/configure --- old/yast2-backup-2.13.2/configure 2006-05-09 15:22:23.000000000 +0200 +++ new/yast2-backup-2.13.3/configure 2006-07-31 11:27:57.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-backup 2.13.2. +# Generated by GNU Autoconf 2.59 for yast2-backup 2.13.3. # -# Report bugs to <http://www.suse.de/feedback>. +# Report bugs to <http://bugs.opensuse.org/>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -269,9 +269,9 @@ # Identity of this package. PACKAGE_NAME='yast2-backup' PACKAGE_TARNAME='yast2-backup' -PACKAGE_VERSION='2.13.2' -PACKAGE_STRING='yast2-backup 2.13.2' -PACKAGE_BUGREPORT='http://www.suse.de/feedback' +PACKAGE_VERSION='2.13.3' +PACKAGE_STRING='yast2-backup 2.13.3' +PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" ac_default_prefix=/usr @@ -728,7 +728,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-backup 2.13.2 to adapt to many kinds of systems. +\`configure' configures yast2-backup 2.13.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-backup 2.13.2:";; + short | recursive ) echo "Configuration of yast2-backup 2.13.3:";; esac cat <<\_ACEOF @@ -812,7 +812,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback>. +Report bugs to <http://bugs.opensuse.org/>. _ACEOF fi @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-backup configure 2.13.2 +yast2-backup configure 2.13.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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-backup $as_me 2.13.2, which was +It was created by yast2-backup $as_me 2.13.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-backup' - VERSION='2.13.2' + VERSION='2.13.3' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.2" +VERSION="2.13.3" RPMNAME="yast2-backup" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -2693,7 +2693,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-backup $as_me 2.13.2, which was +This file was extended by yast2-backup $as_me 2.13.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2748,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-backup config.status 2.13.2 +yast2-backup config.status 2.13.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-backup-2.13.2/configure.in new/yast2-backup-2.13.3/configure.in --- old/yast2-backup-2.13.2/configure.in 2006-05-09 15:22:11.000000000 +0200 +++ new/yast2-backup-2.13.3/configure.in 2006-07-31 11:27:53.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-backup dnl -dnl -- This file is generated by y2autoconf 2.13.17 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-backup, 2.13.2, http://www.suse.de/feedback, yast2-backup) +AC_INIT(yast2-backup, 2.13.3, http://bugs.opensuse.org/, yast2-backup) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.2" +VERSION="2.13.3" RPMNAME="yast2-backup" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-backup-2.13.2/src/functions.ycp new/yast2-backup-2.13.3/src/functions.ycp --- old/yast2-backup-2.13.2/src/functions.ycp 2006-02-03 08:49:17.000000000 +0100 +++ new/yast2-backup-2.13.3/src/functions.ycp 2006-07-31 11:12:17.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: functions.ycp 24423 2005-07-28 10:40:49Z locilka $ + * $Id: functions.ycp 32051 2006-07-31 09:13:47Z locilka $ * * Functions used by backup module. */ @@ -23,6 +23,7 @@ import "Popup"; import "FileUtils"; import "Mode"; +import "FileUtils"; textdomain "backup"; @@ -392,6 +393,9 @@ /** * Add extension to the file name if it is missing. + * This function skips adding when the file is under the /dev/ path + * or when it is an existing device file. + * * @param file filname * @param extension file extension (with dot) * @return string filename with extension @@ -399,16 +403,32 @@ * @example AddMissingExtension("filename.tar", ".gz") -> "filename.tar.gz" * @example AddMissingExtension("filename.tar", ".tar") -> "filename.tar" */ - define string AddMissingExtension(string file, string extension) -``{ + define string AddMissingExtension(string file, string extension) { // input check - if (file == nil) - { + if (file == nil) { return ""; } - if (extension == nil) - { + if (extension == nil) { + return file; + } + + // removing unneded slashes + if (regexpmatch(file, "^/")) { + file = regexpsub(file, "^/+(.*)", "/\\1"); + } + + // skip if the file is a block device + if (FileUtils::Exists(file) && FileUtils::GetFileType(file) == "block") { + y2milestone("Leaving destination unchanged, '%1' is a block device", file); + + return file; + } + + // skipping /dev/ directory + if (regexpmatch(file, "^/dev/")) { + y2milestone("Leaving destination unchanged, '%1' is under the /dev/ directory", file); + return file; } @@ -418,18 +438,14 @@ string result = ""; // check if file can contain extension - if (size(filename) >= size(extension)) - { + if (size(filename) >= size(extension)) { // add extension only if it is missing filename = (substring(filename, size(filename) - size(extension)) != extension) ? filename + extension : filename; - } - else - { + } else { filename = filename + extension; } - if (size(dirs) > 0) - { + if (size(dirs) > 0) { dirs = remove(dirs, size(dirs) - 1); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-backup-2.13.2/testsuite/tests/AddMissingExtension.out new/yast2-backup-2.13.3/testsuite/tests/AddMissingExtension.out --- old/yast2-backup-2.13.2/testsuite/tests/AddMissingExtension.out 2006-02-03 08:49:18.000000000 +0100 +++ new/yast2-backup-2.13.3/testsuite/tests/AddMissingExtension.out 2006-07-31 11:21:08.000000000 +0200 @@ -12,3 +12,4 @@ Return /dir.ext/.ext Return /dir.ext/file.ext Return /dir1.ext/dir2.ext/file.ext +Return /dev/nst0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-backup-2.13.2/testsuite/tests/AddMissingExtension.ycp new/yast2-backup-2.13.3/testsuite/tests/AddMissingExtension.ycp --- old/yast2-backup-2.13.2/testsuite/tests/AddMissingExtension.ycp 2006-02-03 08:49:18.000000000 +0100 +++ new/yast2-backup-2.13.3/testsuite/tests/AddMissingExtension.ycp 2006-07-31 11:27:16.000000000 +0200 @@ -4,13 +4,22 @@ // // testedfiles: backup/functions.ycp // -// $Id: AddMissingExtension.ycp 17877 2004-06-16 14:39:16Z lslezak $ +// $Id: AddMissingExtension.ycp 32052 2006-07-31 09:28:49Z locilka $ // { import "Testsuite"; -map readmap = $[ "target" : $["string" : "", "size" : -1, "tmpdir" : "/tmp" ], +map readmap = $[ + "target" : $[ + "string" : "", "size" : -1, "tmpdir" : "/tmp", + "stat" : $[ + "atime":1101890288, "ctime":1101890286, "gid":0, + "inode":29236, "isblock":true, "ischr":false, "isdir":false, + "isfifo":false, "islink":false, "isreg":false, "issock":false, "mtime":1101890286, + "nlink":1, "size":804, "uid":0 + ] + ], "proc" : $["cpuinfo" : $[ "value" : $["0" : $[ "flags" : ""]]]], "probe" : $["has_smp" : false, "is_uml" : false, "cdrom" : $["manual" : []]], ]; @@ -36,5 +45,9 @@ Testsuite::Test( ``(AddMissingExtension("/dir.ext/file.ext", ".ext") ), [ $[], $[], $[] ], nil ); Testsuite::Test( ``(AddMissingExtension("/dir1.ext/dir2.ext/file", ".ext") ), [ $[], $[], $[] ], nil ); +// '/dev/' and block devices should not be bothered by adding an extension +// bugzilla #185042 +// see "target" : $[ "stat" : $[] ] +Testsuite::Test( ``(AddMissingExtension("/dev/nst0", ".ext") ), [ $[], $[], $[] ], nil ); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 awstats
by root＠suse.de 31 Jul '06

31 Jul '06

Hello community, here is the log from the commit of package awstats checked in at Mon Jul 31 16:45:17 CEST 2006. -------- --- awstats/awstats.changes 2006-07-28 12:58:41.000000000 +0200 +++ awstats/awstats.changes 2006-07-31 08:37:51.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 31 08:37:01 CEST 2006 - mskibbe(a)suse.de + +- bugfix for geoip function (Bug #188142) which fix a syntax error + +------------------------------------------------------------------- Old: ---- awstats-6.6.dif New: ---- awstats-6.6-geo.patch awstats-6.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ awstats.spec ++++++ --- /var/tmp/diff_new_pack.rnjSC7/_old 2006-07-31 16:45:08.000000000 +0200 +++ /var/tmp/diff_new_pack.rnjSC7/_new 2006-07-31 16:45:08.000000000 +0200 @@ -15,7 +15,7 @@ Group: Productivity/Networking/Web/Utilities Autoreqprov: on Version: 6.6 -Release: 1 +Release: 2 URL: http://awstats.sourceforge.net Summary: Advanced Web Statistics Source: awstats-%{version}.tar.bz2 @@ -25,8 +25,9 @@ Source6: awstats-update.8 Source7: awstats.logrotate Source8: apache2.awstats.conf -Patch: %{name}-6.6.dif -Patch1: awstats-CVE-2006-2237_read_open.patch +Patch: %{name}-%{version}.patch +Patch1: %{name}-CVE-2006-2237_read_open.patch +Patch2: %{name}-%{version}-geo.patch BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define apache_serverroot /srv/www @@ -43,6 +44,7 @@ %setup %patch %patch1 +%patch2 find -type f -name .cvsignore -print0 | xargs -r0 rm -v %install @@ -98,6 +100,8 @@ /var/cache/awstats %changelog -n awstats +* Mon Jul 31 2006 - mskibbe(a)suse.de +- bugfix for geoip function (Bug #188142) which fix a syntax error * Wed Jun 14 2006 - mrueckert(a)suse.de - Upgraded to version 6.6, list of new things among others: - RSS catcher/readers in robot database ++++++ awstats-6.6-geo.patch ++++++ --- wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm +++ wwwroot/cgi-bin/plugins/geoip_org_maxmind.pm @@ -73,7 +73,7 @@ if ($mode eq '' || $mode eq 'GEOIP_MEMORY_CACHE') { $mode=Geo::IP::GEOIP_MEMORY_CACHE(); } else { $mode=Geo::IP::GEOIP_STANDARD(); } } - %TmpDomainLookup=(); +# %TmpDomainLookup=(); debug(" Plugin geoip_org_maxmind: GeoIP initialized type=$type mode=$mode",1); if ($type eq 'geoippureperl') { $geoip_org_maxmind = Geo::IP::PurePerl->open($datafile, $mode); --- wwwroot/cgi-bin/plugins/geoipfree.pm +++ wwwroot/cgi-bin/plugins/geoipfree.pm @@ -49,7 +49,7 @@ # <----- # ENTER HERE CODE TO DO INIT PLUGIN ACTIONS debug(" Plugin geoipfree: InitParams=$InitParams",1); - %TmpDomainLookup=(); +# %TmpDomainLookup=(); $gi = Geo::IPfree::new(); # $gi->Faster; # Do not enable Faster as the Memoize module is rarely available # -----> ++++++ awstats-6.6.dif -> awstats-6.6.patch ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MozillaFirefox
by root＠suse.de 30 Jul '06

30 Jul '06

Hello community, here is the log from the commit of package MozillaFirefox checked in at Sun Jul 30 12:07:28 CEST 2006. -------- --- MozillaFirefox/MozillaFirefox.changes 2006-07-27 17:51:39.000000000 +0200 +++ MozillaFirefox/MozillaFirefox.changes 2006-07-29 20:39:37.000000000 +0200 @@ -2 +2 @@ -Thu Jul 27 17:51:39 CEST 2006 - mls(a)suse.de +Sat Jul 29 08:48:53 CEST 2006 - stark(a)suse.de @@ -4 +4 @@ -- converted neededforbuild to BuildRequires +- update to regression release 1.5.0.6 (#195043) Old: ---- firefox-1.5.0.5-source.tar.bz2 New: ---- firefox-1.5.0.6-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.RraHZ0/_old 2006-07-30 12:06:39.000000000 +0200 +++ /var/tmp/diff_new_pack.RraHZ0/_new 2006-07-30 12:06:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 1.5.0.5) +# spec file for package MozillaFirefox (Version 1.5.0.6) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: MozillaFirefox -BuildRequires: gcc-c++ gnutls-devel krb5-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libidl-devel liblcms libwnck-devel mDNSResponder-devel mozilla-nss-devel orbit-devel tcsh update-desktop-files zip +BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel startup-notification-devel update-desktop-files zip License: MPL, GPL Provides: web_browser Provides: MozillaFirebird @@ -20,7 +20,7 @@ %if %sles_version == 10 Obsoletes: mozilla %endif -Version: 1.5.0.5 +Version: 1.5.0.6 Release: 1 Summary: Mozilla Firefox Web Browser URL: http://www.mozilla.org/ @@ -106,7 +106,7 @@ Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`) %endif %define _unpackaged_files_terminate_build 0 -%define releasedate 2006072500 +%define releasedate 2006072800 %define progname firefox %define progdir %{_prefix}/%_lib/firefox %define nld9 %(if grep -q sles9-sld /.buildenv; then echo 1; else echo 0; fi) @@ -514,8 +514,8 @@ %defattr(-,root,root) %changelog -n MozillaFirefox -* Thu Jul 27 2006 - mls(a)suse.de -- converted neededforbuild to BuildRequires +* Sat Jul 29 2006 - stark(a)suse.de +- update to regression release 1.5.0.6 (#195043) * Thu Jul 27 2006 - stark(a)suse.de - security update to version 1.5.0.5 (#195043) * observer-lock.patch integrated now ++++++ firefox-1.5.0.5-source.tar.bz2 -> firefox-1.5.0.6-source.tar.bz2 ++++++ MozillaFirefox/firefox-1.5.0.5-source.tar.bz2 MozillaFirefox/firefox-1.5.0.6-source.tar.bz2 differ: char 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 yast2-CASA
by root＠suse.de 30 Jul '06

30 Jul '06

Hello community, here is the log from the commit of package yast2-CASA checked in at Sun Jul 30 12:01:59 CEST 2006. -------- --- yast2-CASA/yast2-CASA.changes 2006-05-25 21:02:56.000000000 +0200 +++ yast2-CASA/yast2-CASA.changes 2006-07-28 18:46:59.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 28 10:19:39 MDT 2006 - schoi(a)novell.com + +- Version change from 1.6 to 1.7 + +------------------------------------------------------------------- Old: ---- yast2-CASA-1.6.658.tar.bz2 New: ---- yast2-CASA-1.7.758.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-CASA.spec ++++++ --- /var/tmp/diff_new_pack.roNUok/_old 2006-07-30 12:01:56.000000000 +0200 +++ /var/tmp/diff_new_pack.roNUok/_new 2006-07-30 12:01:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-CASA (Version 1.6.658) +# spec file for package yast2-CASA (Version 1.7.758) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ Name: yast2-CASA URL: http://forge.novell.com -BuildRequires: update-desktop-files yast2-devel yast2-devtools -Version: 1.6.658 +BuildRequires: libgcc libstdc++ update-desktop-files yast2-devel yast2-devtools +Version: 1.7.758 Release: 1 License: LGPL Group: System/YaST @@ -35,7 +35,7 @@ Cameron Mashayekhi %prep -%setup -n yast2-CASA-1.6.658 +%setup -n yast2-CASA-1.7.758 %build %{prefix}/bin/y2tool y2autoconf @@ -80,15 +80,17 @@ /usr/share/pixmaps/CASA_22.png /usr/share/pixmaps/CASA_32.png /usr/share/pixmaps/CASA_48.png -/usr/share/YaST2/locale/* /usr/share/YaST2/include/CASA/* /usr/share/YaST2/clients/CASA.ycp /usr/share/YaST2/clients/CASA_*.ycp /usr/share/YaST2/modules/NovellCasa.* +/usr/share/YaST2/locale/* %{prefix}/share/applications/YaST2/CASA.desktop %doc %{prefix}/share/doc/packages/yast2-CASA %changelog -n yast2-CASA +* Fri Jul 28 2006 - schoi(a)novell.com +- Version change from 1.6 to 1.7 * Thu May 25 2006 - cmashayekhi(a)novell.com - Buttons start in grayed out state before internal check for insattation or not. ++++++ yast2-CASA-1.6.658.tar.bz2 -> yast2-CASA-1.7.758.tar.bz2 ++++++ ++++ 30491 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 xfig
by root＠suse.de 30 Jul '06

30 Jul '06

Hello community, here is the log from the commit of package xfig checked in at Sun Jul 30 12:01:51 CEST 2006. -------- --- xfig/xfig.changes 2006-02-15 10:36:20.000000000 +0100 +++ xfig/xfig.changes 2006-07-28 19:23:09.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 28 19:22:50 CEST 2006 - werner(a)suse.de + +- Make it build with X11R7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfig.spec ++++++ --- /var/tmp/diff_new_pack.N6hgMU/_old 2006-07-30 12:00:51.000000000 +0200 +++ /var/tmp/diff_new_pack.N6hgMU/_new 2006-07-30 12:00:51.000000000 +0200 @@ -18,7 +18,7 @@ Requires: transfig netpbm ghostscript-fonts-std Autoreqprov: on Version: 3.2.4 -Release: 74 +Release: 85 Summary: Facility for Interactive Generation of Figures under the X Window System Url: http://www.xfig.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,6 +36,18 @@ Patch6: xfig.%{version}-null.dif Patch7: xfig.%{version}-quiet.dif Patch8: xfig.%{version}-gcc4.dif +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} +%if "%_exec_prefix" == "/usr/X11R6" + +%global _mandir %{_exec_prefix}/man + +%global _includedir %{_exec_prefix}/include +%define _x11data %{_exec_prefix}/lib/X11 +%define _appdefdir %{_x11data}/app-defaults +%else +%define _x11data %{_datadir}/X11 +%define _appdefdir %{_x11data}/app-defaults +%endif %description Xfig is a menu-driven tool that allows the user to draw and manipulate @@ -73,51 +85,56 @@ xmkmf -a %build -make CCOPTIONS="-fno-strict-aliasing $RPM_OPT_FLAGS -w" +make SHAREDIR=%{_x11data} \ + CCOPTIONS="-fno-strict-aliasing $RPM_OPT_FLAGS -w" %install -mkdir -p ${RPM_BUILD_ROOT}/usr/X11R6/bin -mkdir -p ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xfig -mkdir -p ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/app-defaults -mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}/Libraries/Examples -rm -rf ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}/Examples +mkdir -p %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_x11data}/xfig +mkdir -p %{buildroot}%{_appdefdir} +mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/Libraries/Examples +rm -rf %{buildroot}%{_defaultdocdir}/%{name}/Examples ln -sf Libraries/Examples \ - ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}/TheExamples + %{buildroot}%{_defaultdocdir}/%{name}/TheExamples ln -sf %{_defaultdocdir}/%{name}/Libraries \ - ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xfig/Libraries + %{buildroot}%{_x11data}/xfig/Libraries ln -sf %{_defaultdocdir}/%{name}/html \ - ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xfig/ + %{buildroot}%{_x11data}/xfig/ ln -sf %{_defaultdocdir}/%{name}/xfig.html \ - ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xfig/ + %{buildroot}%{_x11data}/xfig/ ln -sf %{_defaultdocdir}/%{name}/xfig-howto.pdf \ - ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xfig/ -install -m 0755 %{SOURCE2} ${RPM_BUILD_ROOT}/usr/X11R6/lib/X11/xfig/ -make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT install.man -mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name} -cp -pr README FIGAPPS Libraries font-test.fig $RPM_BUILD_ROOT/%{_docdir}/%{name} -cp -pr Doc/FORMAT* Doc/TODO Doc/html Doc/*.pdf Doc/*.html $RPM_BUILD_ROOT/%{_docdir}/%{name} -find ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}/ -name '*.bak' | xargs -r rm -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps -cp -p %{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ -mv ${RPM_BUILD_ROOT}/usr/X11R6/bin/xfig ${RPM_BUILD_ROOT}/usr/X11R6/bin/xfig.bin -install -m 0755 %{SOURCE3} ${RPM_BUILD_ROOT}/usr/X11R6/bin/xfig -install -d ${RPM_BUILD_ROOT}/usr/share/applications -install -m 0644 %{SOURCE4} ${RPM_BUILD_ROOT}/usr/share/applications -%suse_update_desktop_file xfig VectorGraphics + %{buildroot}%{_x11data}/xfig/ +install -m 0755 %{SOURCE2} %{buildroot}%{_x11data}/xfig/ +make DESTDIR=%{buildroot} SHAREDIR=%{_x11data} install +make DESTDIR=%{buildroot} SHAREDIR=%{_x11data} install.man +mkdir -p %{buildroot}/%{_docdir}/%{name} +cp -pr README FIGAPPS Libraries font-test.fig %{buildroot}/%{_docdir}/%{name} +cp -pr Doc/FORMAT* Doc/TODO Doc/html Doc/*.pdf Doc/*.html %{buildroot}/%{_docdir}/%{name} +find %{buildroot}%{_defaultdocdir}/%{name}/ -name '*.bak' | xargs -r rm +mkdir -p %{buildroot}%{_datadir}/pixmaps +cp -p %{name}.png %{buildroot}%{_datadir}/pixmaps/ +mv %{buildroot}%{_bindir}/xfig %{buildroot}%{_bindir}/xfig.bin +sed 's|@@BINDIR@@|%{_bindir}|' < %{SOURCE3} > %{buildroot}%{_bindir}/xfig +chmod 0755 %{SOURCE3} %{buildroot}%{_bindir}/xfig +install -d %{buildroot}/usr/share/applications +sed 's|@@BINDIR@@|%{_bindir}|' < %{SOURCE4} > %{buildroot}/usr/share/applications/xfig.desktop +chmod 0644 %{buildroot}/usr/share/applications/xfig.desktop +%suse_update_desktop_file xfig VectorGraphics &> /dev/null %files %defattr(-,root,root,755) %doc %{_docdir}/%{name} %{_datadir}/applications/xfig.desktop %{_datadir}/pixmaps/xfig.png -/usr/X11R6/lib/X11/xfig -/usr/X11R6/bin/xfig* -%config /usr/X11R6/lib/X11/app-defaults/Fig -%config /usr/X11R6/lib/X11/app-defaults/Fig-color -%doc /usr/X11R6/man/man1/xfig.1x.gz +%{_x11data}/xfig +%{_bindir}/xfig* +%config %{_appdefdir}/Fig +%config %{_appdefdir}/Fig-color +%doc %{_mandir}/man1/xfig.1x.gz %changelog -n xfig +* Fri Jul 28 2006 - werner(a)suse.de +- Make it build with X11R7 * Wed Feb 15 2006 - stbinner(a)suse.de - add GenericName to .desktop file * Wed Jan 25 2006 - mls(a)suse.de ++++++ xfig.3.2.4.dif ++++++ --- /var/tmp/diff_new_pack.N6hgMU/_old 2006-07-30 12:00:52.000000000 +0200 +++ /var/tmp/diff_new_pack.N6hgMU/_new 2006-07-30 12:00:52.000000000 +0200 @@ -215,7 +215,7 @@ #ifdef WHEELMOUSE DUSEWHEELMOUSE = -DWHEELMOUSE -@@ -154,19 +157,19 @@ +@@ -154,7 +157,7 @@ XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures @@ -224,12 +224,12 @@ XCOMM use (and change) the following if you want the multi-key data base file XCOMM somewhere other than the standard X11 library directory - XCOMM be sure to comment out the second copy of XFIGLIBDIR if you use this one --XCOMM XFIGLIBDIR = /usr/local/lib/xfig -+XFIGLIBDIR = /usr/X11R6/lib/X11/xfig +@@ -162,11 +165,11 @@ + XCOMM XFIGLIBDIR = /usr/local/lib/xfig XCOMM use this if you want the multi-key data base file in the standard X11 tree - XFIGLIBDIR = $(LIBDIR)/xfig +-XFIGLIBDIR = $(LIBDIR)/xfig ++XFIGLIBDIR = $(SHAREDIR)/xfig XCOMM XFIGDOCDIR tells where the html and pdf documentation should go XCOMM XFIGDOCDIR = $(DOCDIR)/xfig ++++++ xfig.desktop ++++++ --- xfig/xfig.desktop 2006-02-15 10:36:20.000000000 +0100 +++ xfig/xfig.desktop 2006-07-28 18:49:56.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Categories=VectorGraphics -Exec=/usr/X11R6/bin/xfig +Exec=@@BINDIR@@/xfig InitialPreference=2 MimeType=image/x-xfig Name=xfig ++++++ xfig.sh ++++++ --- xfig/xfig.sh 2006-02-15 10:36:20.000000000 +0100 +++ xfig/xfig.sh 2006-07-28 18:36:46.000000000 +0200 @@ -14,4 +14,4 @@ esac done unset ret val -exec -a $0 /usr/X11R6/bin/xfig.bin ${1+"$@"} +exec -a $0 @@BINDIR@@/xfig.bin ${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 xaw3d
by root＠suse.de 30 Jul '06

30 Jul '06

Hello community, here is the log from the commit of package xaw3d checked in at Sun Jul 30 12:00:45 CEST 2006. -------- --- xaw3d/xaw3d.changes 2006-02-27 18:01:08.000000000 +0100 +++ xaw3d/xaw3d.changes 2006-07-28 17:15:45.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 28 17:15:37 CEST 2006 - werner(a)suse.de + +- Make it build with X11R7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xaw3d.spec ++++++ --- /var/tmp/diff_new_pack.D1vkEM/_old 2006-07-30 12:00:09.000000000 +0200 +++ /var/tmp/diff_new_pack.D1vkEM/_new 2006-07-30 12:00:09.000000000 +0200 @@ -17,7 +17,7 @@ Provides: Xaw3d Autoreqprov: on Version: 1.5E -Release: 231 +Release: 240 Summary: 3D Athena Widgets Url: http://www.visi.com/~hawkeyd/xaw3d.html Source: Xaw3d-1.5E.tar.bz2 @@ -31,6 +31,11 @@ Patch7: Xaw3d-1.5E-fontset.patch Patch8: Xaw3d-1.5E-null.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} +%if "%_exec_prefix" == "/usr/X11R6" + +%global _includedir %{_exec_prefix}/include +%endif %description This is a library that can be used instead of the standard @@ -126,23 +131,23 @@ %install cd lib/Xaw3d -make DESTDIR=$RPM_BUILD_ROOT install SOXAWREV=6.1 -rm -rf $RPM_BUILD_ROOT/usr/X11R6/include/X11/Xaw3d -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/include/X11/Xaw3d -rm -rf $RPM_BUILD_ROOT/usr/X11R6/include/Xaw3d -ln -sf X11/Xaw3d $RPM_BUILD_ROOT/usr/X11R6/include/Xaw3d -make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT install.man -mkdir -p $RPM_BUILD_ROOT%{_docdir}/xaw3d -install -c -m 0444 README.XAW3D $RPM_BUILD_ROOT%{_docdir}/xaw3d -rm -f $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/Xaw3d/libXaw.so -install -c -m 0444 NOTE $RPM_BUILD_ROOT%{_docdir}/xaw3d/README.SuSE -ln -sf %{_docdir}/xaw3d/README.SuSE $RPM_BUILD_ROOT/usr/X11R6/%{_lib}/Xaw3d/NOTE +make DESTDIR=%{buildroot} install SOXAWREV=6.1 +rm -rf %{buildroot}%{_includedir}/X11/Xaw3d +mkdir -p %{buildroot}%{_includedir}X11/Xaw3d +rm -rf %{buildroot}%{_includedir}/Xaw3d +ln -sf X11/Xaw3d %{buildroot}%{_includedir}/Xaw3d +make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install.man +mkdir -p %{buildroot}%{_docdir}/xaw3d +install -c -m 0444 README.XAW3D %{buildroot}%{_docdir}/xaw3d +rm -f %{buildroot}%{_libdir}/Xaw3d/libXaw.so +install -c -m 0444 NOTE %{buildroot}%{_docdir}/xaw3d/README.SuSE +ln -sf %{_docdir}/xaw3d/README.SuSE %{buildroot}%{_libdir}/Xaw3d/NOTE # removing unwanted file -rm -f $RPM_BUILD_ROOT/usr/X11R6/include/X11/Xaw3d/Template.c +rm -f %{buildroot}%{_includedir}/Xaw3d/Template.c %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -154,29 +159,31 @@ %files %defattr(-,root,root) -%dir /usr/X11R6/include/X11/Xaw3d +%dir %{_includedir}/X11/Xaw3d %dir %{_docdir}/xaw3d -/usr/X11R6/include/Xaw3d -/usr/X11R6/include/X11/Xaw3d/*.h -/usr/X11R6/%{_lib}/libXaw3d.a -/usr/X11R6/%{_lib}/libXaw3d.so -/usr/X11R6/%{_lib}/libXaw3d.so.6 -/usr/X11R6/%{_lib}/libXaw3d.so.6.1 -/usr/X11R6/%{_lib}/libXaw3d.so.8 -/usr/X11R6/%{_lib}/libXaw3d.so.8.0 +%{_includedir}/Xaw3d +%{_includedir}/X11/Xaw3d/*.h +%{_libdir}/libXaw3d.a +%{_libdir}/libXaw3d.so +%{_libdir}/libXaw3d.so.6 +%{_libdir}/libXaw3d.so.6.1 +%{_libdir}/libXaw3d.so.8 +%{_libdir}/libXaw3d.so.8.0 %{_docdir}/xaw3d/README.XAW3D %files -n xaw3dd %defattr(-,root,root) -%dir /usr/X11R6/%{_lib}/Xaw3d -/usr/X11R6/%{_lib}/Xaw3d/libXaw.so.6 -/usr/X11R6/%{_lib}/Xaw3d/libXaw.so.6.1 -/usr/X11R6/%{_lib}/Xaw3d/libXaw.so.8 -/usr/X11R6/%{_lib}/Xaw3d/libXaw.so.8.0 -%doc /usr/X11R6/%{_lib}/Xaw3d/NOTE +%dir %{_libdir}/Xaw3d +%{_libdir}/Xaw3d/libXaw.so.6 +%{_libdir}/Xaw3d/libXaw.so.6.1 +%{_libdir}/Xaw3d/libXaw.so.8 +%{_libdir}/Xaw3d/libXaw.so.8.0 +%doc %{_libdir}/Xaw3d/NOTE %{_docdir}/xaw3d/README.SuSE %changelog -n xaw3d +* Fri Jul 28 2006 - werner(a)suse.de +- Make it build with X11R7 * Mon Feb 27 2006 - schwab(a)suse.de - Run ldconfig also in xaw3dd package. * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit suspend
by root＠suse.de 30 Jul '06

30 Jul '06

Hello community, here is the log from the commit of package suspend checked in at Sun Jul 30 12:00:03 CEST 2006. -------- --- arch/i386/suspend/suspend.changes 2006-07-21 12:01:11.000000000 +0200 +++ suspend/suspend.changes 2006-07-28 17:27:00.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 28 17:01:04 CEST 2006 - seife(a)suse.de + +- fix segfaults in vbetool code on 64bit machines. + +------------------------------------------------------------------- New: ---- liblzf-1.6.tar.gz vbetool-fix-64bit-segfaults.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.H7pVFd/_old 2006-07-30 11:59:58.000000000 +0200 +++ /var/tmp/diff_new_pack.H7pVFd/_new 2006-07-30 11:59:58.000000000 +0200 @@ -13,13 +13,15 @@ Name: suspend BuildRequires: pciutils-devel Version: 20060721 -Release: 1 +Release: 2 Summary: A Set Of Tools To Support Sleep Modes License: GPL URL: http://sourceforge.net/projects/suspend Group: System/Console Source: %{name}-%{version}.tar.bz2 +Source1: liblzf-1.6.tar.gz Patch0: suspend-install-fix.diff +Patch1: vbetool-fix-64bit-segfaults.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Supplements: powersave @@ -32,13 +34,20 @@ Authors: -------- Pavel Machek <pavel(a)suse.cz> + Rafael J. Wysocki <rjw(a)sisk.pl> + and others. %prep -%setup -q +%setup -q -a 1 %patch0 -p0 +%patch1 -p0 %build -make ARCH=%_arch SUSPEND_DIR=/usr/sbin CC_FLAGS="$RPM_OPT_FLAGS" +pushd liblzf-1.6 +./configure +make CFLAGS="$RPM_OPT_FLAGS" +popd +make ARCH=%_arch SUSPEND_DIR=/usr/sbin CC_FLAGS="$RPM_OPT_FLAGS -Iliblzf-1.6 -Lliblzf-1.6" CONFIG_COMPRESS=yes %install make install-suspend install-resume ARCH=%_arch DESTDIR=$RPM_BUILD_ROOT SUSPEND_DIR=/usr/sbin @@ -57,6 +66,8 @@ %doc README README.s2ram-whitelist HOWTO LICENSE %changelog -n suspend +* Fri Jul 28 2006 - seife(a)suse.de +- fix segfaults in vbetool code on 64bit machines. * Fri Jul 21 2006 - seife(a)suse.de - update to current CVS which does (among others): - various whitelist updates ++++++ vbetool-fix-64bit-segfaults.diff ++++++ --- vbetool/x86-common.c +++ vbetool/x86-common.c @@ -33,8 +33,8 @@ #include "include/lrmi.h" -#define REAL_MEM_BASE ((void *)0x10000) -#define REAL_MEM_SIZE 0x40000 +#define REAL_MEM_BASE ((void *)0x1000) +#define REAL_MEM_SIZE 0xa0000 #define REAL_MEM_BLOCKS 0x100 struct mem_block { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 seamonkey
by root＠suse.de 30 Jul '06

30 Jul '06

Hello community, here is the log from the commit of package seamonkey checked in at Sun Jul 30 11:59:54 CEST 2006. -------- --- seamonkey/seamonkey.changes 2006-07-27 06:26:26.000000000 +0200 +++ seamonkey/seamonkey.changes 2006-07-29 22:47:25.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jul 29 22:46:38 CEST 2006 - stark(a)suse.de + +- update to 1.0.4 fixing a major regression in 1.0.3 (#195402) + +------------------------------------------------------------------- Old: ---- seamonkey-source-1.0.3.tar.bz2 New: ---- seamonkey-source-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.NsDYtp/_old 2006-07-30 11:59:42.000000000 +0200 +++ /var/tmp/diff_new_pack.NsDYtp/_new 2006-07-30 11:59:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package seamonkey (Version 1.0.3) +# spec file for package seamonkey (Version 1.0.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel update-desktop-files zip License: MPL, GPL Provides: web_browser -Version: 1.0.3 +Version: 1.0.4 Release: 1 Summary: The successor of the Mozilla Application Suite URL: http://www.mozilla.org/projects/seamonkey @@ -67,7 +67,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ fileutils textutils /bin/sh %define _unpackaged_files_terminate_build 0 -%define releasedate 2006072500 +%define releasedate 2006072800 %define progname seamonkey %define prefix /usr %define progdir %_libdir/%{progname} @@ -754,6 +754,8 @@ %dir %{progdir}/components/myspell %changelog -n seamonkey +* Sat Jul 29 2006 - stark(a)suse.de +- update to 1.0.4 fixing a major regression in 1.0.3 (#195402) * Thu Jul 27 2006 - stark(a)suse.de - update to security release 1.0.3 (#195043) - fix overwrite confirmation for GTK filesaver (#179531) ++++++ seamonkey-source-1.0.3.tar.bz2 -> seamonkey-source-1.0.4.tar.bz2 ++++++ seamonkey/seamonkey-source-1.0.3.tar.bz2 seamonkey/seamonkey-source-1.0.4.tar.bz2 differ: char 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 scsi
by root＠suse.de 30 Jul '06

30 Jul '06

Hello community, here is the log from the commit of package scsi checked in at Sun Jul 30 11:59:34 CEST 2006. -------- --- scsi/scsi.changes 2006-06-02 15:53:03.000000000 +0200 +++ scsi/scsi.changes 2006-07-29 14:19:48.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Jul 29 14:02:23 CEST 2006 - garloff(a)suse.de + +- rescan-scsi-bus.sh: + * -L MAXLUN parameter to scan beyond SPI LUNs + * cope with missing generic symlink +- Update to lsscsi-0.18: + * cope with dropping of 'generic' symlink post lk 2.6.16 + * anticipate the future removal of 'tape' symlink +- Update to sg3_utils-1.22: + * cope with dropping 'generic' and 'tape' symlinks in sysfs + * more consistent use of sysfs + * New utils: sg_vpd, sg_rdac + * sg_utils.8 man page +- Update to sdparm-0.99 + +------------------------------------------------------------------- Old: ---- lsscsi-0.17.tgz sdparm-0.97.tgz sg3_utils-1.19.tgz sg3_utils-rdac-support.patch New: ---- lsscsi-0.18.tgz sdparm-0.99.tgz sg3_utils-1.22.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scsi.spec ++++++ --- /var/tmp/diff_new_pack.us6GgZ/_old 2006-07-30 11:59:26.000000000 +0200 +++ /var/tmp/diff_new_pack.us6GgZ/_new 2006-07-30 11:59:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package scsi (Version 1.7_2.36_1.19_0.17_0.97) +# spec file for package scsi (Version 1.7_2.36_1.22_0.18_0.99) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,22 +14,21 @@ BuildRequires: sysfsutils tk %define sinfover 1.7 %define sdevver 2.36 -%define sgutver 1.19 -%define lsscsiver 0.17 -%define sdparmver 0.97 +%define sgutver 1.22 +%define lsscsiver 0.18 +%define sdparmver 0.99 License: GPL Group: Hardware/Other Provides: scsiinfo sg_utils scsidev Autoreqprov: on -Version: 1.7_2.36_1.19_0.17_0.97 -Release: 12 +Version: 1.7_2.36_1.22_0.18_0.99 +Release: 1 Summary: SCSI Tools (Text Mode) Source: scsiinfo-%{sinfover}.tar.gz Patch: scsiinfo-%{sinfover}.diff Patch1: scsiinfo-%{sinfover}-scsifmt.diff Source2: http://www.garloff.de/kurt/linux/scsidev/scsidev-%{sdevver}.tar.gz Patch2: scsidev-%{sdevver}.diff -Patch3: sg3_utils-rdac-support.patch Source5: sysconfig.scsidev Source3: http://www.garloff.de/kurt/linux/rescan-scsi-bus.sh Source4: http://www.torque.net/sg/p/sg3_utils-%{sgutver}.tgz @@ -106,25 +105,30 @@ %patch1 -p1 cd ../scsidev-%{sdevver} %patch2 -cd ../sg3_utils-%{sgutver} -%patch3 -p1 +#cd ../sg3_utils-%{sgutver} %build +# scsiinfo cd ../scsiinfo-%{sinfover} make clean make CFLAGS="$RPM_OPT_FLAGS -Wall -Wno-sign-compare -D_GNU_SOURCE" +# scsidev cd ../scsidev-%{sdevver} autoreconf CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --prefix=/usr --with-infodir=%{_infodir} --with-mandir=%{_mandir} make +# sg3_utils cd ../sg3_utils-%{sgutver} make CFLAGS="$RPM_OPT_FLAGS -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" PREFIX=/usr LIBDIR=%{_libdir} mv README README.sg +# NOTE: COuld compile some files from examples/ as well +# lsscsi cd ../lsscsi-%{lsscsiver} CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --mandir=%{_mandir} make mv README README.lsscsi mv ChangeLog ChangeLog.lsscsi +# sdparm cd ../sdparm-%{sdparmver} autoreconf CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --prefix=/usr --infodir=%{_infodir} --mandir=%{_mandir} @@ -141,6 +145,7 @@ make install DESTDIR=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/init.d/boot.d install -m 640 boot.scsidev $RPM_BUILD_ROOT/etc/init.d/boot.scsidev +# rescan-scsi-bus.sh install -d $RPM_BUILD_ROOT/bin install -m 755 $RPM_SOURCE_DIR/rescan-scsi-bus.sh $RPM_BUILD_ROOT/bin # sg3_utils @@ -148,6 +153,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTDIR=$RPM_BUILD_ROOT%{_bindir} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} LIBDIR=$RPM_BUILD_ROOT%{_libdir} \ PREFIX=/usr +# NOTE: Could install some files from the examples dir as well # lsscsi cd ../lsscsi-%{lsscsiver} make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir} INSTDIR=$RPM_BUILD_ROOT/%{_bindir} @@ -218,6 +224,7 @@ %attr(755,root,root) %{_bindir}/sg_ident %attr(755,root,root) %{_bindir}/sg_map26 %attr(755,root,root) %{_bindir}/sg_rdac +%attr(755,root,root) %{_bindir}/sg_vpd %attr(755,root,root) %{_libdir}/libsgutils.a %attr(755,root,root) %{_libdir}/libsgutils.la %attr(755,root,root) %{_libdir}/libsgutils.so* @@ -225,6 +232,8 @@ %attr(644,root,root) /usr/include/scsi/sg_cmds.h %attr(644,root,root) /usr/include/scsi/sg_lib.h %attr(644,root,root) /usr/include/scsi/sg_pt.h +%attr(644,root,root) /usr/include/scsi/sg_io_linux.h +%attr(644,root,root) /usr/include/scsi/sg_linux_inc.h %doc %{_mandir}/man8/sg_dd.8.gz %doc %{_mandir}/man8/sgp_dd.8.gz %doc %{_mandir}/man8/sgm_dd.8.gz @@ -263,6 +272,8 @@ %doc %{_mandir}/man8/sg_ident.8.gz %doc %{_mandir}/man8/sg_map26.8.gz %doc %{_mandir}/man8/sg_rdac.8.gz +%doc %{_mandir}/man8/sg_vpd.8.gz +%doc %{_mandir}/man8/sg3_utils.8.gz # lsscsi %attr(755,root,root) %{_bindir}/lsscsi %doc %{_mandir}/man8/lsscsi.8.gz @@ -310,6 +321,19 @@ %{insserv_cleanup} %changelog -n scsi +* Sat Jul 29 2006 - garloff(a)suse.de +- rescan-scsi-bus.sh: + * -L MAXLUN parameter to scan beyond SPI LUNs + * cope with missing generic symlink +- Update to lsscsi-0.18: + * cope with dropping of 'generic' symlink post lk 2.6.16 + * anticipate the future removal of 'tape' symlink +- Update to sg3_utils-1.22: + * cope with dropping 'generic' and 'tape' symlinks in sysfs + * more consistent use of sysfs + * New utils: sg_vpd, sg_rdac + * sg_utils.8 man page +- Update to sdparm-0.99 * Fri Jun 02 2006 - hare(a)suse.de - Fixup rescan-scsi-bus.sh to not rely on obsolete /proc/scsi/scsi interface (176120) ++++++ lsscsi-0.17.tgz -> lsscsi-0.18.tgz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/ChangeLog new/lsscsi-0.18/ChangeLog --- old/lsscsi-0.17/ChangeLog 2006-02-06 08:15:36.000000000 +0100 +++ new/lsscsi-0.18/ChangeLog 2006-03-25 04:35:43.000000000 +0100 @@ -1,4 +1,8 @@ +Version 0.18 2006/3/24 + - cope with dropping of 'generic' symlink post lk 2.6.16 + - anticipate the future removal of 'tape' symlink + Version 0.17 2006/2/6 - fix disappearance of block device names in lk 2.6.16-rc1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/Makefile.am new/lsscsi-0.18/Makefile.am --- old/lsscsi-0.17/Makefile.am 2005-10-18 10:21:16.000000000 +0200 +++ new/lsscsi-0.18/Makefile.am 2006-03-23 23:07:16.000000000 +0100 @@ -11,8 +11,8 @@ # INCLUDES = -I$(top_srcdir)/include -AM_CFLAGS = -Wall -W -# AM_CFLAGS = -Wall -W -pedantic -std=c99 +# AM_CFLAGS = -Wall -W +AM_CFLAGS = -Wall -W -pedantic -std=c99 lsscsi_SOURCES = lsscsi.c diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/Makefile.in new/lsscsi-0.18/Makefile.in --- old/lsscsi-0.17/Makefile.in 2006-02-06 07:52:29.000000000 +0100 +++ new/lsscsi-0.18/Makefile.in 2006-03-25 04:37:00.000000000 +0100 @@ -165,8 +165,9 @@ EXTRA_DIST = autogen.sh # INCLUDES = -I$(top_srcdir)/include -AM_CFLAGS = -Wall -W -# AM_CFLAGS = -Wall -W -pedantic -std=c99 + +# AM_CFLAGS = -Wall -W +AM_CFLAGS = -Wall -W -pedantic -std=c99 lsscsi_SOURCES = lsscsi.c all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/autom4te.cache/output.0 new/lsscsi-0.18/autom4te.cache/output.0 --- old/lsscsi-0.17/autom4te.cache/output.0 2006-01-14 05:20:48.000000000 +0100 +++ new/lsscsi-0.18/autom4te.cache/output.0 2006-03-01 22:15:06.000000000 +0100 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.59 for lsscsi 0.17. +@%:@ Generated by GNU Autoconf 2.59 for lsscsi 0.18. @%:@ @%:@ Report bugs to <dgilbert(a)interlog.com>. @%:@ @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='lsscsi' PACKAGE_TARNAME='lsscsi' -PACKAGE_VERSION='0.17' -PACKAGE_STRING='lsscsi 0.17' +PACKAGE_VERSION='0.18' +PACKAGE_STRING='lsscsi 0.18' PACKAGE_BUGREPORT='dgilbert(a)interlog.com' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LIB@&t@OBJS LTLIBOBJS' @@ -738,7 +738,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 lsscsi 0.17 to adapt to many kinds of systems. +\`configure' configures lsscsi 0.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -800,7 +800,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lsscsi 0.17:";; + short | recursive ) echo "Configuration of lsscsi 0.18:";; esac cat <<\_ACEOF @@ -917,7 +917,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -lsscsi configure 0.17 +lsscsi configure 0.18 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -931,7 +931,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lsscsi $as_me 0.17, which was +It was created by lsscsi $as_me 0.18, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1575,7 +1575,7 @@ # Define the identity of the package. PACKAGE='lsscsi' - VERSION='0.17' + VERSION='0.18' cat >>confdefs.h <<_ACEOF @@ -3269,7 +3269,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by lsscsi $as_me 0.17, which was +This file was extended by lsscsi $as_me 0.18, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3332,7 +3332,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -lsscsi config.status 0.17 +lsscsi config.status 0.18 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/autom4te.cache/output.1 new/lsscsi-0.18/autom4te.cache/output.1 --- old/lsscsi-0.17/autom4te.cache/output.1 2006-01-14 05:20:51.000000000 +0100 +++ new/lsscsi-0.18/autom4te.cache/output.1 2006-03-01 22:15:09.000000000 +0100 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.59 for lsscsi 0.17. +@%:@ Generated by GNU Autoconf 2.59 for lsscsi 0.18. @%:@ @%:@ Report bugs to <dgilbert(a)interlog.com>. @%:@ @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='lsscsi' PACKAGE_TARNAME='lsscsi' -PACKAGE_VERSION='0.17' -PACKAGE_STRING='lsscsi 0.17' +PACKAGE_VERSION='0.18' +PACKAGE_STRING='lsscsi 0.18' PACKAGE_BUGREPORT='dgilbert(a)interlog.com' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LIB@&t@OBJS LTLIBOBJS' @@ -738,7 +738,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 lsscsi 0.17 to adapt to many kinds of systems. +\`configure' configures lsscsi 0.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -800,7 +800,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lsscsi 0.17:";; + short | recursive ) echo "Configuration of lsscsi 0.18:";; esac cat <<\_ACEOF @@ -917,7 +917,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -lsscsi configure 0.17 +lsscsi configure 0.18 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -931,7 +931,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lsscsi $as_me 0.17, which was +It was created by lsscsi $as_me 0.18, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1575,7 +1575,7 @@ # Define the identity of the package. PACKAGE='lsscsi' - VERSION='0.17' + VERSION='0.18' cat >>confdefs.h <<_ACEOF @@ -3269,7 +3269,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by lsscsi $as_me 0.17, which was +This file was extended by lsscsi $as_me 0.18, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3332,7 +3332,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -lsscsi config.status 0.17 +lsscsi config.status 0.18 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/autom4te.cache/traces.0 new/lsscsi-0.18/autom4te.cache/traces.0 --- old/lsscsi-0.17/autom4te.cache/traces.0 2006-01-14 05:20:48.000000000 +0100 +++ new/lsscsi-0.18/autom4te.cache/traces.0 2006-03-01 22:15:06.000000000 +0100 @@ -484,7 +484,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) -m4trace:configure.ac:1: -1- AC_INIT([lsscsi], [0.17], [dgilbert(a)interlog.com]) +m4trace:configure.ac:1: -1- AC_INIT([lsscsi], [0.18], [dgilbert(a)interlog.com]) m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:1: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/autom4te.cache/traces.1 new/lsscsi-0.18/autom4te.cache/traces.1 --- old/lsscsi-0.17/autom4te.cache/traces.1 2006-01-14 05:20:51.000000000 +0100 +++ new/lsscsi-0.18/autom4te.cache/traces.1 2006-03-01 22:15:09.000000000 +0100 @@ -1,4 +1,4 @@ -m4trace:configure.ac:1: -1- AC_INIT([lsscsi], [0.17], [dgilbert(a)interlog.com]) +m4trace:configure.ac:1: -1- AC_INIT([lsscsi], [0.18], [dgilbert(a)interlog.com]) m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:1: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/configure new/lsscsi-0.18/configure --- old/lsscsi-0.17/configure 2006-01-14 05:20:51.000000000 +0100 +++ new/lsscsi-0.18/configure 2006-03-01 22:15:09.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for lsscsi 0.17. +# Generated by GNU Autoconf 2.59 for lsscsi 0.18. # # Report bugs to <dgilbert(a)interlog.com>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='lsscsi' PACKAGE_TARNAME='lsscsi' -PACKAGE_VERSION='0.17' -PACKAGE_STRING='lsscsi 0.17' +PACKAGE_VERSION='0.18' +PACKAGE_STRING='lsscsi 0.18' PACKAGE_BUGREPORT='dgilbert(a)interlog.com' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LIBOBJS LTLIBOBJS' @@ -738,7 +738,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 lsscsi 0.17 to adapt to many kinds of systems. +\`configure' configures lsscsi 0.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -800,7 +800,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lsscsi 0.17:";; + short | recursive ) echo "Configuration of lsscsi 0.18:";; esac cat <<\_ACEOF @@ -917,7 +917,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -lsscsi configure 0.17 +lsscsi configure 0.18 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -931,7 +931,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lsscsi $as_me 0.17, which was +It was created by lsscsi $as_me 0.18, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1575,7 +1575,7 @@ # Define the identity of the package. PACKAGE='lsscsi' - VERSION='0.17' + VERSION='0.18' cat >>confdefs.h <<_ACEOF @@ -3269,7 +3269,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by lsscsi $as_me 0.17, which was +This file was extended by lsscsi $as_me 0.18, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3332,7 +3332,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -lsscsi config.status 0.17 +lsscsi config.status 0.18 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/configure.ac new/lsscsi-0.18/configure.ac --- old/lsscsi-0.17/configure.ac 2006-01-14 05:17:17.000000000 +0100 +++ new/lsscsi-0.18/configure.ac 2006-03-01 22:13:55.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT(lsscsi, 0.17, dgilbert(a)interlog.com) +AC_INIT(lsscsi, 0.18, dgilbert(a)interlog.com) AM_INIT_AUTOMAKE AM_CONFIG_HEADER(config.h) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/debian/changelog new/lsscsi-0.18/debian/changelog --- old/lsscsi-0.17/debian/changelog 2006-02-06 07:59:31.000000000 +0100 +++ new/lsscsi-0.18/debian/changelog 2006-03-25 04:36:26.000000000 +0100 @@ -1,3 +1,9 @@ +lsscsi (0.18-0.1) unstable; urgency=low + + * new upstream version + + -- Douglas Gilbert <dgilbert(a)interlog.org> Fri, 24 Mar 2006 22:00:00 +1000 + lsscsi (0.17-0.1) unstable; urgency=low * new upstream version diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/debian/control new/lsscsi-0.18/debian/control --- old/lsscsi-0.17/debian/control 2005-12-30 09:06:57.000000000 +0100 +++ new/lsscsi-0.18/debian/control 2006-03-25 04:35:09.000000000 +0100 @@ -2,7 +2,7 @@ Section: admin Priority: optional Maintainer: Matt Taggart <taggart(a)debian.org> -Build-Depends: debhelper (>= 4.0.0), autoconf +Build-Depends: debhelper (>= 4.0.0), autotools-dev Standards-Version: 3.6.2.1 Package: lsscsi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/lsscsi.8 new/lsscsi-0.18/lsscsi.8 --- old/lsscsi-0.17/lsscsi.8 2005-12-30 14:28:02.000000000 +0100 +++ new/lsscsi-0.18/lsscsi.8 2006-03-23 16:51:30.000000000 +0100 @@ -1,4 +1,4 @@ -.TH lsscsi "8" "December 2005" "lsscsi-0.16" LSSCSI +.TH lsscsi "8" "March 2006" "lsscsi-0.18" LSSCSI .SH NAME lsscsi \- list SCSI devices (or hosts) and their attributes .SH SYNOPSIS @@ -9,7 +9,7 @@ .SH DESCRIPTION .\" Add any additional description here .PP -Uses information in sysfs (linux kernels 2.6.0 and later) to list +Uses information in sysfs (linux kernel series 2.6 and later) to list scsi devices (or hosts) currently attached to the system. Options can be used to control the amount and form of information provided for each device. @@ -45,14 +45,14 @@ .TP --generic | -g Output the scsi generic device file name. Note that if the sg driver -is a module it needs to be loaded otherwise '-' will appear +is a module it needs to be loaded otherwise '-' will appear. .TP --help | -h -Output the usage message and exit +Output the usage message and exit. .TP --hosts | -H List the SCSI hosts currently attached to the system. If this option is -not given then SCSI devices are listed +not given then SCSI devices are listed. .TP --kname | -k Use linux default algorithm for naming devices (e.g. block major 8, @@ -71,7 +71,7 @@ more output. .TP --version | -V -outputs version number information and exits +outputs version number information and exits. .PP Information for this command is derived from the the sysfs file system whose mount point is found by examining the contents of /proc/mounts . @@ -88,7 +88,7 @@ .SH "REPORTING BUGS" Report bugs to <dgilbert at interlog dot com>. .SH COPYRIGHT -Copyright \(co 2003-2005 Douglas Gilbert +Copyright \(co 2003-2006 Douglas Gilbert .br This software is distributed under the GPL version 2. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/lsscsi.c new/lsscsi-0.18/lsscsi.c --- old/lsscsi-0.17/lsscsi.c 2006-02-06 08:03:24.000000000 +0100 +++ new/lsscsi-0.18/lsscsi.c 2006-03-25 04:35:34.000000000 +0100 @@ -25,8 +25,12 @@ #include <time.h> #define NAME_LEN_MAX 260 +#define FT_OTHER 0 +#define FT_BLOCK 1 +#define FT_CHAR 2 -static const char * version_str = "0.17 2006/2/6"; + +static const char * version_str = "0.18 2006/3/24"; static char sysfsroot[NAME_LEN_MAX]; static const char * sysfs_name = "sysfs"; static const char * sysfs_test_dir = "/sys/class"; @@ -130,6 +134,16 @@ }; static struct dev_node_list* dev_node_listhead = NULL; +struct sg_item_t { + char name[NAME_LEN_MAX]; + int ft; +}; + +static struct sg_item_t non_sg; +static struct sg_item_t aa_sg; + + + static int cmp_hctl(const struct addr_hctl * le, const struct addr_hctl * ri) { if (le->h == ri->h) { @@ -181,6 +195,95 @@ "'- - - -' (all))\n"); } +static int non_sg_scandir_select(const struct dirent * s) +{ + int len; + + if (FT_OTHER != non_sg.ft) + return 0; + if (DT_LNK != s->d_type) + return 0; + if (0 == strncmp("scsi_changer", s->d_name, 12)) { + strncpy(non_sg.name, s->d_name, NAME_LEN_MAX); + non_sg.ft = FT_CHAR; + return 1; + } else if (0 == strncmp("block", s->d_name, 5)) { + strncpy(non_sg.name, s->d_name, NAME_LEN_MAX); + non_sg.ft = FT_BLOCK; + return 1; + } else if (0 == strcmp("tape", s->d_name)) { + strcpy(non_sg.name, s->d_name); + non_sg.ft = FT_CHAR; + return 1; + } else if (0 == strncmp("scsi_tape:st", s->d_name, 12)) { + len = strlen(s->d_name); + if (isdigit(s->d_name[len - 1])) { + /* want 'st<num>' symlink only */ + strcpy(non_sg.name, s->d_name); + non_sg.ft = FT_CHAR; + return 1; + } else + return 0; + } else if (0 == strncmp("onstream_tape:os", s->d_name, 16)) { + strcpy(non_sg.name, s->d_name); + non_sg.ft = FT_CHAR; + return 1; + } else + return 0; +} + +static int non_sg_scan(const char * dir_name, + const struct lsscsi_opt_coll * opts) +{ + char name[NAME_LEN_MAX]; + struct dirent ** namelist; + int num, k; + + non_sg.ft = FT_OTHER; + num = scandir(dir_name, &namelist, non_sg_scandir_select, NULL); + if (num < 0) { + if (opts->verbose > 0) { + snprintf(name, NAME_LEN_MAX, "scandir: %s", dir_name); + perror(name); + } + return -1; + } + for (k = 0; k < num; ++k) + free(namelist[k]); + free(namelist); + return num; +} + + +static int sg_scandir_select(const struct dirent * s) +{ + if (FT_OTHER != aa_sg.ft) + return 0; + if (DT_LNK != s->d_type) + return 0; + if (0 == strncmp("scsi_generic", s->d_name, 12)) { + strncpy(aa_sg.name, s->d_name, NAME_LEN_MAX); + aa_sg.ft = FT_CHAR; + return 1; + } else + return 0; +} + +static int sg_scan(const char * dir_name) +{ + struct dirent ** namelist; + int num, k; + + aa_sg.ft = FT_OTHER; + num = scandir(dir_name, &namelist, sg_scandir_select, NULL); + if (num < 0) + return -1; + for (k = 0; k < num; ++k) + free(namelist[k]); + free(namelist); + return num; +} + /* Return 1 if found (in /proc/mounts or /sys/class directory exists), else 0 if problems */ @@ -243,6 +346,37 @@ return 0; } +/* Return 1 if directory, else 0 */ +static int if_directory_ch2generic(const char * dir_name) +{ + char buff[NAME_LEN_MAX]; + struct stat a_stat; + const char * old_name = "generic"; + + strcpy(buff, dir_name); + strcat(buff, "/"); + strcat(buff, old_name); + if ((stat(buff, &a_stat) >= 0) && S_ISDIR(a_stat.st_mode)) { + if (chdir(buff) < 0) + return 0; + return 1; + } + /* No "generic", so now look for "scsi_generic:sg<n>" */ + if (1 != sg_scan(dir_name)) + return 0; + strcpy(buff, dir_name); + strcat(buff, "/"); + strcat(buff, aa_sg.name); + if (stat(buff, &a_stat) < 0) + return 0; + if (S_ISDIR(a_stat.st_mode)) { + if (chdir(buff) < 0) + return 0; + return 1; + } + return 0; +} + /* Return 1 if found, else 0 if problems */ static int get_value(const char * dir_name, const char * base_name, char * value, int max_value_len) @@ -602,7 +736,7 @@ printf("ANSI SCSI revision: %02x\n", (scsi_level - 1) ? scsi_level - 1 : 1); if (opts->generic) { - if (if_directory_chdir(buff, "generic")) { + if (if_directory_ch2generic(buff)) { char wd[NAME_LEN_MAX]; if (NULL == getcwd(wd, NAME_LEN_MAX)) @@ -628,65 +762,6 @@ printf(" dir: %s\n", buff); } -#define FT_OTHER 0 -#define FT_BLOCK 1 -#define FT_CHAR 2 - -struct non_sg_item { - char name[NAME_LEN_MAX]; - int ft; -}; - -static struct non_sg_item non_sg; - -static int non_sg_scandir_select(const struct dirent * s) -{ - if (FT_OTHER != non_sg.ft) - return 0; - if (DT_LNK != s->d_type) - return 0; - if (0 == strncmp("scsi_changer", s->d_name, 12)) { - strncpy(non_sg.name, s->d_name, NAME_LEN_MAX); - non_sg.ft = FT_CHAR; - return 1; - } else if (0 == strncmp("block", s->d_name, 5)) { - strncpy(non_sg.name, s->d_name, NAME_LEN_MAX); - non_sg.ft = FT_BLOCK; - return 1; - } else if (0 == strcmp("tape", s->d_name)) { - strcpy(non_sg.name, s->d_name); - non_sg.ft = FT_CHAR; - return 1; - } else if (0 == strncmp("onstream_tape:os", s->d_name, 16)) { - strcpy(non_sg.name, s->d_name); - non_sg.ft = FT_CHAR; - return 1; - } else - return 0; -} - -static int non_sg_scan(const char * dir_name, - const struct lsscsi_opt_coll * opts) -{ - char name[NAME_LEN_MAX]; - struct dirent ** namelist; - int num, k; - - non_sg.ft = FT_OTHER; - num = scandir(dir_name, &namelist, non_sg_scandir_select, NULL); - if (num < 0) { - if (opts->verbose > 0) { - snprintf(name, NAME_LEN_MAX, "scandir: %s", dir_name); - perror(name); - } - return -1; - } - for (k = 0; k < num; ++k) - free(namelist[k]); - free(namelist); - return num; -} - static void one_sdev_entry(const char * dir_name, const char * devname, const struct lsscsi_opt_coll * opts) { @@ -756,7 +831,7 @@ printf("- "); if (opts->generic) { - if (if_directory_chdir(buff, "generic")) { + if (if_directory_ch2generic(buff)) { char wd[NAME_LEN_MAX]; if (NULL == getcwd(wd, NAME_LEN_MAX)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lsscsi-0.17/lsscsi.spec new/lsscsi-0.18/lsscsi.spec --- old/lsscsi-0.17/lsscsi.spec 2006-02-06 08:15:46.000000000 +0100 +++ new/lsscsi-0.18/lsscsi.spec 2006-03-25 04:35:59.000000000 +0100 @@ -1,5 +1,5 @@ %define name lsscsi -%define version 0.17 +%define version 0.18 %define release 1 Summary: List SCSI devices (or hosts) and associated information @@ -55,6 +55,9 @@ %changelog +* Fri Mar 24 2006 - dgilbert at interlog dot com +- cope with dropping of 'generic' symlink post lk 2.6.16 + * lsscsi-0.18 * Mon Feb 06 2006 - dgilbert at interlog dot com - fix disappearance of block device names in lk 2.6.16-rc1 * lsscsi-0.17 ++++++ rescan-scsi-bus.sh ++++++ --- scsi/rescan-scsi-bus.sh 2006-06-02 14:41:21.000000000 +0200 +++ scsi/rescan-scsi-bus.sh 2006-07-29 14:32:58.000000000 +0200 @@ -3,7 +3,7 @@ # scsi add-single-device mechanism # (w) 1998-03-19 Kurt Garloff <kurt(a)garloff.de> (c) GNU GPL # (w) 2003-07-16 Kurt Garloff <garloff(a)suse.de> (c) GNU GPL -# $Id: rescan-scsi-bus.sh,v 1.19 2005/10/08 23:59:46 garloff Exp $ +# $Id: rescan-scsi-bus.sh,v 1.22 2006/07/24 11:26:04 garloff Exp $ setcolor () { @@ -120,8 +120,18 @@ # Find sg device with 2.6 sysfs support sgdevice26 () { - SGDEV=`readlink /sys/class/scsi_device/$host\:$channel\:$id\:$lun/device/generic` - SGDEV=`basename $SGDEV` + if test -e /sys/class/scsi_device/$host\:$channel\:$id\:$lun/device/generic; then + SGDEV=`readlink /sys/class/scsi_device/$host\:$channel\:$id\:$lun/device/generic` + SGDEV=`basename $SGDEV` + else + for SGDEV in /sys/class/scsi_generic/sg*; do + DEV=`readlink $SGDEV/device` + if test "${DEV##*/}" = "$host:$channel:$id:$lun"; then + SGDEV=`basename $SGDEV`; return + fi + done + SGDEV="" + fi } # Find sg device with 2.4 report-devs extensions @@ -205,25 +215,37 @@ testexist if test ! -z "$remove" -a ! -z "$SCSISTR"; then # Device exists: Test whether it's still online + # (testonline returns 1 if it's gone or has changed) testonline if test $? = 1 -o ! -z "$forceremove"; then echo -en "\r\e[A\e[A\e[A${red}REM: " echo "$SCSISTR" | head -n1 echo -e "${norm}\e[B\e[B" - echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/delete - echo "$channel $id $lun" >/sys/class/scsi_host/host${host}/scan - fi + if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then + echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/delete + # Try readding, should fail if device is gone + echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan + else + echo "scsi remove-single-device $devnr" > /proc/scsi/scsi + # Try readding, should fail if device is gone + echo "scsi add-single-device $devnr" > /proc/scsi/scsi + fi + fi printf "\r\x1b[A\x1b[A\x1b[A${yellow}OLD: $norm" testexist - if test -z "$SCSISTR"; then - printf "\r${red}DEL: $norm\r\n\n\n\n" - let rmvd+=1; + if test -z "$SCSISTR"; then + printf "\r${red}DEL: $norm\r\n\n\n\n" + let rmvd+=1; fi fi if test -z "$SCSISTR"; then # Device does not exist, try to add printf "\r${green}NEW: $norm" - echo "$channel $id $lun" >/sys/class/scsi_host/host${host}/scan + if test -e /sys/class/scsi_host/host${host}/scan; then + echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null + else + echo "scsi add-single-device $devnr" > /proc/scsi/scsi + fi testexist if test -z "$SCSISTR"; then # Device not present @@ -245,12 +267,13 @@ if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then echo "Usage: rescan-scsi-bus.sh [options] [host [host ...]]" echo "Options:" - echo " -l activates scanning for LUNs 0-7 [default: 0]" - echo " -w scan for target device IDs 0 .. 15 [default: 0-7]" - echo " -c enables scanning of channels 0 1 [default: 0]" - echo " -r enables removing of devices [default: disabled]" + echo " -l activates scanning for LUNs 0-7 [default: 0]" + echo " -L NUM activates scanning for LUNs 0--NUM [default: 0]" + echo " -w scan for target device IDs 0 .. 15 [default: 0-7]" + echo " -c enables scanning of channels 0 1 [default: 0]" + echo " -r enables removing of devices [default: disabled]" echo "--remove: same as -r" - echo "--forceremove: Remove and readd every device (dangerous)" + echo "--forceremove: Remove and readd every device (DANGEROUS)" echo "--nooptscan: don't stop looking for LUNs is 0 is not found" echo "--color: use coloured prefixes OLD/NEW/DEL" echo "--hosts=LIST: Scan only host(s) in LIST" @@ -290,6 +313,9 @@ exit 1 fi +# Make sure sg is there +modprobe sg >/dev/null 2>&1 + # defaults unsetcolor lunsearch="0" @@ -310,6 +336,7 @@ opt=${opt#-} case "$opt" in l) lunsearch=`seq 0 7` ;; + L) lunsearch=`seq 0 $2`; shift ;; w) idsearch=`seq 0 15` ;; c) channelsearch="0 1" ;; r) remove=1 ;; @@ -338,6 +365,9 @@ declare -i found=0 declare -i rmvd=0 for host in $hosts; do + # YOU MAY NEED TO UNCOMMENT THESE TO ALLOW FOR A RESCAN + #test -e /sys/class/fc_host/host$host/issue_lip && echo 1 > /sys/class/fc_host/host$host/issue_lip 2> /dev/null; + #echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null; dosearch; done echo "$found new device(s) found. " ++++++ sdparm-0.97.tgz -> sdparm-0.99.tgz ++++++ ++++ 5686 lines of diff (skipped) ++++++ sg3_utils-1.19.tgz -> sg3_utils-1.22.tgz ++++++ ++++ 25296 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 perl-Bootloader
by root＠suse.de 30 Jul '06

30 Jul '06

Hello community, here is the log from the commit of package perl-Bootloader checked in at Sun Jul 30 11:59:21 CEST 2006. -------- --- perl-Bootloader/perl-Bootloader.changes 2006-07-06 20:08:56.000000000 +0200 +++ perl-Bootloader/perl-Bootloader.changes 2006-07-28 17:46:28.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Jul 28 17:40:51 CEST 2006 - jplack(a)suse.de + +- Tools.pm@Udev2Dev : CCISS driver maps slashes to bangs so we + have to reverse that, suppress ignorable warnings from udevinfo + (#189348) + +------------------------------------------------------------------- +Tue Jul 25 14:17:40 CEST 2006 - jplack(a)suse.de + +- do not use device symlink in sysfs as a criteria for device + detection which breaks on SmartArray controllers (#189348) +- bump version to 0.2.27 + +------------------------------------------------------------------- +Tue Jul 11 18:45:33 CEST 2006 - jplack(a)suse.de + +- move Partition2Disk function to Grub.pm as the only place of + usage and the only place to make it really work (#189348). + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.2.26.tar.bz2 New: ---- perl-Bootloader-0.2.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.1pzCcQ/_old 2006-07-30 11:59:02.000000000 +0200 +++ /var/tmp/diff_new_pack.1pzCcQ/_new 2006-07-30 11:59:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.2.26) +# spec file for package perl-Bootloader (Version 0.2.27) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Bootloader -Version: 0.2.26 +Version: 0.2.27 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -56,6 +56,17 @@ /sbin/update-bootloader %changelog -n perl-Bootloader +* Fri Jul 28 2006 - jplack(a)suse.de +- Tools.pm@Udev2Dev : CCISS driver maps slashes to bangs so we + have to reverse that, suppress ignorable warnings from udevinfo + (#189348) +* Tue Jul 25 2006 - jplack(a)suse.de +- do not use device symlink in sysfs as a criteria for device + detection which breaks on SmartArray controllers (#189348) +- bump version to 0.2.27 +* Tue Jul 11 2006 - jplack(a)suse.de +- move Partition2Disk function to Grub.pm as the only place of + usage and the only place to make it really work (#189348). * Thu Jul 06 2006 - jplack(a)suse.de - do not replace section names of new sections by default section name (#190529) ++++++ perl-Bootloader-0.2.26.tar.bz2 -> perl-Bootloader-0.2.27.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.2.26/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.2.27/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.2.26/lib/Bootloader/Core/GRUB.pm 2006-06-30 16:02:18.000000000 +0200 +++ new/perl-Bootloader-0.2.27/lib/Bootloader/Core/GRUB.pm 2006-07-28 17:46:28.000000000 +0200 @@ -44,6 +44,8 @@ C<< $line = Bootloader::Core::GRUB->CreateChainloaderLine (\%sectinfo, $grub_root); >> +C<< $disk = Bootloader::Core::GRUB->Partition2Disk ($partition); >> + C<< $sectin_info_ref = Bootloader::Core::GRUB->Section2Info (\@section_lines); >> C<< $lines_ref = Bootloader::Core::GRUB->Info2Section (\%section_info); >> @@ -139,13 +141,11 @@ my $self = shift; my $dev = shift; - if ($dev eq "") - { + unless ($dev) { $self->l_debug ("GRUB::GrubDev2UnixDev: Empty device to translate"); return $dev; } - if (defined ($dev) && $dev ne "" && $dev !~ /^$.*$$/) - { + if ($dev !~ /^$.*$$/) { $self->l_debug ("GRUB::GrubDev2UnixDev: Not translating device $dev"); return $dev; } @@ -162,10 +162,10 @@ } while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) { - if ($fw eq "($dev)") - { + if ($dev eq $fw) { $dev = $unix; } + elsif } if (defined ($partition)) { @@ -179,8 +179,7 @@ } } } - my $md_dev = $self->Member2MD ($dev); - $dev = $md_dev if (defined ($md_dev)); + $dev = $self->Member2MD ($dev); $self->l_debug ("GRUB::GrubDev2UnixDev: Translated GRUB->UNIX: $original to $dev"); return $dev; } @@ -214,7 +213,7 @@ $dev = $members[0] || $dev; } # check for symbolic links as they are used for dev-by-id and such - if ( -l "$dev") { + if ( -l $dev) { $dev = sprintf("%s/%s", $dev=~m:^(.+)/[^/]*$:, readlink($dev)); $dev = $self->CanonicalPath($dev); } @@ -226,13 +225,11 @@ $partition = $dev_ref->[2] - 1; } } - while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) - { - if ($unix eq $dev) - { - $dev = substr ($fw, 1, length ($fw) - 2); - } + + if ( exists $self->{"device_map"}->{$dev} ) { + $dev = $self->{"device_map"}->{$dev}; } + $dev = defined ($partition) ? "($dev,$partition)" : "($dev)"; @@ -423,7 +420,7 @@ my %devmap = (); foreach my $dm_entry (@device_map) { - if ($dm_entry =~ /^[ \t]*([^ \t#]+)[ \t]+([^ \t]+)[ \t]*$/) + if ($dm_entry =~ /^\s*($[^\s#]+$)\s+(\S+)\s*$/) { $devmap{$2} = $1; } @@ -568,7 +565,7 @@ my @device_map = (); while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) { - my $line = "$fw\t$unix"; + my $line = "($fw)\t$unix"; push @device_map, $line; } @@ -791,7 +788,7 @@ { $ret{$key} = $self->GrubPath2UnixPath ($val, $grub_root); } - elsif ($key eq "chainloader" || $key eq "initrd") + elsif ($key eq "chainloader") { if ($val =~ /^(.*)\+(\d+)/) { @@ -926,6 +923,35 @@ } } +=item +C<< $disk = Bootloader::Core::Grub->Partition2Disk ($partition); >> + +Gets the disk a partition resides on. As argument, it takes the partition +device node (eg. C<'/dev/hda3'>), returns the device node of the disk +holding the partition (eg. C</dev/hda>), or undef if checking failed. + +=cut + +# string Partition2Disk (string partition) +sub Partition2Disk { + my $self = shift; + my $partition = shift; + + foreach my $dev_ref (@{$self->{"partitions"}}) + { + if ($dev_ref->[0] eq $partition) + { + return $dev_ref->[1]; + } + } + + # FIXME: + # check in device mapping as a fallback + + return $partition; +} + + sub Section2XenInfo { my $self = shift; my @lines = @{+shift}; @@ -1062,6 +1088,8 @@ if (exists ($sectinfo{"xen"})) { + # FIXME: looks like the wrong call to me: XenInfo2Section sounds more + # appropriate or not calling it @lines = @{$self->Section2XenInfo (\@lines)}; if (exists($sectinfo{"append"}) and diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.2.26/lib/Bootloader/Core.pm new/perl-Bootloader-0.2.27/lib/Bootloader/Core.pm --- old/perl-Bootloader-0.2.26/lib/Bootloader/Core.pm 2006-07-06 20:08:56.000000000 +0200 +++ new/perl-Bootloader-0.2.27/lib/Bootloader/Core.pm 2006-07-11 18:51:45.000000000 +0200 @@ -28,8 +28,6 @@ C<< ($device, $path) = Bootloader::Core->SplitDevPath ($path); >> -C<< $disk = Bootloader::Core->Partition2Disk ($partition); >> - C<< $quoted = Bootloader::Core->Quote ($text, $when); >> C<< $unquoted = Bootloader::Core->Unquote ($text); >> @@ -376,30 +374,6 @@ } =item -C<< $disk = Bootloader::Core->Partition2Disk ($partition); >> - -Gets the disk a partition resides on. As argument, it takes the partition -device node (eg. C<'/dev/hda3'>), returns the device node of the disk -holding the partition (eg. C</dev/hda>), or undef if checking failed. - -=cut - -# string Partition2Disk (string partition) -sub Partition2Disk { - my $self = shift; - my $partition = shift; - - foreach my $dev_ref (@{$self->{"partitions"}}) - { - if ($dev_ref->[0] eq $partition) - { - return $dev_ref->[1]; - } - } - return $partition; -} - -=item C<< $quoted = Bootloader::Core->Quote ($text, $when); >> Puts a text to quotes. As arguments takes the text (string) and information diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.2.26/lib/Bootloader/Tools.pm new/perl-Bootloader-0.2.27/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.2.26/lib/Bootloader/Tools.pm 2006-07-06 20:08:56.000000000 +0200 +++ new/perl-Bootloader-0.2.27/lib/Bootloader/Tools.pm 2006-07-28 17:46:28.000000000 +0200 @@ -157,10 +157,14 @@ sub Udev2Dev { my $udev = shift; my $cmd = "udevinfo -q name -p /block/$udev"; - my $dev = qx{ $cmd }; + my $dev = qx{ $cmd 2>/dev/null }; chomp ($dev); - return $dev ? "/dev/$dev" : "/dev/$udev"; + $dev = $dev ? "/dev/$dev" : "/dev/$udev"; + # CCISS maps slashes to bangs so we have to reverse that. + $dev =~ s:!:/:g; + + return $dev; } =item @@ -178,7 +182,7 @@ my $sb="/sys/block"; opendir(BLOCK_DEVICES, "$sb") || die ("Failed to open dir $sb"); my @disks = grep { - !m/^\./ and -l "$sb/$_/device" and -r "$sb/$_/range" and qx{ cat $sb/$_/range } > 1 + !m/^\./ and -r "$sb/$_/range" and qx{ cat $sb/$_/range } > 1 } readdir(BLOCK_DEVICES); closedir BLOCK_DEVICES; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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