October 2006 - openSUSE Commits - openSUSE Mailing Lists

commit heartbeat
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package heartbeat checked in at Mon Oct 30 22:32:44 CET 2006. -------- --- heartbeat/heartbeat.changes 2006-10-05 22:29:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/heartbeat/heartbeat.changes 2006-10-30 20:01:03.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Oct 30 19:59:53 CET 2006 - lmb(a)suse.de + +- Merge with upstream (dev tree, 94243820b011). +- resource_stickiness attribute on groups accepted not all possible + values (188542). +- Build fixes. +- Populate GUI package. +- Add support for role-based and weak collocation. +- Fix dependency handling between clones and primitives. +- CIB: Corrupted config file prevents heartbeat restart (OSDL #1385). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ heartbeat.spec ++++++ ++++ 687 lines (skipped) ++++ between heartbeat/heartbeat.spec ++++ and /mounts/work_src_done/STABLE/heartbeat/heartbeat.spec ++++++ heartbeat-dev.tar.bz2 ++++++ ++++ 36856 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 avahi
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package avahi checked in at Mon Oct 30 18:14:07 CET 2006. -------- --- avahi/avahi.changes 2006-10-30 13:51:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/avahi/avahi.changes 2006-10-15 21:37:02.000000000 +0200 @@ -2,6 +1,0 @@ -Mon Oct 30 13:51:56 CET 2006 - sbrabec(a)suse.cz - -- Check the sender ID of netlink packets before using them - (#216219). - -------------------------------------------------------------------- Old: ---- avahi-0.6.11-security.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ avahi.spec ++++++ --- /var/tmp/diff_new_pack.tipSng/_old 2006-10-30 18:13:59.000000000 +0100 +++ /var/tmp/diff_new_pack.tipSng/_new 2006-10-30 18:13:59.000000000 +0100 @@ -18,14 +18,13 @@ BuildRequires: python-gtk qt-devel %endif Version: 0.6.14 -Release: 17 +Release: 18 URL: http://www.avahi.org/ Group: System/Daemons License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: D-BUS Service for Zeroconf and Bonjour Source: %{name}-%{version}.tar.bz2 Patch: avahi-gacdir.patch -Patch1: avahi-0.6.11-security.patch Requires: dbus-1 python python-gdbm python-gtk Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -329,7 +328,6 @@ %prep %setup %patch -%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -491,9 +489,6 @@ %{_libdir}/pkgconfig/avahi-qt4.pc %changelog -n avahi -* Mon Oct 30 2006 - sbrabec(a)suse.cz -- Check the sender ID of netlink packets before using them - (#216219). * Sun Oct 15 2006 - danw(a)suse.de - Remove dead patches * Mon Oct 09 2006 - sbrabec(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-pkg-bindings
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Mon Oct 30 18:06:14 CET 2006. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-10-20 17:06:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-10-30 14:55:37.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Oct 30 14:36:38 CET 2006 - lslezak(a)suse.cz + +- return OPTIONALURLS and EXTRAURLS properties of a Product + resolvable (#213031) +- ResolvableProperties() supports resolvable type `language +- 2.13.101 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.13.100.tar.bz2 New: ---- yast2-pkg-bindings-2.13.101.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.hAw3lI/_old 2006-10-30 18:05:56.000000000 +0100 +++ /var/tmp/diff_new_pack.hAw3lI/_new 2006-10-30 18:05:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.13.100) +# spec file for package yast2-pkg-bindings (Version 2.13.101) # # 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-pkg-bindings -Version: 2.13.100 +Version: 2.13.101 Release: 1 -License: Other License(s), see package +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.13.100.tar.bz2 +Source0: yast2-pkg-bindings-2.13.101.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 2.4.0 @@ -40,7 +40,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.13.100 +%setup -n yast2-pkg-bindings-2.13.101 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,11 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog -n yast2-pkg-bindings +* Mon Oct 30 2006 - lslezak(a)suse.cz +- return OPTIONALURLS and EXTRAURLS properties of a Product + resolvable (#213031) +- ResolvableProperties() supports resolvable type `language +- 2.13.101 * Fri Oct 20 2006 - lslezak(a)suse.cz - added missing YCP callback evaluation (#213628) - DoneProvide callback - pass file name argument, ++++++ yast2-pkg-bindings-2.13.100.tar.bz2 -> yast2-pkg-bindings-2.13.101.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.100/VERSION new/yast2-pkg-bindings-2.13.101/VERSION --- old/yast2-pkg-bindings-2.13.100/VERSION 2006-10-20 16:46:51.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.101/VERSION 2006-10-30 14:46:46.000000000 +0100 @@ -1 +1 @@ -2.13.100 +2.13.101 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.100/configure new/yast2-pkg-bindings-2.13.101/configure --- old/yast2-pkg-bindings-2.13.100/configure 2006-10-20 17:05:54.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.101/configure 2006-10-30 14:47:03.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.13.100. +# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.13.101. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.13.100' -PACKAGE_STRING='yast2-pkg-bindings 2.13.100' +PACKAGE_VERSION='2.13.101' +PACKAGE_STRING='yast2-pkg-bindings 2.13.101' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1428,7 +1428,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-pkg-bindings 2.13.100 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.13.101 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1499,7 +1499,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.100:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.101:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.13.100 +yast2-pkg-bindings configure 2.13.101 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1621,7 +1621,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-pkg-bindings $as_me 2.13.100, which was +It was created by yast2-pkg-bindings $as_me 2.13.101, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2422,7 +2422,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.13.100' + VERSION='2.13.101' cat >>confdefs.h <<_ACEOF @@ -2649,7 +2649,7 @@ -VERSION="2.13.100" +VERSION="2.13.101" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -21609,7 +21609,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.13.100, which was +This file was extended by yast2-pkg-bindings $as_me 2.13.101, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21662,7 +21662,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.13.100 +yast2-pkg-bindings config.status 2.13.101 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.100/configure.in new/yast2-pkg-bindings-2.13.101/configure.in --- old/yast2-pkg-bindings-2.13.100/configure.in 2006-10-20 17:05:40.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.101/configure.in 2006-10-30 14:46:49.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.13.100, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.13.101, http://bugs.opensuse.org/, yast2-pkg-bindings) 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.100" +VERSION="2.13.101" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.100/src/Resolvable.cc new/yast2-pkg-bindings-2.13.101/src/Resolvable.cc --- old/yast2-pkg-bindings-2.13.100/src/Resolvable.cc 2006-10-12 11:06:45.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.101/src/Resolvable.cc 2006-10-30 13:17:18.000000000 +0100 @@ -37,6 +37,7 @@ #include <zypp/Product.h> #include <zypp/Patch.h> #include <zypp/Pattern.h> +#include <zypp/Language.h> #include <zypp/base/PtrTypes.h> #include <zypp/Dep.h> #include <zypp/CapSet.h> @@ -297,7 +298,7 @@ return list of resolvables of selected kind with required name @param name name of the resolvable, if empty returns all resolvables of the kind - @param kind_r kind of resolvable, can be `product, `patch, `package, `selection or `pattern + @param kind_r kind of resolvable, can be `product, `patch, `package, `selection, `pattern or `language @param version version of the resolvable, if empty all versions are returned @return list<map<string,any>> list of $[ "name":string, "version":string, "arch":string, "source":integer, "status":symbol ] maps @@ -310,6 +311,13 @@ return ResolvablePropertiesEx (name, kind_r, version, false); } +/* + @builtin ResolvableDependencies + @description + return list of resolvables with dependencies + + @see ResolvableProperties for more information +*/ YCPValue PkgModuleFunctions::ResolvableDependencies(const YCPString& name, const YCPSymbol& kind_r, const YCPString& version) { @@ -340,6 +348,9 @@ else if ( req_kind == "pattern" ) { kind = zypp::ResTraits<zypp::Pattern>::kind; } + else if ( req_kind == "language" ) { + kind = zypp::ResTraits<zypp::Language>::kind; + } else { y2error("Pkg::ResolvableProperties: unknown symbol: %s", req_kind.c_str()); @@ -433,6 +444,28 @@ flags->add(YCPString(*flag_it)); } info->add(YCPString("flags"), flags); + + std::list<zypp::Url> pextraUrls = product->extraUrls(); + if (pextraUrls.size() > 0) + { + YCPList extraUrls; + for (std::list<zypp::Url>::const_iterator it = pextraUrls.begin(); it != pextraUrls.end(); ++it) + { + extraUrls->add(YCPString(it->asString())); + } + info->add(YCPString("extra_urls"), extraUrls); + } + + std::list<zypp::Url> poptionalUrls = product->optionalUrls(); + if (poptionalUrls.size() > 0) + { + YCPList optionalUrls; + for (std::list<zypp::Url>::const_iterator it = poptionalUrls.begin(); it != poptionalUrls.end(); ++it) + { + optionalUrls->add(YCPString(it->asString())); + } + info->add(YCPString("optional_urls"), optionalUrls); + } } // pattern specific info ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-country
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package yast2-country checked in at Mon Oct 30 18:04:23 CET 2006. -------- --- yast2-country/yast2-country.changes 2006-10-23 14:23:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2006-10-30 16:06:56.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Oct 30 13:49:06 CET 2006 - jsuchome(a)suse.cz + +- do not propose local time for 64bit Mac (#216059) +- removed unnecessary part of help text (#203701) +- check for language support when language was preselected (#215281) +- added i386 Mac keyboard layouts to database (#213294) +- 2.14.1 + +------------------------------------------------------------------- Old: ---- yast2-country-2.14.0.tar.bz2 New: ---- yast2-country-2.14.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.Z7W86m/_old 2006-10-30 18:03:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Z7W86m/_new 2006-10-30 18:03:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.14.0) +# spec file for package yast2-country (Version 2.14.1) # # 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-country -Version: 2.14.0 +Version: 2.14.1 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.14.0.tar.bz2 +Source0: yast2-country-2.14.1.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite Requires: yast2-trans-stats yast2-perl-bindings @@ -64,7 +64,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-country-2.14.0 +%setup -n yast2-country-2.14.1 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,12 @@ %{prefix}/share/applications/YaST2/timezone.desktop %changelog -n yast2-country +* Mon Oct 30 2006 - jsuchome(a)suse.cz +- do not propose local time for 64bit Mac (#216059) +- removed unnecessary part of help text (#203701) +- check for language support when language was preselected (#215281) +- added i386 Mac keyboard layouts to database (#213294) +- 2.14.1 * Mon Oct 23 2006 - jsuchome(a)suse.cz - added support for Macedonian and Indonesian - disable "Adapt checkboxes" when proposed keybaord layout/timezone is ++++++ yast2-country-2.14.0.tar.bz2 -> yast2-country-2.14.1.tar.bz2 ++++++ ++++ 3036 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.14.0/VERSION new/yast2-country-2.14.1/VERSION --- old/yast2-country-2.14.0/VERSION 2006-10-23 13:35:33.000000000 +0200 +++ new/yast2-country-2.14.1/VERSION 2006-10-30 15:54:43.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.14.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.14.0/keyboard/data/keyboard_raw.ycp new/yast2-country-2.14.1/keyboard/data/keyboard_raw.ycp --- old/yast2-country-2.14.0/keyboard/data/keyboard_raw.ycp 2006-09-06 17:19:58.000000000 +0200 +++ new/yast2-country-2.14.1/keyboard/data/keyboard_raw.ycp 2006-10-25 17:12:22.000000000 +0200 @@ -33,7 +33,10 @@ [ // keyboard layout _("English (US)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "us.map.gz" ]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "us.map.gz" ], + "macintosh" : $[ "ncurses": "mac-us.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "us.map.gz" ]], "x86_64" : $[ "pc104": $["ncurses": "us.map.gz" ]], "alpha" : $[ "pc104": $[ "ncurses": "us.map.gz" ]], @@ -52,7 +55,10 @@ [ // keyboard layout _("English (UK)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "uk.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "uk.map.gz"], + "macintosh" : $[ "ncurses": "mac-uk.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "uk.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "uk.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "uk.map.gz"]], @@ -71,7 +77,10 @@ [ // keyboard layout _("German"), - $[ "i386" : $[ "pc104": $[ "ncurses": "de-latin1-nodeadkeys.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "de-latin1-nodeadkeys.map.gz"], + "macintosh" : $[ "ncurses": "mac-de-latin1-nodeadkeys.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "de-latin1-nodeadkeys.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "de-latin1-nodeadkeys.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "de-latin1-nodeadkeys.map.gz"]], @@ -90,7 +99,10 @@ [ // keyboard layout _("German (with deadkeys)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "de-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "de-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-de-latin1.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "de-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "de-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "de-latin1.map.gz"]], @@ -109,7 +121,10 @@ [ // keyboard layout _("German (Switzerland)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "sg-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "sg-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-de_CH.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "sg-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "sg-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "de-latin1-nodeadkeys.map.gz"]], @@ -128,7 +143,10 @@ [ // keyboard layout _("French"), - $[ "i386" : $[ "pc104": $[ "ncurses": "fr-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "fr-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-fr-latin1.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "fr-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "fr-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "fr-latin1.map.gz"]], @@ -147,7 +165,10 @@ [ // keyboard layout _("French (Switzerland)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "fr_CH-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "fr_CH-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-fr_CH-latin1.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "fr_CH-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "fr_CH-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "fr_CH-latin1.map.gz"]], @@ -159,19 +180,25 @@ "type5_euro": $[ "ncurses": "sunt5-fr-latin1.map.gz" ], "pc104": $[ "ncurses": "fr_CH-latin1.map.gz"]], "ppc" : $[ "macintosh" : $[ "ncurses": "mac-fr_CH-latin1.map.gz" ], - "pc104" : $[ "ncurses": "de-latin1-nodeadkeys.map.gz"]] + "pc104" : $[ "ncurses": "fr_CH-latin1.map.gz"]] ] ], "french-ca": [ // keyboard layout _("French (Canada)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "cf.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "cf.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "cf.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "cf.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "cf.map.gz"]], "sparc64" : $[ "pc104": $[ "ncurses": "cf.map.gz"]], - "ppc" : $[ "pc104" : $[ "ncurses": "cf.map.gz"]], + "ppc" : $[ + "pc104" : $[ "ncurses": "cf.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], ] ], @@ -179,12 +206,18 @@ [ // keyboard layout _("Canadian (Multilingual)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "cn-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "cn-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "cn-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "cn-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "cn-latin1.map.gz"]], "sparc64" : $[ "pc104": $[ "ncurses": "cn-latin1.map.gz"]], - "ppc" : $[ "pc104" : $[ "ncurses": "cn-latin1.map.gz"]], + "ppc" : $[ + "pc104" : $[ "ncurses": "cn-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ] ] ], @@ -192,7 +225,10 @@ [ // keyboard layout _("Spanish"), - $[ "i386" : $[ "pc104": $[ "ncurses": "es.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "es.map.gz"], + "macintosh" : $[ "ncurses": "mac-es.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "es.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "es.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "es.map.gz"]], @@ -211,29 +247,44 @@ [ // keyboard layout _("Spanish (Latin America)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "la-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "la-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "la-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "la-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "la-latin1.map.gz"]], - "ppc" : $[ "pc104" : $[ "ncurses": "la-latin1.map.gz"]] + "ppc" : $[ + "pc104" : $[ "ncurses": "la-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ] ] ], "spanish-lat-cp850": [ // keyboard layout _("Spanish (CP 850)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "es-cp850.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "es-cp850.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "es-cp850.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "es-cp850.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "es-cp850.map.gz"]], - "ppc" : $[ "pc104" : $[ "ncurses": "es-cp850.map.gz"]] + "ppc" : $[ + "pc104" : $[ "ncurses": "es-cp850.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ] ] ], "italian": [ // keyboard layout _("Italian"), - $[ "i386" : $[ "pc104": $[ "ncurses": "it.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "it.map.gz"], + "macintosh" : $[ "ncurses": "mac-it.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "it.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "it.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "it.map.gz"]], @@ -252,7 +303,10 @@ [ // keyboard layout _("Portuguese"), - $[ "i386" : $[ "pc104": $[ "ncurses": "pt-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "pt-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-pt-latin1.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "pt-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "pt-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "pt-latin1.map.gz"]], @@ -271,7 +325,10 @@ [ // keyboard layout _("Portuguese (Brazil)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "br-abnt2.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "br-abnt2.map.gz"], + "macintosh" : $[ "ncurses": "mac-br-abnt2.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "br-abnt2.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "br-abnt2.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "br-abnt2.map.gz"]], @@ -282,7 +339,7 @@ "type5": $[ "ncurses": "sunkeymap.map.gz" ], "type5_euro": $[ "ncurses": "sunkeymap.map.gz" ], "pc104": $[ "ncurses": "br-abnt2.map.gz"]], - "ppc" : $[ "macintosh" : $[ "ncurses": "mac-us.map.gz"], + "ppc" : $[ "macintosh" : $[ "ncurses": "mac-br-abnt2.map.gz"], "pc104" : $[ "ncurses": "br-abnt2.map.gz"]] ] ], @@ -290,19 +347,28 @@ [ // keyboard layout _("Portuguese (Brazil -- US accents)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "us-acentos.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "us-acentos.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "us-acentos.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "us-acentos.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "us-acentos.map.gz"]], "sparc64" : $[ "pc104": $[ "ncurses": "us-acentos.map.gz"]], - "ppc" : $[ "pc104" : $[ "ncurses": "us-acentos.map.gz"]] + "ppc" : $[ + "pc104" : $[ "ncurses": "us-acentos.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ] ] ], "greek": [ // keyboard layout _("Greek"), - $[ "i386" : $[ "pc104": $[ "ncurses": "gr.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "gr.map.gz"], + "macintosh" : $[ "ncurses": "mac-gr.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "gr.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "gr.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "gr.map.gz"]], @@ -313,7 +379,7 @@ "type5": $[ "ncurses": "sunkeymap.map.gz" ], "type5_euro": $[ "ncurses": "sunkeymap.map.gz" ], "pc104": $[ "ncurses": "gr.map.gz"]], - "ppc" : $[ "macintosh" : $[ "ncurses": "mac-us.map.gz"], + "ppc" : $[ "macintosh" : $[ "ncurses": "mac-gr.map.gz"], "pc104" : $[ "ncurses": "gr.map.gz"]] ] ], @@ -321,7 +387,10 @@ [ // keyboard layout _("Dutch"), - $[ "i386" : $[ "pc104": $[ "ncurses": "nl.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "nl.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "nl.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "nl.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "nl.map.gz"]], @@ -340,7 +409,10 @@ [ // keyboard layout _("Danish"), - $[ "i386" : $[ "pc104": $[ "ncurses": "dk-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "dk-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-dk-latin1.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "dk-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "dk-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "dk-latin1.map.gz"]], @@ -359,7 +431,10 @@ [ // keyboard layout _("Norwegian"), - $[ "i386" : $[ "pc104": $[ "ncurses": "no-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "no-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-no-latin1.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "no-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "no-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "dk-latin1.map.gz"]], @@ -378,7 +453,10 @@ [ // keyboard layout _("Swedish"), - $[ "i386" : $[ "pc104": $[ "ncurses": "sv-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "sv-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-se.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "sv-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "sv-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "sv-latin1.map.gz"]], @@ -397,7 +475,10 @@ [ // keyboard layout _("Finnish"), - $[ "i386" : $[ "pc104": $[ "ncurses": "fi-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "fi-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-fi-latin1.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "fi-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "fi-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "fi-latin1.map.gz"]], @@ -416,8 +497,13 @@ [ // keyboard layout _("Czech"), - $[ "i386" : $[ "pc104": $[ "ncurses": "cz-us-qwertz.map.gz", - "compose" : "latin2" ]], + $[ "i386" : $[ + "pc104": $[ + "ncurses": "cz-us-qwertz.map.gz", + "compose" : "latin2" + ], + "macintosh" : $[ "ncurses": "mac-cz-us-qwertz.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "cz-us-qwertz.map.gz", "compose" : "latin2" ]], "x86_64" : $[ "pc104": $[ "ncurses": "cz-us-qwertz.map.gz", @@ -440,8 +526,13 @@ [ // keyboard layout _("Czech (qwerty)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "cz-lat2-us.map.gz", - "compose" : "latin2" ]], + $[ "i386" : $[ + "pc104": $[ + "ncurses": "cz-lat2-us.map.gz", + "compose" : "latin2" + ], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "cz-lat2-us.map.gz", "compose" : "latin2" ]], "x86_64" : $[ "pc104": $[ "ncurses": "cz-lat2-us.map.gz", @@ -464,8 +555,13 @@ [ // keyboard layout _("Slovak"), - $[ "i386" : $[ "pc104": $[ "ncurses": "sk-qwertz.map.gz", - "compose" : "latin2" ]], + $[ "i386" : $[ + "pc104": $[ + "ncurses": "sk-qwertz.map.gz", + "compose" : "latin2" + ], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "sk-qwertz.map.gz", "compose" : "latin2" ]], "x86_64" : $[ "pc104": $[ "ncurses": "sk-qwertz.map.gz", @@ -488,8 +584,13 @@ [ // keyboard layout _("Slovak (qwerty)"), - $[ "i386" : $[ "pc104": $[ "ncurses": "sk-qwerty.map.gz", - "compose" : "latin2" ]], + $[ "i386" : $[ + "pc104": $[ + "ncurses": "sk-qwerty.map.gz", + "compose" : "latin2" + ], + "macintosh" : $[ "ncurses": "mac-us.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "sk-qwerty.map.gz", "compose" : "latin2" ]], "x86_64" : $[ "pc104": $[ "ncurses": "sk-qwerty.map.gz", @@ -512,8 +613,13 @@ [ // keyboard layout _("Slovene"), - $[ "i386" : $[ "pc104": $[ "ncurses": "slovene.map.gz", - "compose" : "latin2" ]], + $[ "i386" : $[ + "pc104": $[ + "ncurses": "slovene.map.gz", + "compose" : "latin2" + ], + "macintosh" : $[ "ncurses": "mac-us.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "slovene.map.gz", "compose" : "latin2" ]], "x86_64" : $[ "pc104": $[ "ncurses": "slovene.map.gz", @@ -536,8 +642,13 @@ [ // keyboard layout _("Hungarian"), - $[ "i386" : $[ "pc104": $[ "ncurses": "hu.map.gz", - "compose" : "latin2"]], + $[ "i386" : $[ + "pc104": $[ + "ncurses": "hu.map.gz", + "compose" : "latin2" + ], + "macintosh" : $[ "ncurses": "mac-hu.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "hu.map.gz", "compose" : "latin2"]], "x86_64" : $[ "pc104": $[ "ncurses": "hu.map.gz", @@ -552,7 +663,7 @@ "type5_euro": $[ "ncurses": "sunkeymap.map.gz" ], "pc104": $[ "ncurses": "hu.map.gz", "compose" : "latin2"]], - "ppc" : $[ "macintosh" : $[ "ncurses": "mac-us.map.gz"], + "ppc" : $[ "macintosh" : $[ "ncurses": "mac-hu.map.gz"], "pc104" : $[ "ncurses": "hu.map.gz"]] ] ], @@ -560,8 +671,13 @@ [ // keyboard layout _("Polish"), - $[ "i386" : $[ "pc104": $[ "ncurses": "Pl02.map.gz", - "compose" : "latin2"]], + $[ "i386" : $[ + "pc104": $[ + "ncurses": "Pl02.map.gz", + "compose" : "latin2" + ], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "Pl02.map.gz", "compose" : "latin2"]], "x86_64" : $[ "pc104": $[ "ncurses": "Pl02.map.gz", @@ -584,7 +700,10 @@ [ // keyboard layout _("Russian"), - $[ "i386" : $[ "pc104": $[ "ncurses": "ru1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "ru1.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "ru1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "ru1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "ru1.map.gz"]], @@ -605,7 +724,8 @@ _("Serbian"), $[ "i386" : $[ - "pc104" : $[ "ncurses": "sr-cy.map.gz"] + "pc104" : $[ "ncurses": "sr-cy.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] ], "ia64" : $[ "pc104" : $[ "ncurses": "sr-cy.map.gz"] @@ -637,7 +757,10 @@ [ // keyboard layout _("Estonian"), - $[ "i386" : $[ "pc104": $[ "ncurses": "et.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "et.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "et.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "et.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "et.map.gz"]], @@ -658,7 +781,8 @@ _("Lithuanian"), $[ "i386" : $[ - "pc104" : $[ "ncurses": "lt.baltic.map.gz"] + "pc104" : $[ "ncurses": "lt.baltic.map.gz"], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] ], "ia64" : $[ "pc104" : $[ "ncurses": "lt.baltic.map.gz"] @@ -690,22 +814,23 @@ [ // keyboard layout _("Turkish"), - $[ "i386" : $[ "pc104": $[ "ncurses": "trq.map.gz" ]], - + $[ "i386" : $[ + "pc104": $[ "ncurses": "trq.map.gz" ], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "trq.map.gz" ]], "x86_64" : $[ "pc104": $[ "ncurses": "trq.map.gz" ]], "alpha" : $[ "pc104": $[ "ncurses": "trq.map.gz" ]], - "sparc" : $[ "type4": $[ "ncurses": "sunkeymap.map.gz" ], // please correct! - "type5": $[ "ncurses": "sunkeymap.map.gz" ], // please correct! - "type5_euro": $[ "ncurses": "sunkeymap.map.gz" ]], // please correct! - "sparc64" : $[ "type4": $[ "ncurses": "sunkeymap.map.gz" ], // please correct! - "type5": $[ "ncurses": "sunkeymap.map.gz" ], // please correct! + "sparc" : $[ "type4": $[ "ncurses": "sunkeymap.map.gz" ], + "type5": $[ "ncurses": "sunkeymap.map.gz" ], + "type5_euro": $[ "ncurses": "sunkeymap.map.gz" ]], + "sparc64" : $[ "type4": $[ "ncurses": "sunkeymap.map.gz" ], + "type5": $[ "ncurses": "sunkeymap.map.gz" ], "type5_euro": $[ "ncurses": "sunkeymap.map.gz" ], - // please correct! - "pc104": $[ "ncurses": "trq.map.gz" ]], // please check! + "pc104": $[ "ncurses": "trq.map.gz" ]], "ppc" : $[ "macintosh" : $[ "ncurses": "mac-us.map.gz" ], - "pc104" : $[ "ncurses": "trq.map.gz"]] // please check! + "pc104" : $[ "ncurses": "trq.map.gz"]] ] ], "croatian": [ @@ -716,7 +841,10 @@ "pc104" : $[ "ncurses" : "croat.map.gz", "compose" : "latin2" - ] + ], + "macintosh" : $[ + "ncurses" : "mac-us.map.gz" + ], ], "ia64" : $[ "pc104" : $[ @@ -776,7 +904,10 @@ [ // keyboard layout _("Japanese"), - $[ "i386" : $[ "pc104": $[ "ncurses": "jp106.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "jp106.map.gz"], + "macintosh" : $[ "ncurses": "mac-jp106.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "jp106.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "jp106.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "ru1.map.gz"]], @@ -787,7 +918,7 @@ "type5": $[ "ncurses": "sunkeymap.map.gz" ], "type5_euro": $[ "ncurses": "sunkeymap.map.gz" ], "pc104": $[ "ncurses": "jp106.map.gz"]], - "ppc" : $[ "macintosh" : $[ "ncurses": "mac-us.map.gz" ], + "ppc" : $[ "macintosh" : $[ "ncurses": "mac-jp106.map.gz" ], "pc104" : $[ "ncurses": "jp106.map.gz"]] ] ], @@ -795,7 +926,10 @@ [ // keyboard layout _("Belgian"), - $[ "i386" : $[ "pc104": $[ "ncurses": "be-latin1.map.gz"]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "be-latin1.map.gz"], + "macintosh" : $[ "ncurses": "mac-be.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "be-latin1.map.gz"]], "x86_64" : $[ "pc104": $[ "ncurses": "be-latin1.map.gz"]], "alpha" : $[ "pc104": $[ "ncurses": "be-latin1.map.gz"]], @@ -806,7 +940,7 @@ "type5": $[ "ncurses": "sunt5-be-latin1.map.gz" ], "type5_euro": $[ "ncurses": "sunt5-be-latin1.map.gz" ], "pc104": $[ "ncurses": "be-latin1.map.gz"]], - "ppc" : $[ "macintosh" : $[ "ncurses": "mac-us.map.gz" ], + "ppc" : $[ "macintosh" : $[ "ncurses": "mac-be.map.gz" ], "pc104" : $[ "ncurses": "be-latin1.map.gz"]] ] ], @@ -814,7 +948,10 @@ [ // keyboard layout _("Dvorak"), - $[ "i386" : $[ "pc104": $[ "ncurses": "dvorak.map.gz" ]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "dvorak.map.gz" ], + "macintosh" : $[ "ncurses": "mac-dvorak.map.gz" ] + ], "ia64" : $[ "pc104": $[ "ncurses": "dvorak.map.gz" ]], "x86_64" : $[ "pc104": $[ "ncurses": "dvorak.map.gz" ]], "alpha" : $[ "pc104": $[ "ncurses": "dvorak.map.gz" ]], @@ -833,7 +970,10 @@ [ // keyboard layout _("Icelandic"), - $[ "i386" : $[ "pc104": $[ "ncurses": "is-latin1.map.gz" ]], + $[ "i386" : $[ + "pc104": $[ "ncurses": "is-latin1.map.gz" ], + "macintosh" : $[ "ncurses": "mac-us.map.gz"] + ], "ia64" : $[ "pc104": $[ "ncurses": "is-latin1.map.gz" ]], "x86_64" : $[ "pc104": $[ "ncurses": "is-latin1.map.gz" ]], "alpha" : $[ "pc104": $[ "ncurses": "is-latin1.map.gz" ]], @@ -844,7 +984,7 @@ "type5": $[ "ncurses": "sunkeymap.map.gz" ], "type5_euro": $[ "ncurses": "sunkeymap.map.gz" ], "pc104": $[ "ncurses": "is-latin1.map.gz" ]], - "ppc" : $[ "macintosh" : $[ "ncurses": "mac-dk-latin1.map.gz" ], + "ppc" : $[ "macintosh" : $[ "ncurses": "mac-us.map.gz" ], "pc104" : $[ "ncurses": "is-latin1.map.gz"]] ] ], @@ -856,7 +996,10 @@ "i386" : $[ "pc104" : $[ "ncurses" : "ua.map.gz", - ] + ], + "macintosh" : $[ + "ncurses" : "mac-us.map.gz" + ], ], "ia64" : $[ "pc104" : $[ @@ -916,7 +1059,10 @@ "i386" : $[ "pc104" : $[ "ncurses" : "khmer.map.gz", - ] + ], + "macintosh" : $[ + "ncurses" : "mac-us.map.gz" + ], ], "ia64" : $[ "pc104" : $[ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.14.0/language/data/language_id_ID.ycp new/yast2-country-2.14.1/language/data/language_id_ID.ycp --- old/yast2-country-2.14.0/language/data/language_id_ID.ycp 2006-10-23 13:31:04.000000000 +0200 +++ new/yast2-country-2.14.1/language/data/language_id_ID.ycp 2006-10-23 14:24:04.000000000 +0200 @@ -11,7 +11,7 @@ * translations of the 'language name' string to all installed languages. * * Author: Jiří Suchomel <jsuchome(a)suse.cz> - * $Id: language_cs_CZ.ycp 32768 2006-09-08 09:29:07Z jsuchome $ + * $Id: language_id_ID.ycp 33574 2006-10-23 12:24:01Z jsuchome $ */ { textdomain "languages_db"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.14.0/language/data/language_mk_MK.ycp new/yast2-country-2.14.1/language/data/language_mk_MK.ycp --- old/yast2-country-2.14.0/language/data/language_mk_MK.ycp 2006-10-23 13:30:58.000000000 +0200 +++ new/yast2-country-2.14.1/language/data/language_mk_MK.ycp 2006-10-23 14:24:04.000000000 +0200 @@ -11,7 +11,7 @@ * translations of the 'language name' string to all installed languages. * * Author: Jiří Suchomel <jsuchome(a)suse.cz> - * $Id: language_cs_CZ.ycp 32768 2006-09-08 09:29:07Z jsuchome $ + * $Id: language_mk_MK.ycp 33574 2006-10-23 12:24:01Z jsuchome $ */ { textdomain "languages_db"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.14.0/language/src/select_language.ycp new/yast2-country-2.14.1/language/src/select_language.ycp --- old/yast2-country-2.14.0/language/src/select_language.ycp 2006-10-23 13:31:14.000000000 +0200 +++ new/yast2-country-2.14.1/language/src/select_language.ycp 2006-10-27 13:58:29.000000000 +0200 @@ -15,7 +15,7 @@ * Summary: * This client shows main dialog for choosing the language. * - * $Id: select_language.ycp 33045 2006-09-22 08:18:25Z jsuchome $ + * $Id: select_language.ycp 33574 2006-10-23 12:24:01Z jsuchome $ * */ { @@ -153,6 +153,24 @@ }; /** + * check if selected language has support on media (F301238) + * show a warning when not + */ + define void check_languages_support (string selected_language) { + + string linguas = (string) SCR::Read (.content.LINGUAS); + y2milestone ("content LINGUAS %1", linguas); + list<string> ll = splitstring (linguas, " "); + string l = substring (selected_language, 0, 2); + if (!contains (ll, selected_language) && !contains (ll, l)) + // popup message + Popup::Message (_("Only minimal support for the selected language is included on the media. +Add the Language Add-On CD as an installation source to get better support +for this language.")); + } + + + /** * helper function for updating the "adapt terms" to current language */ define void update_adapt_term () { @@ -192,6 +210,7 @@ if (ProductFeatures::GetBooleanFeature ("globals", "skip_language_dialog")) { y2milestone("Skipping language dialog, Language changed to %1",preselected); + check_languages_support (preselected); return `auto; } } @@ -509,18 +528,8 @@ } if (ret == `next && Stage::initial ()) { - // check if selected language has support on media (F301238) - string linguas = (string) SCR::Read (.content.LINGUAS); - y2milestone ("content LINGUAS %1", linguas); - list<string> ll = splitstring (linguas, " "); - string l = substring (language, 0, 2); - if (!contains (ll, language) && !contains (ll, l)) - // popup message - Popup::Message (_("Only minimal support for the selected language is included on the media. -Add the Language Add-On CD as an installation source to get better support -for this language.")); + check_languages_support (language); } - if (language != Language::language) { y2milestone ("Language changed from %1 to %2", Language::language, language); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.14.0/timezone/src/Timezone.ycp new/yast2-country-2.14.1/timezone/src/Timezone.ycp --- old/yast2-country-2.14.0/timezone/src/Timezone.ycp 2006-09-08 11:27:46.000000000 +0200 +++ new/yast2-country-2.14.1/timezone/src/Timezone.ycp 2006-10-30 13:48:50.000000000 +0100 @@ -476,7 +476,7 @@ if (!user_hwclock || force_reset) { hwclock = "-u"; - if (windows_partition || Arch::board_mac ()) + if (windows_partition || (Arch::board_mac () && Arch::ppc32 ())) { // Win partitions present ==> assume local time. // diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.14.0/timezone/src/dialogs.ycp new/yast2-country-2.14.1/timezone/src/dialogs.ycp --- old/yast2-country-2.14.0/timezone/src/dialogs.ycp 2006-09-06 17:19:58.000000000 +0200 +++ new/yast2-country-2.14.1/timezone/src/dialogs.ycp 2006-10-26 15:32:17.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Dialogs for timezone and time configuration. * - * $Id: dialogs.ycp 32735 2006-09-06 15:21:35Z jsuchome $ + * $Id: dialogs.ycp 33702 2006-10-26 13:32:16Z jsuchome $ */ { textdomain "country"; @@ -55,11 +55,7 @@ define boolean SetTimeDialog() { // help text - string htext = _("Here, change -the system time and date. -"); - // help text - htext = htext + _("The current system time and date are displayed. Change them to the correct values and press + string htext = _("The current system time and date are displayed. Change them to the correct values and press Apply. "); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-packager
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package yast2-packager checked in at Mon Oct 30 18:04:14 CET 2006. -------- --- yast2-packager/yast2-packager.changes 2006-10-24 13:37:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2006-10-30 17:26:35.000000000 +0100 @@ -1,0 +2,25 @@ +Mon Oct 30 15:37:20 CET 2006 - lslezak(a)suse.cz + +- do not show hidden patterns in the installation proposal +- 2.14.0 + +------------------------------------------------------------------- +Mon Oct 30 12:46:38 CET 2006 - locilka(a)suse.cz + +- Moving ProductFeatures::Save() to save_config_finish.ycp + (bugzilla #209119). +- Create SourceManager::InstallationSourceOnPartition function that + returns the disk partition used as installation source (if any). +- Calling Storage::RemoveDmMapsTo (device) in the begining of + inst_rpmcopy (#208222). +- Fixed include path for packager (/packager). +- Added RPM dependency on yast2-rpm. + +------------------------------------------------------------------- +Tue Oct 24 15:39:46 CEST 2006 - mvidner(a)suse.cz + +- If ZMD is not installed, do not complain about not being able + to start it (#214588). +- 2.13.158 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.157.tar.bz2 New: ---- yast2-packager-2.14.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.cWuUDO/_old 2006-10-30 18:03:52.000000000 +0100 +++ /var/tmp/diff_new_pack.cWuUDO/_new 2006-10-30 18:03:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.157) +# spec file for package yast2-packager (Version 2.14.0) # # 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-packager -Version: 2.13.157 +Version: 2.14.0 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.157.tar.bz2 +Source0: yast2-packager-2.14.0.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml Requires: checkmedia yast2-country @@ -24,6 +24,7 @@ Requires: yast2-pkg-bindings >= 2.13.99 # Linuxrc::display_ip Requires: yast2 >= 2.13.67 +Requires: yast2-storage Provides: yast2-config-package-manager Obsoletes: yast2-config-package-manager Provides: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg @@ -45,7 +46,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.157 +%setup -n yast2-packager-2.14.0 %build %{prefix}/bin/y2tool y2autoconf @@ -72,9 +73,10 @@ %defattr(-,root,root) %dir /usr/share/YaST2/include/checkmedia %dir /usr/share/YaST2/include/dirinstall -/usr/share/YaST2/include/inst_source_dialogs.ycp +%dir /usr/share/YaST2/include/packager /usr/share/YaST2/include/checkmedia/* /usr/share/YaST2/include/dirinstall/* +/usr/share/YaST2/include/packager/* /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/* %{prefix}/share/applications/YaST2/*.desktop @@ -82,6 +84,22 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Mon Oct 30 2006 - lslezak(a)suse.cz +- do not show hidden patterns in the installation proposal +- 2.14.0 +* Mon Oct 30 2006 - locilka(a)suse.cz +- Moving ProductFeatures::Save() to save_config_finish.ycp + (bugzilla #209119). +- Create SourceManager::InstallationSourceOnPartition function that + returns the disk partition used as installation source (if any). +- Calling Storage::RemoveDmMapsTo (device) in the begining of + inst_rpmcopy (#208222). +- Fixed include path for packager (/packager). +- Added RPM dependency on yast2-rpm. +* Tue Oct 24 2006 - mvidner(a)suse.cz +- If ZMD is not installed, do not complain about not being able + to start it (#214588). +- 2.13.158 * Tue Oct 24 2006 - lslezak(a)suse.cz - Fixed SourceProgressCallback() return value (do not abort) (#213628) ++++++ yast2-packager-2.13.157.tar.bz2 -> yast2-packager-2.14.0.tar.bz2 ++++++ ++++ 5735 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/Makefile.am.common new/yast2-packager-2.14.0/Makefile.am.common --- old/yast2-packager-2.13.157/Makefile.am.common 2006-10-24 13:32:30.000000000 +0200 +++ new/yast2-packager-2.14.0/Makefile.am.common 2006-10-30 17:21:22.000000000 +0100 @@ -29,19 +29,7 @@ dist-hook: check-syntax -CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - @if test "$(client_DATA)"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ - echo "Checking syntax of $${TO_CHECK}"; \ - if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ - echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ - exit 1; \ - fi; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi + if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/VERSION new/yast2-packager-2.14.0/VERSION --- old/yast2-packager-2.13.157/VERSION 2006-10-24 13:27:24.000000000 +0200 +++ new/yast2-packager-2.14.0/VERSION 2006-10-30 17:26:24.000000000 +0100 @@ -1 +1 @@ -2.13.157 +2.14.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/configure.in new/yast2-packager-2.14.0/configure.in --- old/yast2-packager-2.13.157/configure.in 2006-10-24 13:32:30.000000000 +0200 +++ new/yast2-packager-2.14.0/configure.in 2006-10-30 17:21:22.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.13.16 - 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-packager, 2.13.157, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.13.158, http://bugs.opensuse.org/, yast2-packager) 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.157" +VERSION="2.13.158" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/clients/inst_kickoff.ycp new/yast2-packager-2.14.0/src/clients/inst_kickoff.ycp --- old/yast2-packager-2.13.157/src/clients/inst_kickoff.ycp 2006-10-19 11:23:58.000000000 +0200 +++ new/yast2-packager-2.14.0/src/clients/inst_kickoff.ycp 2006-10-30 14:56:37.000000000 +0100 @@ -24,7 +24,6 @@ import "Kernel"; import "Arch"; import "FileUtils"; - import "ProductFeatures"; import "String"; void AcpiToInitrd () { @@ -398,14 +397,5 @@ SCR::Execute (.target.bash, "/bin/echo \"/etc/nothing\" >/proc/sys/kernel/modprobe"); } - if (Stage::initial ()) - { - ProductFeatures::Save(); - WFM::Execute (.local.bash, sformat ( - "/bin/mkdir -p '%1/etc/YaST2'", String::Quote (Installation::destdir))); - WFM::Execute (.local.bash, sformat ( - "/bin/cp '%1' '%2/%1'", "/etc/YaST2/ProductFeatures", String::Quote (Installation::destdir))); - } - return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/clients/inst_rpmcopy.ycp new/yast2-packager-2.14.0/src/clients/inst_rpmcopy.ycp --- old/yast2-packager-2.13.157/src/clients/inst_rpmcopy.ycp 2006-10-19 13:04:49.000000000 +0200 +++ new/yast2-packager-2.14.0/src/clients/inst_rpmcopy.ycp 2006-10-30 16:08:52.000000000 +0100 @@ -13,7 +13,7 @@ * Packages module : * "installed" * - * $Id: inst_rpmcopy.ycp 33515 2006-10-19 11:04:46Z lslezak $ + * $Id: inst_rpmcopy.ycp 33854 2006-10-30 15:08:50Z locilka $ */ { @@ -38,6 +38,8 @@ import "Linuxrc"; import "String"; + include "packager/storage_include.ycp"; + // variables related to installation source caching /** @@ -775,6 +777,9 @@ // end of commit installation functions // ------------------------------------------------------------------------------------------------------ + // bugzilla #208222 + ReleaseHDDUsedAsInstallationSource(); + Pkg::SetLocale (Language::language); SlideShow::SetLanguage (Language::language); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/clients/inst_source.ycp new/yast2-packager-2.14.0/src/clients/inst_source.ycp --- old/yast2-packager-2.13.157/src/clients/inst_source.ycp 2006-10-24 13:27:08.000000000 +0200 +++ new/yast2-packager-2.14.0/src/clients/inst_source.ycp 2006-10-30 15:55:58.000000000 +0100 @@ -54,7 +54,7 @@ // is initialized import "Product"; - include "inst_source_dialogs.ycp"; + include "packager/inst_source_dialogs.ycp"; integer numSources = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/include/Makefile.am new/yast2-packager-2.14.0/src/include/Makefile.am --- old/yast2-packager-2.13.157/src/include/Makefile.am 2005-03-11 17:59:15.000000000 +0100 +++ new/yast2-packager-2.14.0/src/include/Makefile.am 2006-10-30 15:57:15.000000000 +0100 @@ -3,10 +3,11 @@ # SUBDIRS = checkmedia dirinstall -yncludedir = @yncludedir@/ +yncludedir = @yncludedir@/packager ynclude_DATA = \ - inst_source_dialogs.ycp + inst_source_dialogs.ycp \ + storage_include.ycp EXTRA_DIST = $(ynclude_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/include/storage_include.ycp new/yast2-packager-2.14.0/src/include/storage_include.ycp --- old/yast2-packager-2.13.157/src/include/storage_include.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.14.0/src/include/storage_include.ycp 2006-10-30 15:40:51.000000000 +0100 @@ -0,0 +1,28 @@ +/** + * File: include/packager/storage_include.ycp + * Module: Packager + * Summary: Storage calls + * Authors: Lukas Ocilka <locilka(a)suse.cz> + * + */ +{ + textdomain "installation"; + + import "Storage"; + import "SourceManager"; + + /** + * Function releases the the device when EVMS is used and the install + * source is disk. See bugzilla 208222 for more details. + */ + void ReleaseHDDUsedAsInstallationSource () { + string install_src_partition = SourceManager::InstallationSourceOnPartition(); + if (install_src_partition != "") { + if (! regexpmatch(install_src_partition, "/dev/")) + install_src_partition = sformat ("/dev/%1", install_src_partition); + + y2milestone ("Calling Storage::RemoveDmMapsTo(%1)", install_src_partition); + Storage::RemoveDmMapsTo (install_src_partition); + } + } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/modules/Packages.ycp new/yast2-packager-2.14.0/src/modules/Packages.ycp --- old/yast2-packager-2.13.157/src/modules/Packages.ycp 2006-10-13 11:12:09.000000000 +0200 +++ new/yast2-packager-2.14.0/src/modules/Packages.ycp 2006-10-30 16:46:19.000000000 +0100 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 33383 2006-10-13 09:12:02Z lslezak $ + * $Id: Packages.ycp 33851 2006-10-30 14:41:31Z lslezak $ */ { @@ -117,6 +117,15 @@ if (format == "" || format == nil) format = "%1"; list<map<string,any> > selected = Pkg::ResolvableProperties ("", what, ""); + + // ignore hidden patterns + if (what == `pattern) + { + selected = filter (map<string,any> r, selected, { + return r["user_visible"]:nil == true; + }); + } + selected = filter (map<string,any> r, selected, { return r["status"]:nil == `selected; }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/modules/SourceManager.ycp new/yast2-packager-2.14.0/src/modules/SourceManager.ycp --- old/yast2-packager-2.13.157/src/modules/SourceManager.ycp 2006-10-13 11:12:09.000000000 +0200 +++ new/yast2-packager-2.14.0/src/modules/SourceManager.ycp 2006-10-30 15:04:37.000000000 +0100 @@ -7,7 +7,7 @@ * Martin Vidner <mvidner(a)suse.cz> * Status: Work in Progress * - * $Id: SourceManager.ycp 33383 2006-10-13 09:12:02Z lslezak $ + * $Id: SourceManager.ycp 33847 2006-10-30 14:04:35Z locilka $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -33,6 +33,7 @@ import "String"; import "SuSEFirewall"; import "SourceManagerSLP"; +import "Linuxrc"; global list<integer> newSources = []; @@ -1003,6 +1004,13 @@ */ map ZMDStart () { map zmd_handle = $[]; + // #214588: don't complain if it is not installed + boolean installed = (integer) SCR::Read (.target.size, zmd_service_name) > 0; + if (! installed) { + y2milestone ("ZMD is not installed"); + return $[ "was_running": false, "is_running": false ]; + } + boolean running = CheckZMDStatus (); zmd_handle ["was_running"] = running; if (! running) { @@ -1300,6 +1308,8 @@ Lock (); map zmd_handle = ZMDStart (); + boolean zmd_working = ZMDWorking (zmd_handle); + ResetKnownServiceCache (); // add the sources. @@ -1322,7 +1332,7 @@ if (todel != -1) { y2milestone ("deleting the old copy, source %1", todel); - if (!is_nu) + if (!is_nu && zmd_working) { AddOrDeleteZYPPServiceIntoZMD (todel, false); } @@ -1335,7 +1345,7 @@ if (toadd != -1 && toadd != nil) { ret = add (ret, url); // #180820#c26 - if (!is_nu) + if (!is_nu && zmd_working) { AddOrDeleteZYPPServiceIntoZMD (toadd, true); } @@ -1412,5 +1422,34 @@ UI::CloseDialog (); return ret == `cont; } + +/** + * Function returns the partiton name which is used as a source for the installation + * (IF any partition is used as a source for installation, of course). + * Otherwise it returns an empty string "". See bugzilla #208222 for more information. + * + * @return string partition name + */ +global string InstallationSourceOnPartition () { + string install_mode = Linuxrc::InstallInf ("InstMode"); + + // Hard Disk is used for the installation + if (install_mode == "hd") { + string install_partition = Linuxrc::InstallInf ("Partition"); + + // No partiton is defined - error + if (install_partition == "" || install_partition == nil) { + y2error ("Despite the fact that the install-mode is '%1', install-partition is '%2'", + install_mode, install_partition + ); + return ""; + } else { + return install_partition; + } + } else { + return ""; + } +} + /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.157/src/modules/test.ycp new/yast2-packager-2.14.0/src/modules/test.ycp --- old/yast2-packager-2.13.157/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100 +++ new/yast2-packager-2.14.0/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ - -{ - import "Package"; - import "CommandLine"; - - textdomain "test"; - - boolean startHandler(map<string,string> opts) { - Package::InstallAll(["samba-doc", "qt3-devel-doc"]); -// Package::InstallAll(["sambadocdfdfdf"]); - - return true; - } - - symbol GUIhandler() { - y2milestone("GUIhandler"); - return `next; - } - - boolean Read() { - return true; - } - - boolean Write() { - return true; - } - - map cmdline = $[ - // help text - "help" : _("Start installation in a virtual machine"), - "id" : "vm", - "guihandler": GUIhandler, - "initialize": Read, - "finish" : Write, - "actions" : $[ - "start" : $[ - // command description - "help" : _("Start installation"), - "handler" : startHandler - ] - ], - "options" : $[ - "configured" : $[ - // option description - "help" : _("List only configured devices") - ], - "all" : $[ - // option description - "help" : _("List all detected IDE devices") - ] - ], - "mappings" : $[ - "start" : ["configured", "all"], - ] - ]; - - any ret = CommandLine::Run(cmdline); -} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package yast2 checked in at Mon Oct 30 18:03:42 CET 2006. -------- --- yast2/yast2.changes 2006-10-23 17:27:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2006-10-30 17:13:37.000000000 +0100 @@ -1,0 +2,29 @@ +Mon Oct 30 09:29:21 CET 2006 - locilka(a)suse.cz + +- Stopping/Starting and/or Enabling/Disabling all SuSEfirewall2 + services even if one of them fails. Partly preventing from not + writing the new status of services (bugzilla #215416). +- Restarting firewall in SuSEFirewall::ActivateConfiguration() even + if the configuration is not changed but there are some RPC + services in the configuration (bugzilla #186186). +- 2.14.8 + +------------------------------------------------------------------- +Wed Oct 25 11:13:38 CEST 2006 - locilka(a)suse.cz + +- Writing the client's return value to the log (ProductControl) + for easier debugging (#214886). + +------------------------------------------------------------------- +Tue Oct 24 15:50:54 CEST 2006 - lslezak(a)suse.cz + +- .etc.policykit agent - added documentation +- fixed script callback registration + +------------------------------------------------------------------- +Tue Oct 24 09:44:20 CEST 2006 - jsrain(a)suse.cz + +- lazy initialization of list of YaST modules for bash completion + (#212928) + +------------------------------------------------------------------- Old: ---- yast2-2.14.7.tar.bz2 New: ---- yast2-2.14.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.Ampvui/_old 2006-10-30 18:03:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Ampvui/_new 2006-10-30 18:03:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.14.7) +# spec file for package yast2 (Version 2.14.8) # # 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 -Version: 2.14.7 +Version: 2.14.8 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.14.7.tar.bz2 +Source0: yast2-2.14.8.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # Need the new file popups @@ -97,7 +97,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.14.7 +%setup -n yast2-2.14.8 %build %{prefix}/bin/y2tool y2autoconf @@ -197,6 +197,23 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 +* Mon Oct 30 2006 - locilka(a)suse.cz +- Stopping/Starting and/or Enabling/Disabling all SuSEfirewall2 + services even if one of them fails. Partly preventing from not + writing the new status of services (bugzilla #215416). +- Restarting firewall in SuSEFirewall::ActivateConfiguration() even + if the configuration is not changed but there are some RPC + services in the configuration (bugzilla #186186). +- 2.14.8 +* Wed Oct 25 2006 - locilka(a)suse.cz +- Writing the client's return value to the log (ProductControl) + for easier debugging (#214886). +* Tue Oct 24 2006 - lslezak(a)suse.cz +- .etc.policykit agent - added documentation +- fixed script callback registration +* Tue Oct 24 2006 - jsrain(a)suse.cz +- lazy initialization of list of YaST modules for bash completion + (#212928) * Mon Oct 23 2006 - lslezak(a)suse.cz - added .etc.policykit agent (reads/writes /etc/PolicyKit/privilege.d/*.privilege files), used for ++++++ yast2-2.14.7.tar.bz2 -> yast2-2.14.8.tar.bz2 ++++++ ++++ 11949 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.7/Makefile.am.common new/yast2-2.14.8/Makefile.am.common --- old/yast2-2.14.7/Makefile.am.common 2006-10-23 17:25:38.000000000 +0200 +++ new/yast2-2.14.8/Makefile.am.common 2006-10-30 17:14:40.000000000 +0100 @@ -29,19 +29,7 @@ dist-hook: check-syntax -CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - @if test "$(client_DATA)"; then \ - if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ - echo "Checking syntax of $${TO_CHECK}"; \ - if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ - echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ - exit 1; \ - fi; \ - else \ - echo "Syntax check disabled"; \ - fi; \ - fi + if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.7/VERSION new/yast2-2.14.8/VERSION --- old/yast2-2.14.7/VERSION 2006-10-23 17:13:35.000000000 +0200 +++ new/yast2-2.14.8/VERSION 2006-10-30 17:12:35.000000000 +0100 @@ -1 +1 @@ -2.14.7 +2.14.8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.7/configure.in new/yast2-2.14.8/configure.in --- old/yast2-2.14.7/configure.in 2006-10-23 17:25:38.000000000 +0200 +++ new/yast2-2.14.8/configure.in 2006-10-30 17:14:40.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.13.16 - 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, 2.14.7, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.14.8, http://bugs.opensuse.org/, yast2) 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.14.7" +VERSION="2.14.8" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.7/library/agents/cfg_policykit.scr new/yast2-2.14.8/library/agents/cfg_policykit.scr --- old/yast2-2.14.7/library/agents/cfg_policykit.scr 2006-10-23 14:54:11.000000000 +0200 +++ new/yast2-2.14.8/library/agents/cfg_policykit.scr 2006-10-25 10:08:22.000000000 +0200 @@ -1,4 +1,44 @@ -// use the INI-agent for reading/writing +/** + * File: + * cfg_policykit.scr + * Summary: + * SCR Agent for reading/writing /etc/PolicyKit/privilege.d/*.privilege files + * using the ini-agent + * Access: + * read/write + * Authors: + * Ladislav Slezak <lslezak(a)suse.cz> + * Example: + * + * Read list of available files + * SCR::Dir(.etc.policykit.section) + * + * Read list of sections in a file + * SCR::Dir(.etc.policykit.section."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege") + * (["Privilege"]) + * + * Read list of options in a section + * SCR::Dir(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege") + * (["RequiredPrivileges", "SufficientPrivileges", "Allow", "Deny", "CanObtain", "CanGrant", "ObtainRequireRoot"]) + * + * Read an option + * SCR::Read(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege"."RequiredPrivileges") + * ("desktop-console") + * + * + * Write an option + * SCR::Write(.etc.policykit.value."/etc/PolicyKit/privilege.d/hal-power-hibernate.privilege"."Privilege"."RequiredPrivileges", "") + * (true) + * + * + * Flush the changes + * SCR::Write(.etc.policykit, nil) + * + * + * Fore more information see the INI-agent documentation + * + * $Id:$ + */ .etc.policykit diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.7/library/control/src/ProductControl.ycp new/yast2-2.14.8/library/control/src/ProductControl.ycp --- old/yast2-2.14.7/library/control/src/ProductControl.ycp 2006-10-20 13:56:54.000000000 +0200 +++ new/yast2-2.14.8/library/control/src/ProductControl.ycp 2006-10-30 09:53:53.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Product Control routines * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: ProductControl.ycp 33499 2006-10-18 13:19:41Z locilka $ + * $Id: ProductControl.ycp 33822 2006-10-30 08:53:52Z locilka $ */ { textdomain "base"; @@ -941,6 +941,7 @@ } symbol result = (symbol) WFM::CallFunction (getClientName(step_name), args); + y2milestone ("Calling %1 returned %2", argterm, result); // Remove file if step was run and returned (without a crash); if (current_step < size(modules) - 1 && !Stage::initial()) @@ -1062,16 +1063,21 @@ } if (former_result == `abort) { - return `abort; + final_result = `abort; } - if (final_result != nil) - return final_result; + y2milestone ("Former result: %1, Final result: %2", former_result, final_result); - if (current_step <= -1) - return `back; - else - return `next; + if (final_result != nil) { + y2milestone ("Final result already set."); + } else if (current_step <= -1) { + final_result = `back; + } else { + final_result = `next; + } + + y2milestone ("Current step: %1, Returning: %2", current_step, final_result); + return final_result; } /** @@ -1079,7 +1085,9 @@ * */ global symbol Run () { - return RunFrom (0, false); + symbol ret = RunFrom (0, false); + y2milestone ("Run() returning %1", ret); + return ret; } // Functions to access restart information diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.7/library/modules/Version.ycp new/yast2-2.14.8/library/modules/Version.ycp --- old/yast2-2.14.7/library/modules/Version.ycp 2006-10-23 17:25:58.000000000 +0200 +++ new/yast2-2.14.8/library/modules/Version.ycp 2006-10-30 17:15:10.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.14.7"; +global string yast2 = "2.14.8"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.7/library/network/src/SuSEFirewall.ycp new/yast2-2.14.8/library/network/src/SuSEFirewall.ycp --- old/yast2-2.14.7/library/network/src/SuSEFirewall.ycp 2006-09-27 14:24:44.000000000 +0200 +++ new/yast2-2.14.8/library/network/src/SuSEFirewall.ycp 2006-10-30 11:15:07.000000000 +0100 @@ -1025,12 +1025,11 @@ foreach (string service, firewall_services, { y2debug("Starting service: %1", service); - all_ok = Service::Start(service); - if (!all_ok) { + if (! Service::Start(service)) { + all_ok = false; y2error("Error starting service: %1", service); - break; - } + } }); return all_ok; @@ -1046,11 +1045,10 @@ foreach (string service, firewall_services_reverse, { y2debug("Stopping service: %1", service); - all_ok = Service::Stop(service); - if (!all_ok) { + if (! Service::Stop (service)) { y2error("Error stopping service: %1", service); - break; + all_ok = false; } }); @@ -1067,12 +1065,11 @@ foreach (string service, firewall_services, { y2debug("Enabling service: %1", service); - all_ok = Service::Enable(service); - if (!all_ok) { + if (! Service::Enable(service)) { + all_ok = true; // TRANSLATORS: a popup error message - Report::Error(sformat(_("Cannot enable service '%1'."), service)); - break; + Report::Error (sformat (_("Cannot enable service '%1'."), service)); } }); @@ -1089,12 +1086,11 @@ foreach (string service, firewall_services_reverse, { y2debug("Disabling service: %1", service); - all_ok = Service::Disable(service); - if (!all_ok) { + if (! Service::Disable(service)) { + all_ok = false; // TRANSLATORS: a popup error message - Report::Error(sformat(_("Cannot disable service '%1'."), service)); - break; + Report::Error (sformat (_("Cannot disable service '%1'."), service)); } }); @@ -2019,6 +2015,37 @@ return true; } + + /** + * Function returns whether some RPC service is allowed in the configuration. + * These services reallocate their ports when restarted. See details in + * bugzilla bug #186186. + * + * @return boolean some_RPC_service_used + */ + boolean AnyRPCServiceInConfiguration () { + boolean ret = false; + + foreach (string fw_zone, GetKnownFirewallZones(), { + string fw_rule = sformat("FW_SERVICES_%1_RPC", fw_zone); + string listed_services = SETTINGS[fw_rule]:GetDefaultValue(fw_rule); + // easy case + if (listed_services == nil || listed_services == "") return; + + // something listed but it still might be empty definition + list <string> services_list = splitstring (listed_services, " \n\t"); + services_list = filter (string service, services_list, { + return (service != ""); + }); + if (size (listed_services) > 0) { + ret = true; + break; + } + }); + + y2milestone ("Some RPC service found: %1", ret); + return ret; + } /** * Function which stops firewall. Then firewall is started immediately when firewall @@ -2035,8 +2062,12 @@ return StartServices(); // Started - restart it } else { - // modified - restart it - if (GetModified()) { + // modified - restart it, or ... + // bugzilla #186186 + // If any RPC service is configured to be allowed, always restart the firewall + // Some of these service's ports might have been reallocated (when SuSEFirewall + // is used from outside, e.g., yast2-nfs-server) + if (GetModified() || AnyRPCServiceInConfiguration()) { y2milestone("Stopping firewall services"); StopServices(); y2milestone("Starting firewall services"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.7/library/packages/src/PackageCallbacksInit.ycp new/yast2-2.14.8/library/packages/src/PackageCallbacksInit.ycp --- old/yast2-2.14.7/library/packages/src/PackageCallbacksInit.ycp 2006-10-16 17:13:49.000000000 +0200 +++ new/yast2-2.14.8/library/packages/src/PackageCallbacksInit.ycp 2006-10-25 10:08:22.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Initialize packager callbacks * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: PackageCallbacksInit.ycp 33434 2006-10-16 15:13:45Z lslezak $ + * $Id: PackageCallbacksInit.ycp 33643 2006-10-24 13:51:46Z lslezak $ * * This module is used to initialize package manager callbacks */ @@ -27,9 +27,9 @@ global void SetScriptCallbacks() { Pkg::CallbackScriptStart("PackageCallbacks::ScriptStart"); - Pkg::CallbackScriptStart("PackageCallbacks::ScriptProgress"); - Pkg::CallbackScriptStart("PackageCallbacks::ScriptProblem"); - Pkg::CallbackScriptStart("PackageCallbacks::ScriptFinish"); + Pkg::CallbackScriptProgress("PackageCallbacks::ScriptProgress"); + Pkg::CallbackScriptProblem("PackageCallbacks::ScriptProblem"); + Pkg::CallbackScriptFinish("PackageCallbacks::ScriptFinish"); Pkg::CallbackMessage("PackageCallbacks::Message"); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.14.7/scripts/yast2-completion.sh new/yast2-2.14.8/scripts/yast2-completion.sh --- old/yast2-2.14.7/scripts/yast2-completion.sh 2006-01-03 10:30:50.000000000 +0100 +++ new/yast2-2.14.8/scripts/yast2-completion.sh 2006-10-25 10:08:23.000000000 +0200 @@ -2,13 +2,16 @@ # A Christmas gift from Carsten Hoeger YAST=/sbin/yast -# build a list of know yast modules -MODLIST=($(LC_ALL=C $YAST -l| grep '^[a-z]' | grep -v "Available")) +MODLIST=() _yast2 () { local cur prevprev prev len idx mod MODOPTS line opt rest MODOPTS=() + if test ${#MODLIST[*]} = 0; then + # build a list of know yast modules + MODLIST=($(LC_ALL=C $YAST -l| grep '^[a-z]' | grep -v "Available")) + fi if [[ ${#COMP_WORDS[@]} -gt 4 ]]; then return 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Mon Oct 30 18:03:38 CET 2006. -------- --- xorg-x11/xorg-x11.changes 2006-10-24 12:32:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2006-10-30 15:13:54.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 30 15:12:45 CET 2006 - sndirsch(a)suse.de + +- added xdm-np, which now can be used by KDE and Gnome (Bug #192400) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.QlvLn5/_old 2006-10-30 18:02:53.000000000 +0100 +++ /var/tmp/diff_new_pack.QlvLn5/_new 2006-10-30 18:02:53.000000000 +0100 @@ -14,8 +14,8 @@ BuildRequires: fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 7 -License: Other License(s), see package +Release: 8 +License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities Provides: XFree86 @@ -294,6 +294,9 @@ # SuSE default XDM configuration pushd $RPM_BUILD_ROOT tar xjf $RPM_SOURCE_DIR/xdm.tar.bz2 +%if %suse_version <= 1010 + rm etc/pam.d/xdm-np +%endif %ifarch s390 s390x patch -p0 -s < $RPM_SOURCE_DIR/xdm.diff rm -f var/adm/fillup-templates/sysconfig.displaymanager.orig @@ -428,6 +431,8 @@ /var/lib/xdm/authdir/ %changelog -n xorg-x11 +* Mon Oct 30 2006 - sndirsch(a)suse.de +- added xdm-np, which now can be used by KDE and Gnome (Bug #192400) * Tue Oct 24 2006 - sndirsch(a)suse.de - xdm-pam_tty.diff: * set PAM_TTY to fix the use of pam_resgmr (Bug #213598) ++++++ xdm.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/etc/pam.d/xdm-np new/etc/pam.d/xdm-np --- old/etc/pam.d/xdm-np 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/pam.d/xdm-np 2006-10-30 15:10:47.000000000 +0100 @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth required pam_permit.so +account include common-account +password include common-password +session include common-session +session required pam_resmgr.so ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wireshark
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package wireshark checked in at Mon Oct 30 18:02:55 CET 2006. -------- --- wireshark/wireshark.changes 2006-08-29 16:45:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/wireshark/wireshark.changes 2006-10-30 11:33:12.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Oct 30 11:19:14 CET 2006 - mjancar(a)suse.cz + +- update to 0.99.4pre1 + * security fixes (#213226) + CVE-2006-4574 + CVE-2006-4805 + CVE-2006-5468 + CVE-2006-5469 + CVE-2006-5740 + +------------------------------------------------------------------- Old: ---- wireshark-0.99.3-config.diff wireshark-0.99.3-gcc.patch wireshark-0.99.3.tar.bz2 New: ---- wireshark-0.99.4pre1-config.diff wireshark-0.99.4pre1-printf.diff wireshark-0.99.4pre1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireshark.spec ++++++ --- /var/tmp/diff_new_pack.j4CNmg/_old 2006-10-30 18:02:45.000000000 +0100 +++ /var/tmp/diff_new_pack.j4CNmg/_new 2006-10-30 18:02:45.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package wireshark (Version 0.99.3) +# spec file for package wireshark (Version 0.99.4pre1) # # 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: wireshark -BuildRequires: gtk2-devel krb5-devel libadns-devel libpcap net-snmp-devel pcre-devel python tcpd-devel update-desktop-files -License: GPL +BuildRequires: cairo-devel gtk2-devel krb5-devel libadns-devel libpcap net-snmp-devel pcre-devel python tcpd-devel update-desktop-files +License: GNU General Public License (GPL) - all versions Group: Productivity/Networking/Diagnostic Autoreqprov: on Summary: A Network Traffic Analyser -Version: 0.99.3 +Version: 0.99.4pre1 Release: 1 URL: http://www.wireshark.org/ Source: http://www.wireshark.org/download/src/%{name}-%{version}.tar.bz2 @@ -25,7 +25,7 @@ Source3: include.filelist Source4: missing_files.tar.bz2 Patch4: %{name}-%{version}-config.diff -Patch5: %{name}-%{version}-gcc.patch +Patch5: %{name}-%{version}-printf.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: ethereal Obsoletes: ethereal @@ -179,6 +179,14 @@ %{_mandir}/man1/idl2wrs* %changelog -n wireshark +* Mon Oct 30 2006 - mjancar(a)suse.cz +- update to 0.99.4pre1 + * security fixes (#213226) + CVE-2006-4574 + CVE-2006-4805 + CVE-2006-5468 + CVE-2006-5469 + CVE-2006-5740 * Thu Aug 24 2006 - postadal(a)suse.cz - updated to version 0.99.2 [#201437] * security bugfixes ++++++ wireshark-0.99.4pre1-config.diff ++++++ -datafiledir=$datadir/ethereal +datafiledir=$sysconfdir datafiledir=`( test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix=${prefix} ================================================================================ --- gtk/help_dlg.c +++ gtk/help_dlg.c @@ -51,7 +51,7 @@ #endif -#define HELP_DIR "help" +#define HELP_DIR "/usr/share/ethereal/help" #define NOTEBOOK_KEY "notebook_key" @@ -88,10 +88,8 @@ char *relative_path, *absolute_path; help_page_t *page; - relative_path = g_strconcat(HELP_DIR, G_DIR_SEPARATOR_S, filename, NULL); - absolute_path = get_datafile_path(relative_path); + absolute_path = g_strconcat(HELP_DIR, G_DIR_SEPARATOR_S, filename, NULL); text_page = text_page_new(absolute_path); - g_free(relative_path); gtk_widget_show(text_page); page = g_malloc(sizeof (help_page_t)); @@ -123,12 +121,11 @@ return; } - help_toc_file_path = get_datafile_path(HELP_DIR G_DIR_SEPARATOR_S "toc"); + help_toc_file_path = HELP_DIR G_DIR_SEPARATOR_S "toc"; help_toc_file = eth_fopen(help_toc_file_path, "r"); if (help_toc_file == NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not open file \"%s\": %s", help_toc_file_path, strerror(errno)); - g_free(help_toc_file_path); return; } ++++++ wireshark-0.99.4pre1-printf.diff ++++++ --- epan/dissectors/packet-bootp.c +++ epan/dissectors/packet-bootp.c @@ -1216,7 +1216,7 @@ if (code == pkt_ccc_option) { skip_opaque = TRUE; proto_item_append_text(vti, - "CableLabs Client Configuration (%d bytes)"); + "CableLabs Client Configuration (%d bytes)", optlen); optend = optoff + optlen; while (optoff < optend) { switch (pkt_ccc_protocol_version) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 statserial
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package statserial checked in at Mon Oct 30 18:02:45 CET 2006. -------- --- statserial/statserial.changes 2006-01-25 21:41:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/statserial/statserial.changes 2006-10-30 15:48:24.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 15:47:19 CET 2006 - mjancar(a)suse.cz + +- change default device from /dev/cua1 to /dev/ttyS1 +- link dynamicaly + +------------------------------------------------------------------- Old: ---- statserial-1.1.dif New: ---- statserial-1.1-device.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ statserial.spec ++++++ --- /var/tmp/diff_new_pack.k7O1Lb/_old 2006-10-30 18:02:26.000000000 +0100 +++ /var/tmp/diff_new_pack.k7O1Lb/_new 2006-10-30 18:02:26.000000000 +0100 @@ -1,28 +1,29 @@ # # spec file for package statserial (Version 1.1) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: statserial -URL: http://ca.geocities.com/jefftranter@rogers.com/ -License: GPL -Group: Hardware/Other +Version: 1.1 +Release: 601 +BuildRequires: ncurses-devel Provides: statseri +Obsoletes: statseri Autoreqprov: on -Version: 1.1 -Release: 578 +Group: Hardware/Other Summary: Helps to Debug Serial Lines -Source: ftp://metalab.unc.edu/pub/Linux/system/serial/statserial-%{version}.tar.gz -Patch: statserial-%{version}.dif +License: GNU General Public License (GPL) - all versions +URL: http://ca.geocities.com/jefftranter@rogers.com/ +Source: ftp://metalab.unc.edu/pub/Linux/system/serial/%{name}-%{version}.tar.gz +Patch: %{name}-%{version}-device.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: statseri %description Statserial displays a table of the signals on a standard 9-pin or @@ -36,28 +37,31 @@ Jeff Tranter <Jeff_Tranter(a)Mitel.COM> %prep -%setup -n statserial-1.1 +%setup -q %patch %build -make +gcc $RPM_OPT_FLAGS -lncurses -o statserial statserial.c %install -install -d -m 755 ${RPM_BUILD_ROOT}/usr/bin -install -d -m 755 ${RPM_BUILD_ROOT}/%{_mandir}/man1 -make install DESTDIR=${RPM_BUILD_ROOT} -install -m 755 phone_log ${RPM_BUILD_ROOT}/usr/bin +install -d -m 755 $RPM_BUILD_ROOT%{_bindir}/ +install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1/ +install -m 755 statserial phone_log $RPM_BUILD_ROOT%{_bindir}/ +install -m 755 statserial.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %clean -rm -rf ${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README ChangeLog -/usr/bin/* -%doc /usr/share/man/man1/statserial.1.gz +%doc COPYING ChangeLog README +%doc %{_mandir}/man?/* +%{_bindir}/* %changelog -n statserial +* Mon Oct 30 2006 - mjancar(a)suse.cz +- change default device from /dev/cua1 to /dev/ttyS1 +- link dynamicaly * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Oct 31 2005 - dmueller(a)suse.de ++++++ statserial-1.1-device.diff ++++++ --- statserial.c +++ statserial.c @@ -42,7 +42,7 @@ /* global variables */ char device[255]; /* name of device to open */ -const char *defaultDevice = "/dev/cua1"; /* default device if none specified on command line */ +const char *defaultDevice = "/dev/ttyS1"; /* default device if none specified on command line */ int n_option = 0; /* set if -n option is used */ int d_option = 0; /* set if -d option is used */ int x_option = 0; /* set if -x option is used */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package kernel-source checked in at Mon Oct 30 18:02:37 CET 2006. -------- --- kernel-source/kernel-bigsmp.changes 2006-10-28 14:49:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2006-10-30 17:24:20.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 30 15:24:06 CET 2006 - schwab(a)suse.de + +- Update mol patch. + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.UNTDto/_old 2006-10-30 18:01:04.000000000 +0100 +++ /var/tmp/diff_new_pack.UNTDto/_new 2006-10-30 18:01:04.000000000 +0100 @@ -29,7 +29,7 @@ BuildRequires: python %endif Version: 2.6.18.1 -Release: 11 +Release: 12 Summary: Kernel with PAE Support License: GNU General Public License (GPL) - all versions Group: System/Kernel @@ -124,7 +124,7 @@ -Source Timestamp: 2006/10/28 12:47:43 UTC +Source Timestamp: 2006/10/30 14:26:03 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -470,6 +470,8 @@ %files -f kernel.files %changelog -n kernel-bigsmp +* Mon Oct 30 2006 - schwab(a)suse.de +- Update mol patch. * Sat Oct 28 2006 - olh(a)suse.de - dont pull perl-Bootloader and mkinitrd during build (215218) * Sat Oct 28 2006 - olh(a)suse.de kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.UNTDto/_old 2006-10-30 18:01:05.000000000 +0100 +++ /var/tmp/diff_new_pack.UNTDto/_new 2006-10-30 18:01:05.000000000 +0100 @@ -17,7 +17,7 @@ Summary: Internal dummy package for synchronizing release numbers Group: System/Kernel Version: 2.6.18.1 -Release: 11 +Release: 12 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -27,7 +27,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2006/10/28 12:47:43 UTC +Source Timestamp: 2006/10/30 14:26:03 UTC %install @@ -40,6 +40,8 @@ /etc/dummy %changelog -n kernel-dummy +* Mon Oct 30 2006 - schwab(a)suse.de +- Update mol patch. * Sat Oct 28 2006 - olh(a)suse.de - dont pull perl-Bootloader and mkinitrd during build (215218) * Sat Oct 28 2006 - olh(a)suse.de ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.UNTDto/_old 2006-10-30 18:01:05.000000000 +0100 +++ /var/tmp/diff_new_pack.UNTDto/_new 2006-10-30 18:01:05.000000000 +0100 @@ -29,7 +29,7 @@ BuildRequires: python %endif Version: 2.6.18.1 -Release: 10 +Release: 11 Summary: 64-Bit Kernel for iSeries License: GNU General Public License (GPL) - all versions Group: System/Kernel @@ -125,7 +125,7 @@ -Source Timestamp: 2006/10/28 12:47:43 UTC +Source Timestamp: 2006/10/30 14:26:03 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -471,6 +471,8 @@ %files -f kernel.files %changelog -n kernel-iseries64 +* Mon Oct 30 2006 - schwab(a)suse.de +- Update mol patch. * Sat Oct 28 2006 - olh(a)suse.de - dont pull perl-Bootloader and mkinitrd during build (215218) * Sat Oct 28 2006 - olh(a)suse.de ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.UNTDto/_old 2006-10-30 18:01:05.000000000 +0100 +++ /var/tmp/diff_new_pack.UNTDto/_new 2006-10-30 18:01:05.000000000 +0100 @@ -29,7 +29,7 @@ BuildRequires: python %endif Version: 2.6.18.1 -Release: 11 +Release: 12 Summary: kernel for kdump License: GNU General Public License (GPL) - all versions Group: System/Kernel @@ -134,7 +134,7 @@ -Source Timestamp: 2006/10/28 12:47:43 UTC +Source Timestamp: 2006/10/30 14:26:03 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -480,6 +480,8 @@ %files -f kernel.files %changelog -n kernel-kdump +* Mon Oct 30 2006 - schwab(a)suse.de +- Update mol patch. * Sat Oct 28 2006 - olh(a)suse.de - dont pull perl-Bootloader and mkinitrd during build (215218) * Sat Oct 28 2006 - olh(a)suse.de ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.UNTDto/_old 2006-10-30 18:01:05.000000000 +0100 +++ /var/tmp/diff_new_pack.UNTDto/_new 2006-10-30 18:01:05.000000000 +0100 @@ -28,7 +28,7 @@ BuildRequires: python %endif Version: 2.6.18.1 -Release: 10 +Release: 11 Summary: Kernel for ppc64 Systems License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Kernel @@ -139,7 +139,7 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux-pmac-benh/CREDITS for more details. -Source Timestamp: 2006/10/28 12:47:43 UTC +Source Timestamp: 2006/10/30 14:26:03 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -485,6 +485,8 @@ %files -f kernel.files %changelog -n kernel-ppc64 +* Mon Oct 30 2006 - schwab(a)suse.de +- Update mol patch. * Sat Oct 28 2006 - olh(a)suse.de - dont pull perl-Bootloader and mkinitrd during build (215218) * Sat Oct 28 2006 - olh(a)suse.de ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.UNTDto/_old 2006-10-30 18:01:05.000000000 +0100 +++ /var/tmp/diff_new_pack.UNTDto/_new 2006-10-30 18:01:05.000000000 +0100 @@ -29,7 +29,7 @@ BuildRequires: python %endif Version: 2.6.18.1 -Release: 7 +Release: 8 Summary: The Standard Kernel License: GNU General Public License (GPL) - all versions Group: System/Kernel @@ -122,7 +122,7 @@ -Source Timestamp: 2006/10/28 12:47:43 UTC +Source Timestamp: 2006/10/30 14:26:03 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -468,6 +468,8 @@ %files -f kernel.files %changelog -n kernel-s390 +* Mon Oct 30 2006 - schwab(a)suse.de +- Update mol patch. * Sat Oct 28 2006 - olh(a)suse.de - dont pull perl-Bootloader and mkinitrd during build (215218) * Sat Oct 28 2006 - olh(a)suse.de ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.UNTDto/_old 2006-10-30 18:01:05.000000000 +0100 +++ /var/tmp/diff_new_pack.UNTDto/_new 2006-10-30 18:01:05.000000000 +0100 @@ -32,7 +32,7 @@ %endif PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status Version: 2.6.18.1 -Release: 11 +Release: 12 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 Source1: functions.sh Source2: source-post.sh @@ -100,7 +100,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/10/28 12:47:43 UTC +Source Timestamp: 2006/10/30 14:26:03 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -282,6 +282,8 @@ %files -f kernel-source.files %changelog -n kernel-source +* Mon Oct 30 2006 - schwab(a)suse.de +- Update mol patch. * Sat Oct 28 2006 - olh(a)suse.de - dont pull perl-Bootloader and mkinitrd during build (215218) * Sat Oct 28 2006 - olh(a)suse.de ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.UNTDto/_old 2006-10-30 18:01:05.000000000 +0100 +++ /var/tmp/diff_new_pack.UNTDto/_new 2006-10-30 18:01:05.000000000 +0100 @@ -49,7 +49,7 @@ Summary: Kernel Symbol Versions (modversions) Group: Development/Sources Version: 2.6.18.1 -Release: 11 +Release: 12 Requires: linux Requires: kernel-source = 2.6.18.1-%release Source11: arch-symbols @@ -84,7 +84,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/10/28 12:47:43 UTC +Source Timestamp: 2006/10/30 14:26:03 UTC %install @@ -127,6 +127,8 @@ /boot/symsets-*-*.tar.gz %changelog -n kernel-syms +* Mon Oct 30 2006 - schwab(a)suse.de +- Update mol patch. * Sat Oct 28 2006 - olh(a)suse.de - dont pull perl-Bootloader and mkinitrd during build (215218) * Sat Oct 28 2006 - olh(a)suse.de ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.UNTDto/_old 2006-10-30 18:01:06.000000000 +0100 +++ /var/tmp/diff_new_pack.UNTDto/_new 2006-10-30 18:01:06.000000000 +0100 @@ -29,7 +29,7 @@ BuildRequires: python %endif Version: 2.6.18.1 -Release: 11 +Release: 12 Summary: The User Mode Linux kernel. License: GNU General Public License (GPL) - all versions Group: System/Kernel @@ -130,7 +130,7 @@ -Source Timestamp: 2006/10/28 12:47:43 UTC +Source Timestamp: 2006/10/30 14:26:03 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -476,6 +476,8 @@ %files -f kernel.files %changelog -n kernel-um +* Mon Oct 30 2006 - schwab(a)suse.de +- Update mol patch. * Sat Oct 28 2006 - olh(a)suse.de - dont pull perl-Bootloader and mkinitrd during build (215218) * Sat Oct 28 2006 - olh(a)suse.de kernel-vanilla.spec: same change kernel-xen.spec: same change kernel-xenpae.spec: same change ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2006-10-28 14:49:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2006-10-30 17:24:16.000000000 +0100 @@ -1 +1 @@ -2006/10/28 12:47:43 UTC +2006/10/30 14:26:03 UTC ++++++ config.tar.bz2 ++++++ ++++++ kabi.tar.bz2 ++++++ ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ ++++++ patches.drivers.tar.bz2 ++++++ ++++++ patches.fixes.tar.bz2 ++++++ ++++++ patches.kernel.org.tar.bz2 ++++++ ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/suse-ppc32-mol.patch new/patches.suse/suse-ppc32-mol.patch --- old/patches.suse/suse-ppc32-mol.patch 2006-10-20 11:44:49.000000000 +0200 +++ new/patches.suse/suse-ppc32-mol.patch 2006-10-30 17:24:01.000000000 +0100 @@ -5,10 +5,10 @@ to avoid the km_ mess - drivers/macintosh/mol/_dev.c | 359 +++++++++ + drivers/macintosh/mol/_dev.c | 358 +++++++++ drivers/macintosh/mol/_fault.c | 159 ++++ - drivers/macintosh/mol/_hostirq.c | 108 ++ - drivers/macintosh/mol/_kuname.c | 42 + + drivers/macintosh/mol/_hostirq.c | 112 +++ + drivers/macintosh/mol/_kuname.c | 48 + drivers/macintosh/mol/_misc.c | 147 +++ drivers/macintosh/mol/_mmu.c | 41 + drivers/macintosh/mol/actions.c | 548 ++++++++++++++ @@ -30,21 +30,21 @@ drivers/macintosh/mol/hash.c | 126 +++ drivers/macintosh/mol/include/actions.h | 177 ++++ drivers/macintosh/mol/include/alloc.h | 70 + - drivers/macintosh/mol/include/archinclude.h | 64 + + drivers/macintosh/mol/include/archinclude.h | 73 + drivers/macintosh/mol/include/asm.m4 | 141 +++ drivers/macintosh/mol/include/asm_offsets.inc | 136 +++ drivers/macintosh/mol/include/asmdbg.h | 184 ++++ drivers/macintosh/mol/include/asmdefs.h | 397 ++++++++++ drivers/macintosh/mol/include/asmfuncs.h | 80 ++ drivers/macintosh/mol/include/atomic.h | 26 - drivers/macintosh/mol/include/config.h | 51 + + drivers/macintosh/mol/include/config.h | 90 ++ drivers/macintosh/mol/include/constants.h | 36 drivers/macintosh/mol/include/context.h | 62 + drivers/macintosh/mol/include/dbg.h | 31 drivers/macintosh/mol/include/debugger.h | 96 ++ drivers/macintosh/mol/include/emu.h | 29 drivers/macintosh/mol/include/emuaccel_sh.h | 41 + - drivers/macintosh/mol/include/extralib.h | 55 + + drivers/macintosh/mol/include/extralib.h | 70 + drivers/macintosh/mol/include/hash.h | 36 drivers/macintosh/mol/include/kernel_vars.h | 225 ++++++ drivers/macintosh/mol/include/locks.h | 39 + @@ -63,10 +63,9 @@ drivers/macintosh/mol/include/osi.h | 170 ++++ drivers/macintosh/mol/include/osi_calls.h | 475 ++++++++++++ drivers/macintosh/mol/include/performance.h | 71 + - drivers/macintosh/mol/include/platform.h | 61 + + drivers/macintosh/mol/include/platform.h | 69 + drivers/macintosh/mol/include/processor.h | 404 ++++++++++ drivers/macintosh/mol/include/prom.h | 46 + - drivers/macintosh/mol/include/reloc.h | 90 ++ drivers/macintosh/mol/include/rvec.h | 147 +++ drivers/macintosh/mol/include/skiplist.h | 87 ++ drivers/macintosh/mol/include/tlbie.h | 102 ++ @@ -82,15 +81,15 @@ drivers/macintosh/mol/mmu_tracker.c | 128 +++ drivers/macintosh/mol/mtable.c | 960 ++++++++++++++++++++++++++ drivers/macintosh/mol/ptaccess.c | 153 ++++ - drivers/macintosh/mol/sheep.c | 654 +++++++++++++++++ + drivers/macintosh/mol/sheep.c | 683 ++++++++++++++++++ drivers/macintosh/mol/skiplist.c | 222 ++++++ - 79 files changed, 14350 insertions(+) + 78 files changed, 14369 insertions(+) Index: linux-2.6.18/drivers/macintosh/mol/_dev.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/_dev.c 2005-10-10 03:22:50.000000000 +0200 -@@ -0,0 +1,359 @@ ++++ linux-2.6.18/drivers/macintosh/mol/_dev.c 2006-10-30 14:46:33.000000000 +0100 +@@ -0,0 +1,358 @@ +/* + * Creation Date: <2003/08/20 17:31:44 samuel> + * Time-stamp: <2004/02/14 14:43:13 samuel> @@ -108,7 +107,6 @@ + */ + +#include "archinclude.h" -+#include <linux/config.h> +#include <linux/module.h> +#include <linux/miscdevice.h> +#include <linux/spinlock.h> @@ -453,7 +451,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/_fault.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/_fault.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/_fault.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,159 @@ +/* + * Creation Date: <2002/06/08 21:01:54 samuel> @@ -617,8 +615,8 @@ Index: linux-2.6.18/drivers/macintosh/mol/_kuname.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/_kuname.c 2006-09-05 08:36:47.000000000 +0200 -@@ -0,0 +1,42 @@ ++++ linux-2.6.18/drivers/macintosh/mol/_kuname.c 2006-10-30 14:46:33.000000000 +0100 +@@ -0,0 +1,48 @@ +/* + * Creation Date: <2001/08/15 01:11:01 samuel> + * Time-stamp: <2003/10/24 10:22:00 samuel> @@ -635,12 +633,18 @@ + * + */ + -+#include <linux/config.h> +#include <linux/version.h> ++ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) +#include <linux/utsrelease.h> +#endif + ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++#include <linux/config.h> ++#else ++#include <linux/autoconf.h> ++#endif ++ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) + +#ifdef CONFIG_SMP @@ -664,7 +668,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/_misc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/_misc.c 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/_misc.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,147 @@ +/* + * Creation Date: <97/05/26 02:10:43 samuel> @@ -816,7 +820,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/_mmu.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/_mmu.c 2006-09-05 08:39:32.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/_mmu.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,41 @@ +/* + * Creation Date: <2002/07/13 13:58:00 samuel> @@ -862,7 +866,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/context.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/context.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/context.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,99 @@ +/* + * Creation Date: <1998-11-20 16:18:20 samuel> @@ -966,7 +970,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/emu.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/emu.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/emu.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,228 @@ +/* + * Creation Date: <1998-11-21 16:07:47 samuel> @@ -1199,7 +1203,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/fault.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/fault.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/fault.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,596 @@ +/* + * Creation Date: <2002/06/08 20:53:20 samuel> @@ -1800,7 +1804,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/init.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/init.c 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/init.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,191 @@ +/* + * Creation Date: <2002/01/13 20:45:37 samuel> @@ -1996,7 +2000,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/misc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/misc.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/misc.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,255 @@ +/* + * Creation Date: <2003/06/06 20:00:52 samuel> @@ -2256,7 +2260,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/mmu.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/mmu.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/mmu.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,251 @@ +/* + * Creation Date: <1998-11-11 11:56:45 samuel> @@ -2512,7 +2516,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/mmu_fb.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/mmu_fb.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/mmu_fb.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,186 @@ +/* + * Creation Date: <1999-12-28 14:03:18 samuel> @@ -2703,7 +2707,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/mmu_io.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/mmu_io.c 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/mmu_io.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,467 @@ +/* + * Creation Date: <1998-12-02 03:23:31 samuel> @@ -3175,7 +3179,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/mmu_tracker.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/mmu_tracker.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/mmu_tracker.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,128 @@ +/* + * Creation Date: <2000/09/07 20:36:54 samuel> @@ -3308,7 +3312,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/mtable.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/mtable.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/mtable.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,960 @@ +/* + * Creation Date: <2002/05/26 14:46:42 samuel> @@ -4273,7 +4277,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/ptaccess.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/ptaccess.c 2005-10-10 03:22:49.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/ptaccess.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,153 @@ +/* + * Creation Date: <2001/03/25 18:04:45 samuel> @@ -4431,7 +4435,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/skiplist.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/skiplist.c 2006-09-05 08:40:21.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/skiplist.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,222 @@ +/* + * Creation Date: <2003/03/03 23:19:47 samuel> @@ -4658,7 +4662,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/alloc.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/alloc.h 2006-09-05 16:17:11.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/include/alloc.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,70 @@ +/* + * Creation Date: <2002/01/13 16:35:18 samuel> @@ -4733,8 +4737,8 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/archinclude.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/archinclude.h 2005-01-18 00:07:06.000000000 +0100 -@@ -0,0 +1,64 @@ ++++ linux-2.6.18/drivers/macintosh/mol/include/archinclude.h 2006-10-30 14:46:33.000000000 +0100 +@@ -0,0 +1,73 @@ +/* + * Creation Date: <2002/01/12 22:11:51 samuel> + * Time-stamp: <2004/04/10 22:27:41 samuel> @@ -4761,9 +4765,18 @@ +#include "mol_config.h" +#include "kconfig.h" + -+#include <linux/config.h> +#include <linux/version.h> + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) ++#include <linux/utsrelease.h> ++#endif ++ ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) ++#include <linux/config.h> ++#else ++#include <linux/autoconf.h> ++#endif ++ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) +#define LINUX_26 +#endif @@ -4802,7 +4815,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/asmdefs.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/asmdefs.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/asmdefs.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,397 @@ +/* -*- asm -*- + * @@ -5204,7 +5217,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/asmfuncs.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/asmfuncs.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/asmfuncs.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,80 @@ +/* + * Creation Date: <1999/09/26 01:02:58 samuel> @@ -5289,37 +5302,58 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/config.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/config.h 2006-10-20 10:50:27.000000000 +0200 -@@ -0,0 +1,51 @@ -+/* src/shared/config.h. Generated automatically by configure. */ -+/* src/shared/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ ++++ linux-2.6.18/drivers/macintosh/mol/include/config.h 2006-10-30 14:47:20.000000000 +0100 +@@ -0,0 +1,90 @@ ++/* config.h. Generated from config.h.in by configure. */ ++/* config.h.in. Generated from configure.in by autoheader. */ + -+/* Define if the X Window System is missing or not being used. */ -+/* #undef X_DISPLAY_MISSING */ ++/* Define if _syscall macro is borken */ ++#define BROKEN_SYSCALL 1 + -+/* Define if you have the <getopt.h> header file. */ ++/* Defined if ALSA support is available */ ++#define HAVE_ALSA 1 ++ ++/* Define if clearenv is available */ ++#define HAVE_CLEARENV 1 ++ ++/* Define to 1 if you have the <getopt.h> header file. */ +#define HAVE_GETOPT_H 1 + -+/* Define if you have the <obstack.h> header file. */ ++/* Define to 1 if you have the <inttypes.h> header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the <memory.h> header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the <obstack.h> header file. */ +#define HAVE_OBSTACK_H 1 + -+/* Define if you have the <poll.h> header file. */ ++/* Define if libpng support is to be included */ ++#define HAVE_PNG 1 ++ ++/* Define to 1 if you have the <poll.h> header file. */ +#define HAVE_POLL_H 1 + -+/* Define if you have the <stdlib.h> header file. */ ++/* Define to 1 if you have the <stdint.h> header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + -+/* Define if you have the <string.h> header file. */ ++/* Define to 1 if you have the <strings.h> header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + -+/* Define if you have the <strings.h> header file. */ -+#define HAVE_STRINGS_H 1 ++/* Define to 1 if you have the <sys/stat.h> header file. */ ++#define HAVE_SYS_STAT_H 1 + -+/* Define if clearenv is available */ -+#define HAVE_CLEARENV 1 ++/* Define to 1 if you have the <sys/types.h> header file. */ ++#define HAVE_SYS_TYPES_H 1 + -+/* Defined if ALSA support is available */ -+#define HAVE_ALSA 1 ++/* Define to 1 if you have the <unistd.h> header file. */ ++#define HAVE_UNISTD_H 1 + +/* Define if X11 is available */ +#define HAVE_X11 1 @@ -5327,25 +5361,43 @@ +/* Define if XDGA support is to be included */ +#define HAVE_XDGA 1 + ++/* Defined for the MOL user binary */ ++#define MOL_PROPER 1 ++ +/* Define if off_t is known to be 64-bit */ -+/* #undef OFF_T_IS_64 */ ++#define OFF_T_IS_64 1 + -+/* Define if _syscall macro is borken */ -+/* #undef BROKEN_SYSCALL */ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "" ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 + +/* Define if uc_context has gregs field */ +/* #undef UCCONTEXT_HAS_GREGS */ + -+/* Define if libpng support is to be included */ -+#define HAVE_PNG 1 -+ -+/* Defined for the MOL user binary */ -+#define MOL_PROPER 1 ++/* Define to 1 if the X Window System is missing or not being used. */ ++/* #undef X_DISPLAY_MISSING */ + ++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a ++ `char[]'. */ ++#define YYTEXT_POINTER 1 Index: linux-2.6.18/drivers/macintosh/mol/include/constants.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/constants.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/constants.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,36 @@ +/* + * Creation Date: <2001/02/11 18:19:42 samuel> @@ -5386,7 +5438,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/emu.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/emu.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/emu.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,29 @@ +/* + * Creation Date: <2003/01/26 00:45:55 samuel> @@ -5420,7 +5472,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/emuaccel_sh.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/emuaccel_sh.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/emuaccel_sh.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,41 @@ +/* + * Creation Date: <2003/01/25 14:57:36 samuel> @@ -5466,7 +5518,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/kernel_vars.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/kernel_vars.h 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/include/kernel_vars.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,225 @@ +/* + * Creation Date: <97/07/14 15:53:06 samuel> @@ -5696,7 +5748,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/mac_registers.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/mac_registers.h 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/include/mac_registers.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,168 @@ +/* + * Creation Date: <97/06/24 22:25:04 samuel> @@ -5869,7 +5921,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/misc.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/misc.h 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/include/misc.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,107 @@ +/* + * Creation Date: <97/06/16 18:02:12 samuel> @@ -5981,7 +6033,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/mmu.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/mmu.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/mmu.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,102 @@ +/* + * Creation Date: <1998-11-11 13:55:49 samuel> @@ -6088,7 +6140,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/mmu_contexts.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/mmu_contexts.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/mmu_contexts.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,55 @@ +/* + * Creation Date: <97/07/17 14:26:14 samuel> @@ -6148,7 +6200,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/mmu_mappings.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/mmu_mappings.h 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/include/mmu_mappings.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,48 @@ +/* + * Creation Date: <1998-10-31 03:11:06 samuel> @@ -6201,7 +6253,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/mmutypes.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/mmutypes.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/mmutypes.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,76 @@ +/* + * Creation Date: <2002/01/13 13:53:14 samuel> @@ -6282,7 +6334,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/mol-ioctl.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/mol-ioctl.h 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/include/mol-ioctl.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,121 @@ +/* + * Creation Date: <2003/08/26 10:53:07 samuel> @@ -6408,7 +6460,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/mol_config.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/mol_config.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/mol_config.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,76 @@ +/* + * Creation Date: <1999/05/30 15:30:25 samuel> @@ -6489,7 +6541,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/molasm.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/molasm.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/molasm.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,138 @@ +/* -*- asm -*- + * @@ -6632,18 +6684,18 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/molversion.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/molversion.h 2006-10-20 11:04:17.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/include/molversion.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,6 @@ -+#define MOL_BUILD_DATE "Oct 20 2006 09:04" ++#define MOL_BUILD_DATE "Oct 30 2006 13:42" +#define MOL_VERSION_STR "0.9.71" -+#define MOL_RELEASE "0.9.71" ++#define MOL_RELEASE "0.9.71.1" +#define MOL_MAJOR_VERSION 0 +#define MOL_MINOR_VERSION 9 +#define MOL_PATCHLEVEL 71 Index: linux-2.6.18/drivers/macintosh/mol/include/mtable.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/mtable.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/mtable.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,71 @@ +/* + * Creation Date: <2002/05/26 15:52:50 samuel> @@ -6719,7 +6771,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/osi.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/osi.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/osi.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,170 @@ +/* + * Creation Date: <1999/03/18 03:19:43 samuel> @@ -6894,7 +6946,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/performance.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/performance.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/performance.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,71 @@ +/* + * Creation Date: <2001/04/01 00:44:40 samuel> @@ -6970,7 +7022,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/processor.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/processor.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/processor.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,404 @@ +/* + * Creation Date: <2000/10/29 01:43:29 samuel> @@ -7379,7 +7431,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/prom.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/prom.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/prom.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,46 @@ +/* + * Creation Date: <1999/02/22 23:22:17 samuel> @@ -7427,105 +7479,10 @@ +} mol_device_node_t; + +#endif /* _H_PROM */ -Index: linux-2.6.18/drivers/macintosh/mol/include/reloc.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/reloc.h 2006-10-20 10:50:27.000000000 +0200 -@@ -0,0 +1,90 @@ -+/* -+ * Creation Date: <1999/09/25 17:25:30 samuel> -+ * Time-stamp: <2003/08/12 00:40:40 samuel> -+ * -+ * <reloc.h> -+ * -+ * Definitions used to move criticalal low-level parts -+ * of the code to continuous physical memory. -+ * -+ * Copyright (C) 1999, 2000, 2001, 2002, 2003 Samuel Rydh (samuel(a)ibrium.se) -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation -+ * -+ */ -+ -+#ifndef _H_RELOC -+#define _H_RELOC -+ -+/* Special 'action symbols' are used to dynamically modify the assembly code. -+ * The script relbuild.pl is used to store information about relocations -+ * and special actions in a C-table. -+ * -+ * Reloc actions are performed when the code is relocated at module -+ * initialization. Hook actions are performed when the first session -+ * is initialized. The remaining actions are used to resolve addresses -+ * of dynamic symbols. -+ */ -+ -+#define NO_ACTION 0 -+#define ACTION_SESSION_TABLE 1 -+ -+#define FIRST_RELOC_ACTION 4 -+#define ACTION_LI_PHYS 5 /* dest_reg, addr_offs */ -+#define ACTION_LWZ_PHYSADDR_R 6 /* dest_reg*32 + reg, addr_offs */ -+#define ACTION_TOPHYS 7 /* dest_reg*32 + src_reg */ -+#define ACTION_TOVIRT 8 /* dest_reg*32 + src_reg */ -+#define LAST_RELOC_ACTION 8 -+ -+#define FIRST_HOOK_ACTION 10 -+#define ACTION_RELOC_HOOK 11 /* trigger, size, vret_action#, vret_offs */ -+#define ACTION_VRET 12 -+#define ACTION_HOOK_FUNCTION 13 -+#define ACTION_RELOCATE_LOW 14 /* not a hook but it fits here... */ -+#define LAST_HOOK_ACTION 14 -+ -+#define MAX_ACTION 15 /* used to loop the actions */ -+ -+/* Function hooks */ -+#define FHOOK_FLUSH_HASH_PAGE 1 -+ -+ -+#ifdef ACTION_SYM_GREPPING -+#define ACTION_SYMBOL( sym_name, action ) \ -+ ACTION_SYM_START,##sym_name,##action,ACTION_SYM_END -+#define GLOBAL_SYMBOL( sym_name ) \ -+ GLOBAL_SYM_START,##sym_name,GLOBAL_SYM_END -+#else -+#define ACTION_SYMBOL( sym_name, dummy2 ) \ -+GLOBL(sym_name): -+#define GLOBAL_SYMBOL( sym_name ) \ -+GLOBL(sym_name) -+#endif -+ -+ -+#ifndef __ASSEMBLY__ -+ -+extern int reloc_virt_offs; -+#define reloc_ptr( v ) ((ulong)(v) + (ulong)reloc_virt_offs) -+ -+enum { -+ MOL_R_PPC_ADDR16_LO = 1, -+ MOL_R_PPC_ADDR16_HA, -+ MOL_R_PPC_ADDR16_HI, -+ MOL_R_PPC_ADDR32 -+ /* unsupported */ -+ /* MOL_R_PPC_REL24, */ -+ /* MOL_R_PPC_REL14, */ -+}; -+ -+typedef struct reloc_table { -+ unsigned long inst_offs; -+ int action; -+ int rtype; -+ unsigned long offs; -+} reloc_table_t, reloc_table_entry_t; -+#endif -+ -+#endif /* _H_RELOC */ Index: linux-2.6.18/drivers/macintosh/mol/include/rvec.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/rvec.h 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/include/rvec.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,147 @@ +/* + * Creation Date: <2001/01/26 21:33:45 samuel> @@ -7677,7 +7634,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/skiplist.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/skiplist.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/skiplist.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,87 @@ +/* + * Creation Date: <2003/03/03 22:59:04 samuel> @@ -7769,7 +7726,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/tlbie.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/tlbie.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/tlbie.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,102 @@ +/* + * Creation Date: <2003/05/27 16:56:10 samuel> @@ -7876,7 +7833,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/vector.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/vector.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/vector.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,189 @@ +/* + * Creation Date: <2003/05/26 00:00:28 samuel> @@ -8070,7 +8027,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/version.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/version.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/version.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,11 @@ + +#ifndef _H_VERSION @@ -8086,7 +8043,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/weaksym.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/weaksym.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/weaksym.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,39 @@ +/* + * Creation Date: <2001/08/02 23:53:57 samuel> @@ -8130,7 +8087,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/603.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/603.S 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/603.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,218 @@ +/* + * Creation Date: <2001/06/15 20:10:49 samuel> @@ -8353,7 +8310,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/dec.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/dec.S 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/dec.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,228 @@ +/* + * Creation Date: <2001/06/21 17:10:35 samuel> @@ -8586,7 +8543,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/emuaccel.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/emuaccel.S 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/emuaccel.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,188 @@ +/* + * Creation Date: <2003/01/24 13:54:52 samuel> @@ -8779,7 +8736,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/emulation.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/emulation.S 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/emulation.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,714 @@ +/* + * Creation Date: <97/07/26 18:23:02 samuel> @@ -9498,7 +9455,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/entry.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/entry.S 2005-10-12 18:35:15.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/entry.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,433 @@ +/* + * Creation Date: <2001/01/30 00:22:35 samuel> @@ -9936,7 +9893,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/iopage.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/iopage.S 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/iopage.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,89 @@ +/* + * Creation Date: <97/07/26 18:23:02 samuel> @@ -10030,7 +9987,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/linux.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/linux.S 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/linux.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,129 @@ +/* + * Creation Date: <2001/02/24 14:08:28 samuel> @@ -10164,7 +10121,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/ptintercept.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/ptintercept.S 2005-10-10 03:22:49.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/ptintercept.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,303 @@ +/* + * Creation Date: <2001/03/17 18:00:05 samuel> @@ -10472,7 +10429,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/splitmode.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/splitmode.S 2005-10-12 18:35:39.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/splitmode.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,428 @@ +/* + * Creation Date: <2000/07/11 03:38:32 samuel> @@ -10905,7 +10862,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/traps.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/traps.S 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/traps.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,501 @@ +/* + * Creation Date: <2001/01/27 16:25:14 samuel> @@ -11411,7 +11368,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm-files/vsid.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm-files/vsid.S 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/asm-files/vsid.S 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,123 @@ +/* + * Creation Date: <2003/03/06 22:03:59 samuel> @@ -11539,7 +11496,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/asm_offsets.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/asm_offsets.c 2005-10-10 03:22:50.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/asm_offsets.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,161 @@ +/* + * This program is used to generate definitions needed by @@ -11705,7 +11662,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/asm_offsets.inc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/asm_offsets.inc 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/asm_offsets.inc 2006-10-30 14:46:50.000000000 +0100 @@ -0,0 +1,136 @@ +/* -*-c-*- + * Creation Date: <2001/10/20 17:51:10 samuel> @@ -11846,7 +11803,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/debugger.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/debugger.h 2006-10-20 10:50:27.000000000 +0200 ++++ linux-2.6.18/drivers/macintosh/mol/include/debugger.h 2006-10-28 20:59:02.000000000 +0200 @@ -0,0 +1,96 @@ +/* + * Creation Date: <1999/02/22 22:46:22 samuel> @@ -11947,11 +11904,11 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/extralib.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/extralib.h 2006-10-20 10:50:27.000000000 +0200 -@@ -0,0 +1,55 @@ ++++ linux-2.6.18/drivers/macintosh/mol/include/extralib.h 2006-10-28 20:59:02.000000000 +0200 +@@ -0,0 +1,70 @@ +/* + * Creation Date: <1997/07/02 19:52:18 samuel> -+ * Time-stamp: <2004/01/18 00:57:48 samuel> ++ * Time-stamp: <2004/04/03 18:29:26 samuel> + * + * <extralib.h> + * @@ -11983,6 +11940,12 @@ +extern char *strncat3( char *dest, const char *s1, const char *s2, size_t n ); +extern char *strnpad( char *dest, const char *s1, size_t n ); + ++struct iovec; ++extern int memcpy_tovec( const struct iovec *vec, size_t nvec, const char *src, unsigned int len ); ++extern int memcpy_fromvec( char *dst, const struct iovec *vec, size_t nvec, unsigned int len ); ++extern int iovec_getbyte( int offs, const struct iovec *vec, size_t nvec ); ++extern int iovec_skip( int skip, struct iovec *vec, size_t nvec ); ++ +extern void open_logfile( const char *filename ); +extern void close_logfile( void ); + @@ -11992,10 +11955,10 @@ +extern void perrorm(const char *fmt,... ) __printf_format; +extern void fatal(const char *fmt,... ) __printf_format __attribute__((noreturn)); +#define fatal_err(fmt, args...) \ -+ { printm("Fatal\n"); perrorm(fmt, ## args ); exit(1); } ++ do { printm("Fatal error: "); perrorm(fmt, ## args ); exit(1); } while(0) +extern void fail_nil( void *p ); +extern void set_print_hook( int (*hook)(char *buf) ); -+extern void set_print_guard( void (*hook)( void ) ); ++extern void set_print_guard( void (*hook)(void) ); + +extern int script_exec( char *name, char *arg1, char *arg2 ); + @@ -12003,15 +11966,24 @@ +extern int asc2uni( unsigned char *ustr, const char *astr, int maxlen ); +extern int uni2asc( char *astr, const unsigned char *ustr, int ustrlen, int maxlen ); + ++/* in backtrace.c */ ++extern void print_btrace_sym( ulong addr, const char *sym_filename ); ++ ++/* color output support */ ++#define C_GREEN "\33[1;32m" ++#define C_YELLOW "\33[1;33m" ++#define C_NORMAL "\33[0;39m" ++#define C_RED "\33[1;31m" ++ +#endif /* _H_EXTRALIB */ Index: linux-2.6.18/drivers/macintosh/mol/include/platform.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/platform.h 2006-10-20 10:50:27.000000000 +0200 -@@ -0,0 +1,61 @@ ++++ linux-2.6.18/drivers/macintosh/mol/include/platform.h 2006-10-28 20:59:02.000000000 +0200 +@@ -0,0 +1,69 @@ +/* + * Creation Date: <2001/12/29 19:46:46 samuel> -+ * Time-stamp: <2003/08/09 23:46:32 samuel> ++ * Time-stamp: <2004/02/07 16:51:57 samuel> + * + * <platform.h> + * @@ -12069,11 +12041,19 @@ +static inline int clearenv( void ) { extern char **environ; environ=NULL; return 0; } +#endif + ++#ifdef __darwin__ ++#define ARCH_STR "osx" ++#endif ++ ++#ifdef __linux__ ++#define ARCH_STR "linux" ++#endif ++ +#endif /* _H_PLATFORM */ Index: linux-2.6.18/drivers/macintosh/mol/include/asm.m4 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/asm.m4 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/asm.m4 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,141 @@ +/* -*- asm -*- + * Creation Date: <2001/12/30 20:08:53 samuel> @@ -12219,8 +12199,8 @@ Index: linux-2.6.18/drivers/macintosh/mol/sheep.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/sheep.c 2005-10-10 03:54:32.000000000 +0200 -@@ -0,0 +1,654 @@ ++++ linux-2.6.18/drivers/macintosh/mol/sheep.c 2006-10-28 20:59:02.000000000 +0200 +@@ -0,0 +1,683 @@ +/* + * sheep_net.c - Linux driver for SheepShaver/Basilisk II networking (access to raw Ethernet packets) + * @@ -12591,8 +12571,14 @@ +} + +static ssize_t ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) ++sheep_net_aio_read(struct kiocb *iocb, const struct iovec *iv, unsigned long count, loff_t pos) ++{ ++ struct file *f = iocb->ki_filp; ++#else /* Linux 2.6.18 or older */ +sheep_net_readv( struct file *f, const struct iovec *iv, unsigned long count, loff_t *pos ) +{ ++#endif + struct SheepVars *v = (struct SheepVars *)f->private_data; + struct sk_buff *skb; + int size = get_iovsize( iv, count ); @@ -12621,8 +12607,14 @@ +} + +static ssize_t ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) ++sheep_net_aio_write(struct kiocb *iocb, const struct iovec *iv, unsigned long count, loff_t off) ++{ ++ struct file *f = iocb->ki_filp; ++#else /* Linux 2.6.18 or older */ +sheep_net_writev( struct file *f, const struct iovec *iv, unsigned long count, loff_t *off ) +{ ++#endif + struct SheepVars *v = (struct SheepVars *)f->private_data; + struct sk_buff *skb; + int size = get_iovsize( iv, count ); @@ -12694,6 +12686,8 @@ + return size; +} + ++/* We take care of this using do_sync_* instead in 2.6.19 and newer */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) +static ssize_t +sheep_net_read( struct file *f, char *buf, size_t count, loff_t *off ) +{ @@ -12711,6 +12705,7 @@ + iv.iov_base = (char *)buf; + return sheep_net_writev( f, &iv, 1, off ); +} ++#endif + +static unsigned int +sheep_net_poll( struct file *f, struct poll_table_struct *wait ) @@ -12846,6 +12841,19 @@ +/* init / cleanup */ +/************************************************************************/ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) ++static struct file_operations sheep_net_fops = { ++ .owner = THIS_MODULE, ++ .read = do_sync_read, ++ .aio_read = sheep_net_aio_read, ++ .write = do_sync_write, ++ .aio_write = sheep_net_aio_write, ++ .poll = sheep_net_poll, ++ .ioctl = sheep_net_ioctl, ++ .open = sheep_net_open, ++ .release = sheep_net_release, ++}; ++#else +static struct file_operations sheep_net_fops = { + .owner = THIS_MODULE, + .read = sheep_net_read, @@ -12857,6 +12865,7 @@ + .open = sheep_net_open, + .release = sheep_net_release, +}; ++#endif + +static struct miscdevice sheep_net_device = { + .minor = SHEEP_NET_MINOR, @@ -12878,8 +12887,8 @@ Index: linux-2.6.18/drivers/macintosh/mol/_hostirq.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/_hostirq.c 2005-11-26 20:25:55.000000000 +0100 -@@ -0,0 +1,108 @@ ++++ linux-2.6.18/drivers/macintosh/mol/_hostirq.c 2006-10-30 14:46:33.000000000 +0100 +@@ -0,0 +1,112 @@ +/* + * <hostirq.c> + * @@ -12909,7 +12918,11 @@ +#include "atomic.h" + +irqreturn_t ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19) ++hostirq_handler(int irq, void *pkv) ++#else +hostirq_handler(int irq, void *pkv, struct pt_regs *regs) ++#endif +{ + siginfo_t si; + kernel_vars_t *kv = (kernel_vars_t *) pkv; @@ -12991,7 +13004,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/actions.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/actions.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/actions.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,548 @@ +/* + * Creation Date: <2001/04/07 17:33:52 samuel> @@ -13544,7 +13557,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/hash.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/hash.c 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/hash.c 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,126 @@ +/* + * Creation Date: <2004/02/14 11:42:19 samuel> @@ -13675,7 +13688,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/actions.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/actions.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/actions.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,177 @@ +/* + * Creation Date: <2004/01/31 13:08:42 samuel> @@ -13857,7 +13870,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/atomic.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/atomic.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/atomic.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,26 @@ +/* + * Creation Date: <2004/01/25 17:00:12 samuel> @@ -13888,7 +13901,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/context.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/context.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/context.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,62 @@ +/* + * Creation Date: <2004/01/25 17:48:51 samuel> @@ -13955,7 +13968,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/hash.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/hash.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/hash.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,36 @@ +/* + * Creation Date: <2004/02/14 11:45:23 samuel> @@ -13996,7 +14009,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/locks.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/locks.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/locks.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,39 @@ +/* + * Creation Date: <2004/01/25 16:31:13 samuel> @@ -14040,7 +14053,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/map.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/map.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/map.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,43 @@ +/* + * Creation Date: <2004/03/13 13:25:42 samuel> @@ -14088,7 +14101,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/osi_calls.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/osi_calls.h 2005-01-18 00:07:07.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/osi_calls.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,475 @@ +/* + * Creation Date: <2002/06/16 01:40:57 samuel> @@ -14568,7 +14581,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/uaccess.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/uaccess.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/uaccess.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,36 @@ +/* + * Creation Date: <2004/02/01 20:02:11 samuel> @@ -14609,7 +14622,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/dbg.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/dbg.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/dbg.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,31 @@ +/* + * Creation Date: <2004/04/10 22:14:43 samuel> @@ -14645,7 +14658,7 @@ Index: linux-2.6.18/drivers/macintosh/mol/include/asmdbg.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18/drivers/macintosh/mol/include/asmdbg.h 2005-01-18 00:07:06.000000000 +0100 ++++ linux-2.6.18/drivers/macintosh/mol/include/asmdbg.h 2006-10-30 14:46:33.000000000 +0100 @@ -0,0 +1,184 @@ +/* + * Creation Date: <2004/01/29 20:12:41 samuel> ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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