June 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-ncurses
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Sat Jun 3 01:03:15 CEST 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-05-30 11:59:02.000000000 +0200 +++ yast2-ncurses/yast2-ncurses.changes 2006-06-02 17:23:29.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 2 17:21:59 CEST 2006 - gs(a)suse.de + +- Online Update: make resetting of status Taboo and Protected + possible (related to bug #174476) +- 2.13.36 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.13.35.tar.bz2 New: ---- yast2-ncurses-2.13.36.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.ZgSlNm/_old 2006-06-03 01:02:04.000000000 +0200 +++ /var/tmp/diff_new_pack.ZgSlNm/_new 2006-06-03 01:02:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.13.35) +# spec file for package yast2-ncurses (Version 2.13.36) # # 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-ncurses -Version: 2.13.35 +Version: 2.13.36 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.13.35.tar.bz2 +Source0: yast2-ncurses-2.13.36.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -41,7 +41,7 @@ %prep -%setup -n yast2-ncurses-2.13.35 +%setup -n yast2-ncurses-2.13.36 %build %{prefix}/bin/y2tool y2autoconf @@ -74,6 +74,10 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses +* Fri Jun 02 2006 - gs(a)suse.de +- Online Update: make resetting of status Taboo and Protected + possible (related to bug #174476) +- 2.13.36 * Tue May 30 2006 - gs(a)suse.de - Added support for licenses for patches (bug #174476) - 2.13.35 ++++++ yast2-ncurses-2.13.35.tar.bz2 -> yast2-ncurses-2.13.36.tar.bz2 ++++++ ++++ 15178 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-ncurses-2.13.35/VERSION new/yast2-ncurses-2.13.36/VERSION --- old/yast2-ncurses-2.13.35/VERSION 2006-05-30 11:59:09.000000000 +0200 +++ new/yast2-ncurses-2.13.36/VERSION 2006-06-02 17:23:40.000000000 +0200 @@ -1 +1 @@ -2.13.35 +2.13.36 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-ncurses-2.13.35/src/ObjectStatStrategy.cc new/yast2-ncurses-2.13.36/src/ObjectStatStrategy.cc --- old/yast2-ncurses-2.13.35/src/ObjectStatStrategy.cc 2006-05-17 17:30:52.000000000 +0200 +++ new/yast2-ncurses-2.13.36/src/ObjectStatStrategy.cc 2006-05-31 13:02:51.000000000 +0200 @@ -429,6 +429,12 @@ case S_NoInst: newStatus = S_Install ; break; + case S_Taboo: + newStatus = S_NoInst; + break; + case S_Protected: + newStatus = S_KeepInstalled; + break; default: newStatus = oldStatus; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-packager checked in at Sat Jun 3 01:03:12 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-06-02 11:20:51.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-06-02 16:30:31.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 2 16:09:05 CEST 2006 - lslezak(a)suse.cz + +- run the solver after selecting a Xen kernel (#178306) +- fixes in SourceManager module (nil check, infinite loops) +- 2.13.125 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.124.tar.bz2 New: ---- yast2-packager-2.13.125.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.5VJwvb/_old 2006-06-03 01:02:16.000000000 +0200 +++ /var/tmp/diff_new_pack.5VJwvb/_new 2006-06-03 01:02:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.124) +# spec file for package yast2-packager (Version 2.13.125) # # 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.124 +Version: 2.13.125 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.124.tar.bz2 +Source0: yast2-packager-2.13.125.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-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -43,7 +43,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.124 +%setup -n yast2-packager-2.13.125 %build %{prefix}/bin/y2tool y2autoconf @@ -80,6 +80,10 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Fri Jun 02 2006 - lslezak(a)suse.cz +- run the solver after selecting a Xen kernel (#178306) +- fixes in SourceManager module (nil check, infinite loops) +- 2.13.125 * Fri Jun 02 2006 - jsrain(a)suse.cz - log Report messages by default (bug 180862) - 2.13.124 ++++++ yast2-packager-2.13.124.tar.bz2 -> yast2-packager-2.13.125.tar.bz2 ++++++ ++++ 2806 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.124/VERSION new/yast2-packager-2.13.125/VERSION --- old/yast2-packager-2.13.124/VERSION 2006-06-02 11:07:24.000000000 +0200 +++ new/yast2-packager-2.13.125/VERSION 2006-06-02 16:12:15.000000000 +0200 @@ -1 +1 @@ -2.13.124 +2.13.125 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.124/configure.in new/yast2-packager-2.13.125/configure.in --- old/yast2-packager-2.13.124/configure.in 2006-06-02 11:18:30.000000000 +0200 +++ new/yast2-packager-2.13.125/configure.in 2006-06-02 16:29:06.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.124, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.13.125, 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.124" +VERSION="2.13.125" RPMNAME="yast2-packager" 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-packager-2.13.124/src/modules/Packages.ycp new/yast2-packager-2.13.125/src/modules/Packages.ycp --- old/yast2-packager-2.13.124/src/modules/Packages.ycp 2006-06-01 10:08:44.000000000 +0200 +++ new/yast2-packager-2.13.125/src/modules/Packages.ycp 2006-06-02 16:18:48.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 31221 2006-06-01 08:08:41Z jsrain $ + * $Id: Packages.ycp 31293 2006-06-02 14:18:41Z lslezak $ */ { @@ -1252,8 +1252,13 @@ if (xen_selected) { + // run the solver if a package is selected + boolean run_solver = false; + if (contains (Kernel::GetPackages (), "kernel-bigsmp")) { + run_solver = !Pkg::IsSelected("kernel-xenpae"); + y2milestone("Selected Xen kernel: kernel-xenpae"); // install PAE Xen Pkg::PkgNeutral("kernel-xen"); @@ -1261,11 +1266,19 @@ } else { + run_solver = !Pkg::IsSelected("kernel-xen"); + y2milestone("Selected Xen kernel: kernel-xen"); // install standard Xen Pkg::PkgNeutral("kernel-xenpae"); Pkg::PkgInstall("kernel-xen"); } + + y2milestone("run_solver: %1", run_solver); + if (run_solver) + { + Pkg::PkgSolve(true); + } } y2milestone ("proposal %1", output); 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.124/src/modules/SourceManager.ycp new/yast2-packager-2.13.125/src/modules/SourceManager.ycp --- old/yast2-packager-2.13.124/src/modules/SourceManager.ycp 2006-05-15 13:28:31.000000000 +0200 +++ new/yast2-packager-2.13.125/src/modules/SourceManager.ycp 2006-06-02 16:18:48.000000000 +0200 @@ -7,7 +7,7 @@ * Martin Vidner <mvidner(a)suse.cz> * Status: Work in Progress * - * $Id: SourceManager.ycp 30898 2006-05-12 14:11:48Z mvidner $ + * $Id: SourceManager.ycp 31293 2006-06-02 14:18:41Z lslezak $ * * Representation of the configuration of source-manager. * Input and output routines. @@ -425,7 +425,9 @@ { id = sourceStatesOut[i, "SrcId"]:-1; break; - } + } + + i = i + 1; } return id; @@ -443,6 +445,11 @@ map g = Pkg::SourceGeneralData( source ); y2milestone("generalData: %1", g); map p = Pkg::SourceProductData( source ); + if (p == nil) + { + p = $[]; + } + y2milestone("productData: %1", p); return ((map)union(g,p)); } @@ -541,6 +548,8 @@ sourceStatesOut = remove( sourceStatesOut, i ); break; } + + i = i + 1; } return; 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.124/src/modules/test.ycp new/yast2-packager-2.13.125/src/modules/test.ycp --- old/yast2-packager-2.13.124/src/modules/test.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.125/src/modules/test.ycp 2005-11-02 13:29:02.000000000 +0100 @@ -0,0 +1,58 @@ + +{ + 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 xorg-x11
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Sat Jun 3 01:02:06 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-05-31 18:24:45.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-06-02 16:22:49.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Jun 2 12:25:54 CEST 2006 - sndirsch(a)suse.de + +- pc_xf86-pci.diff: + * fixes broken BIOS reading (due to changes in recent Linux + kernels), which is required for dual card support (Bug #171453, + X.Org Bug #6751) +- removed no longer required patch + "p_xlib_skip_select_substructure_redirect.diff" again (Bug #151836) + +------------------------------------------------------------------- Old: ---- p_xlib_skip_select_substructure_redirect.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.T9xuj4/_old 2006-06-03 01:01:28.000000000 +0200 +++ /var/tmp/diff_new_pack.T9xuj4/_new 2006-06-03 01:01:28.000000000 +0200 @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 56 +Release: 57 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -124,7 +124,6 @@ Patch365: p_xorg-fbcompose-radek2.diff Patch366: pc_xf86-pci.diff Patch367: p_xlib_skip_ext_env.diff -Patch368: p_xlib_skip_select_substructure_redirect.diff Patch400: p_bug96328.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1559,12 +1558,10 @@ %endif pushd programs/Xserver/ %patch365 -p0 -# needs to be rewritten first -#%patch366 -p0 popd +%patch366 -p0 pushd lib/X11 %patch367 -p0 -%patch368 -p0 popd # UTS_RELEASE=`uname -r` @@ -2723,6 +2720,13 @@ %clean %changelog -n xorg-x11 +* Fri Jun 02 2006 - sndirsch(a)suse.de +- pc_xf86-pci.diff: + * fixes broken BIOS reading (due to changes in recent Linux + kernels), which is required for dual card support (Bug #171453, + X.Org Bug #6751) +- removed no longer required patch + "p_xlib_skip_select_substructure_redirect.diff" again (Bug #151836) * Wed May 31 2006 - sndirsch(a)suse.de - generate /usr/X11R6/lib/X11/fonts/misc/fonts.dir on s390/s390x during %%install (Bug #178315) ++++++ FILES ++++++ --- xorg-x11/FILES 2006-05-29 14:05:34.000000000 +0200 +++ xorg-x11/FILES 2006-06-02 16:20:46.000000000 +0200 @@ -177,5 +177,3 @@ p_xlib_skip_ext_env.diff [KEEP?] - added support for disabling extensions through environment variables (Bug #167317) -p_xlib_skip_select_substructure_redirect.diff [KEEP?] -- fool java swing apps that no WM is running (Bug #151836) ++++++ pc_xf86-pci.diff ++++++ --- /var/tmp/diff_new_pack.T9xuj4/_old 2006-06-03 01:01:32.000000000 +0200 +++ /var/tmp/diff_new_pack.T9xuj4/_new 2006-06-03 01:01:32.000000000 +0200 @@ -1,57 +1,219 @@ ---- hw/xfree86/os-support/bus/Pci.c.orig 2006-05-23 11:26:01.000000000 +0200 -+++ hw/xfree86/os-support/bus/Pci.c 2006-05-23 11:37:57.000000000 +0200 +Index: programs/Xserver/hw/xfree86/os-support/bus/Pci.c +=================================================================== +RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v +retrieving revision 1.10 +diff -u -r1.10 Pci.c +--- programs/Xserver/hw/xfree86/os-support/bus/Pci.c 8 Nov 2005 19:04:56 -0000 1.10 ++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.c 31 May 2006 13:33:46 -0000 @@ -233,6 +233,8 @@ static pciConfigPtr pci_devp[MAX_PCI_DEVICES + 1] = {NULL, }; -+static int (*pciOSHandleBIOS)(PCITAG Tag, int basereg, unsigned char *buf, int len); ++static int (*pciOSHandleBIOS)(PCITAG Tag, ADDRESS offset, int len, unsigned char *buf); + /* * Platform specific PCI function pointers. * -@@ -266,6 +268,11 @@ +@@ -266,6 +268,13 @@ #endif } -+void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len)) ++void ++pciSetOSBIOSPtr(int (*bios_fn) ++ (PCITAG Tag, ADDRESS offset, int len, unsigned char * buf)) +{ -+ pciOSHandleBIOS = bios_fn; ++ pciOSHandleBIOS = bios_fn; +} + PCITAG pciFindFirst(CARD32 id, CARD32 mask) { -@@ -1376,6 +1383,13 @@ - PCITAG *pTag; - int i; - -+ /* fall back to the old code if the OS code fails */ -+ if (pciOSHandleBIOS) { -+ n = pciOSHandleBIOS(Tag, basereg, func, ptr); -+ if (n) -+ return n; -+ } +@@ -1113,14 +1122,13 @@ + + static int + handlePciBIOS(PCITAG Tag, int basereg, +- int (*func)(PCITAG, CARD8*, ADDRESS, pointer), ++ int (*func)(PCITAG, ADDRESS, pointer), + pointer args) + { + CARD32 romsave = 0; + int i; + romBaseSource b_reg; + ADDRESS hostbase; +- CARD8 tmp[64]; + int ret = 0; + + romsave = pciReadLong(Tag, PCI_MAP_ROM_REG); +@@ -1174,19 +1183,15 @@ + + hostbase = pciBusAddrToHostAddr(Tag, PCI_MEM, PCIGETROM(romaddr)); + +- if ((xf86ReadDomainMemory(Tag, hostbase, sizeof(tmp), tmp) != +- sizeof(tmp)) || +- (tmp[0] != 0x55) || (tmp[1] != 0xaa) || !tmp[2] ) { ++ ret = (*func)(Tag, hostbase, args); + /* Restore the base registers if they were changed. */ +- pciWriteLong(Tag, PCI_MAP_ROM_REG, romsave); +- if (savebase) pciWriteLong(Tag, PCI_MAP_REG_START + (b_reg << 2), +- (CARD32) savebase); ++ pciWriteLong(Tag, PCI_MAP_ROM_REG, romsave); ++ if (savebase) pciWriteLong(Tag, PCI_MAP_REG_START + (b_reg << 2), ++ (CARD32) savebase); + +- /* No BIOS found: try another address */ +- continue; +- } ++ /* No BIOS found: try another address */ ++ if (ret < 0) continue; + +- ret = (*func)(Tag, tmp, hostbase, args); + + /* Restore the base register if it was changed. */ + if (savebase) pciWriteLong(Tag, PCI_MAP_REG_START + (b_reg << 2), +@@ -1208,20 +1213,28 @@ + PciBiosType BiosType; + } readBios, *readBiosPtr; + ++typedef int(*ReadBIOSFunc)(PCITAG Tag, ADDRESS base, int len, unsigned char *buf); + - n = handlePciBIOS(Tag,basereg,func,ptr); - if (n) - return n; ---- hw/xfree86/os-support/bus/Pci.h.orig 2006-05-23 11:26:01.000000000 +0200 -+++ hw/xfree86/os-support/bus/Pci.h 2006-05-23 11:26:01.000000000 +0200 -@@ -431,6 +431,7 @@ + static int +-readPciBios(PCITAG Tag, CARD8* tmp, ADDRESS hostbase, pointer args) ++readPciBios(PCITAG Tag, ReadBIOSFunc func, ADDRESS base, pointer args) + { + unsigned int image_length = 0; + readBiosPtr rd = args; + int ret; ++ CARD8 tmp[64]; + ++ if ((func(Tag, base, sizeof(tmp), tmp) != ++ sizeof(tmp)) || ++ (tmp[0] != 0x55) || (tmp[1] != 0xaa) || !tmp[2] ) ++ return -1; ++ + /* We found a PCI BIOS Image. Now we look for the correct type */ + while ((tmp[0] == 0x55) && (tmp[1] == 0xAA)) { + unsigned short data_off = tmp[0x18] | (tmp[0x19] << 8); + unsigned char data[0x18]; + unsigned char type; + +- if ((xf86ReadDomainMemory(Tag, hostbase + data_off, sizeof(data), data) ++ if ((func(Tag, base + data_off, sizeof(data), data) + != sizeof(data)) || + (data[0] != 'P') || + (data[1] != 'C') || +@@ -1242,8 +1255,8 @@ + ErrorF("data image length: 0x%x, ind: 0x%x\n", + image_length, indicator); + #endif +- hostbase += i_length; +- if (xf86ReadDomainMemory(Tag, hostbase, sizeof(tmp), tmp) ++ base += i_length; ++ if (func(Tag, base, sizeof(tmp), tmp) + != sizeof(tmp)) + break; + continue; +@@ -1283,19 +1296,47 @@ + } + + /* Read BIOS */ +- ret = xf86ReadDomainMemory(Tag, hostbase + rd->Offset, rd->Len, rd->Buf); ++ ret = func(Tag, base + rd->Offset, rd->Len, rd->Buf); + } + + return ret; + } + + static int +-getPciBIOSTypes(PCITAG Tag, CARD8* tmp, ADDRESS hostbase, pointer arg) ++readPciBiosFromDomainMem(PCITAG Tag, ADDRESS hostbase, ++ pointer args) ++{ ++#ifdef PRINT_PCI ++ ErrorF("readPciBiosFromDomainMem\n"); ++#endif ++ return readPciBios(Tag, xf86ReadDomainMemory, hostbase, args); ++} ++ ++static int ++readPciBiosFromOS(PCITAG Tag, pointer args) ++{ ++#ifdef PRINT_PCI ++ ErrorF("readPciBiosFromOS\n"); ++#endif ++ if (pciOSHandleBIOS) ++ return readPciBios(Tag, pciOSHandleBIOS, 0, args); ++ else ++ return 0; ++} ++ ++static int ++getPciBIOSTypes(PCITAG Tag, ADDRESS hostbase, pointer arg) + { + int n = 0; + PciBiosType *Buf = arg; ++ CARD8 tmp[64]; ++ ++ if ((xf86ReadDomainMemory(Tag, hostbase, sizeof(tmp), tmp) != ++ sizeof(tmp)) || ++ (tmp[0] != 0x55) || (tmp[1] != 0xaa) || !tmp[2] ) ++ return -1; + +- /* We found a PCI BIOS Image. Now we collect the types type */ ++ /* We found a PCI BIOS Image. Now we collect the types type */ + do { + unsigned short data_off = tmp[0x18] | (tmp[0x19] << 8); + unsigned char data[0x16]; +@@ -1339,7 +1380,7 @@ + + static int + HandlePciBios(PCITAG Tag, int basereg, +- int (*func)(PCITAG, CARD8*, ADDRESS, pointer), ++ int (*func)(PCITAG, ADDRESS, pointer), + pointer ptr) + { + int n, num; +@@ -1393,7 +1434,10 @@ + rb.Buf = Buf; + rb.BiosType = Type; + +- return HandlePciBios(Tag, basereg, readPciBios, &rb); ++ if (pciOSHandleBIOS) ++ return readPciBiosFromOS(Tag, &rb); ++ ++ return HandlePciBios(Tag, basereg, readPciBiosFromDomainMem, &rb); + } + + int +Index: programs/Xserver/hw/xfree86/os-support/bus/Pci.h +=================================================================== +RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v +retrieving revision 1.10 +diff -u -r1.10 Pci.h +--- programs/Xserver/hw/xfree86/os-support/bus/Pci.h 8 Nov 2005 19:04:56 -0000 1.10 ++++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h 31 May 2006 13:33:46 -0000 +@@ -430,7 +430,9 @@ + CARD32 pciByteSwap(CARD32); Bool pciMfDev(int, int); ADDRESS pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS); - -+extern void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len)); +- ++extern void pciSetOSBIOSPtr(int (*bios_fn) ++ (PCITAG Tag, ADDRESS offset, int len, unsigned char * buf)); ++ extern PCITAG (*pciFindFirstFP)(void); extern PCITAG (*pciFindNextFP)(void); ---- hw/xfree86/os-support/bus/linuxPci.c.orig 2006-05-23 11:26:01.000000000 +0200 -+++ hw/xfree86/os-support/bus/linuxPci.c 2006-05-23 12:01:26.000000000 +0200 +Index: programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c +=================================================================== +RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v +retrieving revision 1.10 +diff -u -r1.10 linuxPci.c +--- programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c.orig 2006-06-02 12:58:52.000000000 +0200 ++++ programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c 2006-06-02 13:08:58.000000000 +0200 @@ -74,6 +74,7 @@ static void linuxPciCfgWriteByte(PCITAG tag, int off, CARD8 val); static CARD16 linuxPciCfgReadWord(PCITAG tag, int off); static void linuxPciCfgWriteWord(PCITAG tag, int off, CARD16 val); -+static int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len); ++static int linuxPciHandleBIOS(PCITAG Tag, ADDRESS offset, int len, unsigned char *buf); static Bool linuxDomainSupport(void); static pciBusFuncs_t linuxFuncs0 = { @@ -63,11 +225,12 @@ return; } -@@ -943,6 +945,47 @@ +@@ -943,6 +945,45 @@ #endif /* !INCLUDE_XF86_NO_DOMAIN */ -+int linuxPciHandleBIOS(PCITAG Tag, int basereg, unsigned char *buf, int len) ++int ++linuxPciHandleBIOS(PCITAG Tag, ADDRESS offset, int len, unsigned char *buf) +{ + unsigned int dom, bus, dev, func; + unsigned int fd; @@ -83,14 +246,11 @@ + sprintf(file, "/sys/bus/pci/devices/%04x:%02x:%02x.%1x/rom", + dom, bus, dev, func); + -+ if (stat(file, &st) == 0) -+ { -+ if ((fd = open(file, O_RDWR))) -+ basereg = 0x0; ++ if (stat(file, &st) == 0 && (fd = open(file, O_RDWR))) { + + /* enable the ROM first */ + write(fd, "1", 2); -+ lseek(fd, 0, SEEK_SET); ++ lseek(fd, offset, SEEK_SET); + do { + /* copy the ROM until we hit Len, EOF or read error */ + ret = read(fd, buf+sofar, len-sofar); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-bootloader
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-bootloader checked in at Sat Jun 3 01:01:55 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-05-31 16:12:44.000000000 +0200 +++ yast2-bootloader/yast2-bootloader.changes 2006-06-02 20:23:26.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 17:42:57 CEST 2006 - jplack(a)suse.de + +- fixed raid 1 detection in lib_iface.ycp (#178802) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.69.tar.bz2 New: ---- yast2-bootloader-2.13.70.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.DJM6Xu/_old 2006-06-03 01:01:26.000000000 +0200 +++ /var/tmp/diff_new_pack.DJM6Xu/_new 2006-06-03 01:01:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.69) +# spec file for package yast2-bootloader (Version 2.13.70) # # 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-bootloader -Version: 2.13.69 +Version: 2.13.70 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.69.tar.bz2 +Source0: yast2-bootloader-2.13.70.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.69 +%setup -n yast2-bootloader-2.13.70 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,8 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Fri Jun 02 2006 - jplack(a)suse.de +- fixed raid 1 detection in lib_iface.ycp (#178802) * Wed May 31 2006 - od(a)suse.de - check for RAID1 md arrays as all others will break on reboot (#178802) ++++++ yast2-bootloader-2.13.69.tar.bz2 -> yast2-bootloader-2.13.70.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.69/VERSION new/yast2-bootloader-2.13.70/VERSION --- old/yast2-bootloader-2.13.69/VERSION 2006-05-31 16:11:18.000000000 +0200 +++ new/yast2-bootloader-2.13.70/VERSION 2006-06-02 20:20:42.000000000 +0200 @@ -1 +1 @@ -2.13.69 +2.13.70 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.69/src/routines/lib_iface.ycp new/yast2-bootloader-2.13.70/src/routines/lib_iface.ycp --- old/yast2-bootloader-2.13.69/src/routines/lib_iface.ycp 2006-05-31 16:07:09.000000000 +0200 +++ new/yast2-bootloader-2.13.70/src/routines/lib_iface.ycp 2006-06-02 20:19:07.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: lib_iface.ycp 31211 2006-05-31 14:02:10Z jplack $ + * $Id: lib_iface.ycp 31302 2006-06-02 15:56:35Z jplack $ * * WARNING: * To be included to BootCommon.ycp only @@ -39,10 +39,15 @@ */ // FIXME: this should be done directly in perl-Bootloader through LibStorage.pm global void SetDiskInfo () { + map<string,list<string> > md_info = $[]; map<string,any> mountpoints = mapmap (string k, list v, (map<string,list>)Storage::GetMountPoints (), { - return $[ k : (any)v[0]:nil]; + // detect all raid1 md devices and mark them in md_info + string device = v[0]:""; + if (v[3]:"" == "raid1") + md_info[device]=[]; + return $[ k : device ]; }); mountpoints = filter (string k, any v, mountpoints, { string tmpdir = (string)SCR::Read (.target.tmpdir); @@ -64,7 +69,6 @@ } y2milestone ("Detected mountpoints: %1", mountpoints); - map<string,list<string> > md_info = $[]; map<string,map> tm = (map<string,map>)Storage::GetTargetMap (); list<list<list> > pi = maplist (string disk, map info, tm, { @@ -80,7 +84,7 @@ string device = p["device"]:""; // We only pass along RAID1 devices as all other causes // severe breakage in the bootloader stack - if ((raid != "") && (p["raid_type"]:"" == "raid1")) + if ((raid != "") && (haskey (md_info, raid))) { list<string> members = md_info[raid]:[]; members = add (members, device); @@ -331,3 +335,13 @@ } } //end of include + +/* + * Local variables: + * mode: ycp + * mode: font-lock + * mode: auto-fill + * indent-level: 4 + * fill-column: 78 + * End: + */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2 checked in at Sat Jun 3 01:01:53 CEST 2006. -------- --- yast2/yast2.changes 2006-06-01 18:20:36.000000000 +0200 +++ yast2/yast2.changes 2006-06-02 15:19:23.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 2 12:42:04 CEST 2006 - jsrain(a)suse.cz + +- Marked global API of following modules as stable: + ProductFeatures, WizardHW +- 2.13.61 + +------------------------------------------------------------------- Old: ---- yast2-2.13.60.tar.bz2 New: ---- yast2-2.13.61.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.TGULlg/_old 2006-06-03 01:01:34.000000000 +0200 +++ /var/tmp/diff_new_pack.TGULlg/_new 2006-06-03 01:01:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.13.60) +# spec file for package yast2 (Version 2.13.61) # # 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.13.60 +Version: 2.13.61 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.13.60.tar.bz2 +Source0: yast2-2.13.61.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # Need the new file popups @@ -93,7 +93,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.13.60 +%setup -n yast2-2.13.61 %build %{prefix}/bin/y2tool y2autoconf @@ -192,6 +192,10 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 +* Fri Jun 02 2006 - jsrain(a)suse.cz +- Marked global API of following modules as stable: + ProductFeatures, WizardHW +- 2.13.61 * Thu Jun 01 2006 - locilka(a)suse.cz - Global API or parts of these modules were marked as Stable: Address, Arch, Confirm, Crash, FileUtils, Hostname, HTML, ++++++ yast2-2.13.60.tar.bz2 -> yast2-2.13.61.tar.bz2 ++++++ ++++ 3166 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.13.60/VERSION new/yast2-2.13.61/VERSION --- old/yast2-2.13.60/VERSION 2006-06-01 18:20:54.000000000 +0200 +++ new/yast2-2.13.61/VERSION 2006-06-02 15:03:44.000000000 +0200 @@ -1 +1 @@ -2.13.60 +2.13.61 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.13.60/configure.in new/yast2-2.13.61/configure.in --- old/yast2-2.13.60/configure.in 2006-06-01 18:21:18.000000000 +0200 +++ new/yast2-2.13.61/configure.in 2006-06-02 15:16:56.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.13.60, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.13.61, 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.13.60" +VERSION="2.13.61" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(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.13.60/library/control/src/ProductFeatures.ycp new/yast2-2.13.61/library/control/src/ProductFeatures.ycp --- old/yast2-2.13.60/library/control/src/ProductFeatures.ycp 2006-03-13 09:59:57.000000000 +0100 +++ new/yast2-2.13.61/library/control/src/ProductFeatures.ycp 2006-06-02 12:54:14.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Anas Nashif <nashif(a)suse.de> * Jiri Srain <jsrain(a)suse.cz> * - * $Id: ProductFeatures.ycp 28860 2006-03-10 22:21:50Z jsrain $ + * $Id: ProductFeatures.ycp 31290 2006-06-02 10:54:10Z jsrain $ */ { @@ -99,6 +99,7 @@ /** * Set a feature section * Default values will be used where value not defined + * @stable * @param section name string the name of the section * @param section_map a map containing data of the section */ @@ -112,6 +113,9 @@ /** * Get a complete section for evaluation + * @stable + * @param section_name string name of the section + * @return a map key->value, options in the section */ global map<string,any> GetSection(string section_name) { InitFeatures (false); @@ -120,6 +124,7 @@ /** * Save product features + * @stable */ global void Save() { InitFeatures (false); @@ -141,6 +146,7 @@ /** * Restore product features in running system + * @stable */ global void Restore() { InitFeatures (true); @@ -156,6 +162,7 @@ /** * Initialize the features structure if needed + * @stable * Either read from /etc/YaST2/ProductFeatures or set default values */ global void InitIfNeeded () { @@ -169,6 +176,7 @@ /** * Get value of a feature + * @stable * @param section string section of the feature * @param features string feature name * @return any the feature value @@ -183,6 +191,7 @@ /** * Get value of a feature + * @stable * @param section string section of the feature * @param features string feature name * @return string the feature value @@ -201,6 +210,7 @@ /** * Get value of a feature + * @stable * @param section string section of the feature * @param features string feature name * @return boolean the feature value @@ -220,6 +230,7 @@ /** * Set value of a feature + * @stable * @param section string section of the feature * @param features string feature name * @param value any the feature value @@ -233,6 +244,7 @@ /** * Set value of a feature + * @stable * @param section string section of the feature * @param features string feature name * @param value string the feature value @@ -243,6 +255,7 @@ /** * Set value of a feature + * @stable * @param section string section of the feature * @param features string feature name * @param value boolean the feature value 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.13.60/library/cwm/src/WizardHW.ycp new/yast2-2.13.61/library/cwm/src/WizardHW.ycp --- old/yast2-2.13.60/library/cwm/src/WizardHW.ycp 2006-02-20 12:08:10.000000000 +0100 +++ new/yast2-2.13.61/library/cwm/src/WizardHW.ycp 2006-06-02 12:54:14.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routines for generic hardware summary dialog * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: WizardHW.ycp 27936 2006-02-13 20:01:14Z olh $ + * $Id: WizardHW.ycp 31290 2006-06-02 10:54:10Z jsrain $ * */ @@ -218,6 +218,7 @@ /** * Create CWM widtet for the hardware settings * NOTE: The Init and Handle callbacks must be defined + * @stable * @param headers a list of headers of the table * @param actions a list of additionaly offered actions, see CreateHWDialog * function for details @@ -270,6 +271,7 @@ /** * Draw the dialog, handle all its events via callbacks + * @stable * @param settings a map containing all the settings: * $[ * "action_callback" : symbol(string,map<string,any>) -- callback to handle @@ -356,6 +358,7 @@ /** * Create the Hardware Wizard dialog * Draw the dialog + * @stable * @param title string the dialog title * @param help string the help for the dialog * @param headers a list of the table headers @@ -391,6 +394,7 @@ /** * Set which item is to be selected + * @stable * @param selected string the item that is should be marked as selected */ global void SetSelectedItem (string selected) { @@ -400,6 +404,7 @@ /** * Return the id of the currently selected item in the table + * @stable * @return id of the selected item */ global string SelectedItem () { @@ -408,6 +413,7 @@ /** * Set the rich text description. + * @stable * @param descr rich text description */ global void SetRichDescription (string descr) { @@ -416,6 +422,7 @@ /** * Set the information about hardware + * @stable * @param items a list of maps, one item per item in the dialog, with keys * "id" : string = the identification of the device, * "rich_descr" : string = RichText description of the device @@ -440,6 +447,7 @@ /** * Wait for event from the event + * @stable * @return a map with keys: * "event" : map = event as returned from UI::WaitForEvent (), * "selected" : string = ID of the selected item in the list box @@ -459,6 +467,7 @@ /** * Wait for event from the event + * @stable * @return a map with keys: * "event" : any = event as returned from UI::UserInoput () * "selected" : string = ID of the selected item in the list box @@ -472,6 +481,7 @@ /** * Create rich text description of a device. It can be used for WizardHW::SetContents * function for formatting richtext device descriptions + * @stable * @param title header - usually device name * @param properties important properties of the device which should be * displayed in the overview dialog @@ -507,6 +517,7 @@ /** * Get propertly list of an unconfigured device. Should be used together with * device name in CreateRichTextDescription() function. + * @stable * @return a list of strings */ global list<string> UnconfiguredDevice() { 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.13.60/library/modules/Version.ycp new/yast2-2.13.61/library/modules/Version.ycp --- old/yast2-2.13.60/library/modules/Version.ycp 2006-06-01 18:21:42.000000000 +0200 +++ new/yast2-2.13.61/library/modules/Version.ycp 2006-06-02 15:17:32.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.13.60"; +global string yast2 = "2.13.61"; /* EOF */ } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xgl
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package xgl checked in at Sat Jun 3 01:01:11 CEST 2006. -------- --- xgl/xgl.changes 2006-05-30 01:22:10.000000000 +0200 +++ xgl/xgl.changes 2006-06-02 15:15:29.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Jun 2 15:11:14 CEST 2006 - dreveman(a)suse.de + +- Fix integer overflow in xglfill.c (bnc #151836) +- Add workaround to get java apps working. (bnc #151836) +- Add some basic YUY2 conversion code. (bnc #180807) +- Compute stride for other formats than YV12 correctly. + (bnc #180807) + +------------------------------------------------------------------- New: ---- xgl-java-wmhack.diff xgl-overflow-fix.diff xgl-yuy2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.SkgimT/_old 2006-06-03 01:00:49.000000000 +0200 +++ /var/tmp/diff_new_pack.SkgimT/_new 2006-06-03 01:00:49.000000000 +0200 @@ -24,7 +24,7 @@ Requires: xgl-hardware-list Autoreqprov: on Version: cvs_060522 -Release: 3 +Release: 4 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -44,6 +44,9 @@ Patch3: xgl-maprules-tolower-fix.diff Patch4: 178214.diff Patch5: 178234-2.diff +Patch6: xgl-java-wmhack.diff +Patch7: xgl-overflow-fix.diff +Patch8: xgl-yuy2.diff %description Xgl is an Xserver that uses OpenGL for its drawing operations. Some @@ -83,6 +86,9 @@ patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-maprules-tolower-fix.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178214.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178234-2.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-java-wmhack.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-overflow-fix.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-yuy2.diff || exit 1 %build PREFIX=$RPM_BUILD_ROOT/usr/X11R6/lib/xgl @@ -145,6 +151,12 @@ /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Fri Jun 02 2006 - dreveman(a)suse.de +- Fix integer overflow in xglfill.c (bnc #151836) +- Add workaround to get java apps working. (bnc #151836) +- Add some basic YUY2 conversion code. (bnc #180807) +- Compute stride for other formats than YV12 correctly. + (bnc #180807) * Tue May 30 2006 - dreveman(a)suse.de - Fix typo in xglFillSegment. (bnc #178234) * Fri May 26 2006 - dreveman(a)suse.de ++++++ xgl-java-wmhack.diff ++++++ --- dix/window.c 2006/05/29 18:12:27 1.1 +++ dix/window.c 2006/05/29 18:15:15 @@ -1265,8 +1265,12 @@ result = EventSelectForWindow(pWin, client, (Mask )*pVlist); if (result) { - error = result; - goto PatchUp; + if (vmask != CWEventMask || + (Mask)*pVlist != SubstructureRedirectMask) + { + error = result; + goto PatchUp; + } } pVlist++; break; ++++++ xgl-overflow-fix.diff ++++++ --- hw/xgl/xglfill.c 29 May 2006 23:04:38 -0000 1.9.2.2 +++ hw/xgl/xglfill.c 31 May 2006 01:21:06 -0000 @@ -172,6 +172,7 @@ RegionPtr pClip = pGC->pCompositeClip; BoxPtr pClipBox; BoxPtr pExtent = REGION_EXTENTS (pGC->pScreen, pClip); + int fullX1, fullX2, fullY1, fullY2; BoxRec part, full; BoxPtr heapBox = NULL; BoxRec stackBox[N_STACK_BOX]; @@ -181,21 +182,26 @@ while (nrect--) { - full.x1 = prect->x + pDrawable->x; - full.y1 = prect->y + pDrawable->y; - full.x2 = full.x1 + (int) prect->width; - full.y2 = full.y1 + (int) prect->height; + fullX1 = prect->x + pDrawable->x; + fullY1 = prect->y + pDrawable->y; + fullX2 = fullX1 + (int) prect->width; + fullY2 = fullY1 + (int) prect->height; prect++; - if (full.x1 < pExtent->x1) - full.x1 = pExtent->x1; - if (full.y1 < pExtent->y1) - full.y1 = pExtent->y1; - if (full.x2 > pExtent->x2) - full.x2 = pExtent->x2; - if (full.y2 > pExtent->y2) - full.y2 = pExtent->y2; + if (fullX1 < pExtent->x1) + fullX1 = pExtent->x1; + if (fullY1 < pExtent->y1) + fullY1 = pExtent->y1; + if (fullX2 > pExtent->x2) + fullX2 = pExtent->x2; + if (fullY2 > pExtent->y2) + fullY2 = pExtent->y2; + + full.x1 = fullX1; + full.y1 = fullY1; + full.x2 = fullX2; + full.y2 = fullY2; if (full.x1 >= full.x2 || full.y1 >= full.y2) continue; @@ -246,6 +252,7 @@ RegionPtr pClip = pGC->pCompositeClip; BoxPtr pClipBox; BoxPtr pExtent = REGION_EXTENTS (pGC->pScreen, pClip); + int fullX1, fullX2, fullY1, fullY2; BoxRec part, full; BoxPtr heapBox = NULL; BoxRec stackBox[N_STACK_BOX]; @@ -255,22 +262,27 @@ while (n--) { - full.x1 = ppt->x; - full.y1 = ppt->y; - full.x2 = full.x1 + *pwidth; - full.y2 = full.y1 + 1; + fullX1 = ppt->x; + fullY1 = ppt->y; + fullX2 = fullX1 + *pwidth; + fullY2 = fullY1 + 1; pwidth++; ppt++; - if (full.x1 < pExtent->x1) - full.x1 = pExtent->x1; - if (full.y1 < pExtent->y1) - full.y1 = pExtent->y1; - if (full.x2 > pExtent->x2) - full.x2 = pExtent->x2; - if (full.y2 > pExtent->y2) - full.y2 = pExtent->y2; + if (fullX1 < pExtent->x1) + fullX1 = pExtent->x1; + if (fullY1 < pExtent->y1) + fullY1 = pExtent->y1; + if (fullX2 > pExtent->x2) + fullX2 = pExtent->x2; + if (fullY2 > pExtent->y2) + fullY2 = pExtent->y2; + + full.x1 = fullX1; + full.y1 = fullY1; + full.x2 = fullX2; + full.y2 = fullY2; if (full.x1 >= full.x2 || full.y1 >= full.y2) continue; @@ -373,6 +385,7 @@ if (horizontalAndVertical) { BoxPtr pClipBox; + int fullX1, fullX2, fullY1, fullY2; BoxRec part, full; BoxPtr heapBox = NULL; BoxRec stackBox[N_STACK_BOX]; @@ -403,49 +416,49 @@ { if (dx > 0) { - full.x1 = pt.x + pDrawable->x; + fullX1 = pt.x + pDrawable->x; if (npt || coincidentEndpoints) - full.x2 = full.x1 + dx; + fullX2 = fullX1 + dx; else - full.x2 = full.x1 + dx + 1; + fullX2 = fullX1 + dx + 1; } else { - full.x2 = pt.x + pDrawable->x + 1; + fullX2 = pt.x + pDrawable->x + 1; if (npt || coincidentEndpoints) - full.x1 = full.x2 + dx; + fullX1 = fullX2 + dx; else - full.x1 = full.x2 + dx - 1; + fullX1 = fullX2 + dx - 1; } - full.y1 = pt.y + pDrawable->y; - full.y2 = full.y1 + 1; + fullY1 = pt.y + pDrawable->y; + fullY2 = fullY1 + 1; } else { if (dy > 0) { - full.y1 = pt.y + pDrawable->y; + fullY1 = pt.y + pDrawable->y; if (npt || coincidentEndpoints) - full.y2 = full.y1 + dy; + fullY2 = fullY1 + dy; else - full.y2 = full.y1 + dy + 1; + fullY2 = fullY1 + dy + 1; } else { - full.y2 = pt.y + pDrawable->y + 1; + fullY2 = pt.y + pDrawable->y + 1; if (npt || coincidentEndpoints) - full.y1 = full.y2 + dy; + fullY1 = fullY2 + dy; else - full.y1 = full.y2 + dy - 1; + fullY1 = fullY2 + dy - 1; } - full.x1 = pt.x + pDrawable->x; - full.x2 = full.x1 + 1; + fullX1 = pt.x + pDrawable->x; + fullX2 = fullX1 + 1; } pt.x += dx; @@ -453,14 +466,19 @@ ppt++; - if (full.x1 < pExtent->x1) - full.x1 = pExtent->x1; - if (full.y1 < pExtent->y1) - full.y1 = pExtent->y1; - if (full.x2 > pExtent->x2) - full.x2 = pExtent->x2; - if (full.y2 > pExtent->y2) - full.y2 = pExtent->y2; + if (fullX1 < pExtent->x1) + fullX1 = pExtent->x1; + if (fullY1 < pExtent->y1) + fullY1 = pExtent->y1; + if (fullX2 > pExtent->x2) + fullX2 = pExtent->x2; + if (fullY2 > pExtent->y2) + fullY2 = pExtent->y2; + + full.x1 = fullX1; + full.y1 = fullY1; + full.x2 = fullX2; + full.y2 = fullY2; if (full.x1 >= full.x2 || full.y1 >= full.y2) continue; @@ -570,6 +588,7 @@ if (horizontalAndVertical) { BoxPtr pClipBox; + int fullX1, fullX2, fullY1, fullY2; BoxRec part, full; BoxPtr heapBox = NULL; BoxRec stackBox[N_STACK_BOX]; @@ -583,57 +602,62 @@ { if (pSegInit->x1 < pSegInit->x2) { - full.x1 = pSegInit->x1; - full.x2 = pSegInit->x2; + fullX1 = pSegInit->x1; + fullX2 = pSegInit->x2; if (pGC->capStyle != CapNotLast) - full.x2++; + fullX2++; } else { - full.x1 = pSegInit->x2; - full.x2 = pSegInit->x1 + 1; + fullX1 = pSegInit->x2; + fullX2 = pSegInit->x1 + 1; if (pGC->capStyle == CapNotLast) - full.x1++; + fullX1++; } - full.x1 += pDrawable->x; - full.x2 += pDrawable->x; - full.y1 = pSegInit->y1 + pDrawable->y; - full.y2 = full.y1 + 1; + fullX1 += pDrawable->x; + fullX2 += pDrawable->x; + fullY1 = pSegInit->y1 + pDrawable->y; + fullY2 = fullY1 + 1; } else { if (pSegInit->y1 < pSegInit->y2) { - full.y1 = pSegInit->y1; - full.y2 = pSegInit->y2; + fullY1 = pSegInit->y1; + fullY2 = pSegInit->y2; if (pGC->capStyle != CapNotLast) - full.y2++; + fullY2++; } else { - full.y1 = pSegInit->y2; - full.y2 = pSegInit->y1 + 1; + fullY1 = pSegInit->y2; + fullY2 = pSegInit->y1 + 1; if (pGC->capStyle == CapNotLast) - full.y1++; + fullY1++; } - full.y1 += pDrawable->y; - full.y2 += pDrawable->y; - full.x1 = pSegInit->x1 + pDrawable->x; - full.x2 = full.x1 + 1; + fullY1 += pDrawable->y; + fullY2 += pDrawable->y; + fullX1 = pSegInit->x1 + pDrawable->x; + fullX2 = fullX1 + 1; } pSegInit++; - if (full.x1 < pExtent->x1) - full.x1 = pExtent->x1; - if (full.y1 < pExtent->y1) - full.y1 = pExtent->y1; - if (full.x2 > pExtent->x2) - full.x2 = pExtent->x2; - if (full.y2 > pExtent->y2) - full.y2 = pExtent->y2; + if (fullX1 < pExtent->x1) + fullX1 = pExtent->x1; + if (fullY1 < pExtent->y1) + fullY1 = pExtent->y1; + if (fullX2 > pExtent->x2) + fullX2 = pExtent->x2; + if (fullY2 > pExtent->y2) + fullY2 = pExtent->y2; + + full.x1 = fullX1; + full.y1 = fullY1; + full.x2 = fullX2; + full.y2 = fullY2; if (full.x1 >= full.x2 || full.y1 >= full.y2) continue; ++++++ xgl-yuy2.diff ++++++ --- fb/fbmmx.c 18 Apr 2006 20:54:02 -0000 1.21.6.4 +++ fb/fbmmx.c 2 Jun 2006 10:07:40 -0000 @@ -2416,9 +2416,9 @@ } static __inline__ CARD32 -loadyv12 (CARD8 *py, - CARD8 *pu, - CARD8 *pv) +loadyuv (CARD8 *py, + CARD8 *pu, + CARD8 *pv) { INT16 y, u, v; INT32 r, g, b; @@ -2560,7 +2560,7 @@ while (w && (unsigned long) py & 7) { - *((CARD32 *) pd) = loadyv12 (py, pu, pv); + *((CARD32 *) pd) = loadyuv (py, pu, pv); pd += 4; py += 1; @@ -2589,7 +2589,7 @@ while (w) { - *((CARD32 *) pd) = loadyv12 (py, pu, pv); + *((CARD32 *) pd) = loadyuv (py, pu, pv); pd += 4; py += 1; @@ -2606,6 +2606,51 @@ return slb->line[i]; } +static __inline__ CARD8 * +loadyuy2_scanline (ScanlineBuf *slb, + int y, + CARD8 *src, + int stride, + int x, + int width) +{ + CARD8 *py, *pu, *pv, *pd; + int i, w; + + y = _y_to_scanline (slb, y); + + for (i = 0; slb->lock[i]; i++); + + slb->y[i] = y; + slb->lock[i] = TRUE; + + py = src + stride * (y >> 0); + pu = py + 1; + pv = py + 3; + + pd = slb->line[i]; + + w = width; + + while (w) + { + *((CARD32 *) pd) = loadyuv (py, pu, pv); + + pd += 4; + py += 2; + + if (w & 1) + { + pu += 4; + pv += 4; + } + + w--; + } + + return slb->line[i]; +} + static __inline__ CARD8 interpolate_bilinear (int distx, int idistx, @@ -2857,7 +2902,7 @@ while (w && (unsigned long) py & 7) { - *((CARD32 *) pd) = loadyv12 (py, pu, pv); + *((CARD32 *) pd) = loadyuv (py, pu, pv); pd += 4; py += 1; @@ -2886,7 +2931,7 @@ while (w) { - *((CARD32 *) pd) = loadyv12 (py, pu, pv); + *((CARD32 *) pd) = loadyuv (py, pu, pv); pd += 4; py += 1; @@ -2916,5 +2961,215 @@ _mm_empty (); } +/* TODO: MMX code for yuy2 */ +void +fbCompositeSrc_yuy2x8888mmx (CARD8 op, + PicturePtr pSrc, + PicturePtr pMask, + PicturePtr pDst, + INT16 xSrc, + INT16 ySrc, + INT16 xMask, + INT16 yMask, + INT16 xDst, + INT16 yDst, + CARD16 width, + CARD16 height) +{ + PictTransform *transform = pSrc->transform; + CARD8 *dst, *src; + FbBits *srcBits; + FbStride srcStride; + int srcXoff; + int srcYoff; + FbBits *dstBits; + FbStride dstStride; + int dstXoff; + int dstYoff; + int bpp, offset, w; + CARD8 *pd; + + fbGetDrawable (pSrc->pDrawable, srcBits, srcStride, bpp, srcXoff, srcYoff); + fbGetDrawable (pDst->pDrawable, dstBits, dstStride, bpp, dstXoff, dstYoff); + + dst = (CARD8 *) dstBits; + dstStride *= sizeof (FbBits); + + src = (CARD8 *) srcBits; + srcStride *= sizeof (FbBits); + + if (transform) + { + /* transformation is a Y coordinate flip, this is achieved by + moving start offsets for each plane and changing sign of stride */ + if (pSrc->transform->matrix[0][0] == (1 << 16) && + pSrc->transform->matrix[1][1] == -(1 << 16) && + pSrc->transform->matrix[0][2] == 0 && + pSrc->transform->matrix[1][2] == (pSrc->pDrawable->height << 16)) + { + src = src + (pSrc->pDrawable->height - 1) * srcStride; + + srcStride = -srcStride; + + transform = 0; + } + } + + dst += dstStride * (yDst + dstYoff) + ((xDst + dstXoff) << 2); + + if (transform) + { + ScanlineBuf slb; + CARD8 _scanline_buf[8192]; + CARD8 *ps, *ps0, *ps1; + int x, x0, y, line, xStep, yStep; + int distx, idistx, disty, idisty; + int srcEnd = pSrc->pDrawable->width << 16; + + x0 = pSrc->transform->matrix[0][2] + ((xSrc + srcXoff) << 16); + y = pSrc->transform->matrix[1][2] + ((ySrc + srcYoff) << 16); + + xStep = pSrc->transform->matrix[0][0]; + yStep = pSrc->transform->matrix[1][1]; + + init_scanline_buffer (&slb, + _scanline_buf, sizeof (_scanline_buf), + pSrc->pDrawable->width << 2, + pSrc->pDrawable->height); + + while (height--) + { + disty = (y >> 8) & 0xff; + idisty = 256 - disty; + line = y >> 16; + + ps0 = get_scanline (&slb, line); + ps1 = get_scanline (&slb, line + 1); + + if (!ps0) + ps0 = loadyuy2_scanline (&slb, line, + src, srcStride, + 0, pSrc->pDrawable->width); + + if (!ps1) + ps1 = loadyuy2_scanline (&slb, line + 1, + src, srcStride, + 0, pSrc->pDrawable->width); + + pd = dst; + + x = x0; + w = width; + + if (pSrc->filter == PictFilterBilinear) + { + while (w && x < 0) + { + interpolate_bilinear_8888 (0, 256, disty, idisty, + ps0, ps1, 0, pd); + + x += xStep; + pd += 4; + w -= 1; + } + + while (w && x < srcEnd) + { + distx = (x >> 8) & 0xff; + idistx = 256 - distx; + + interpolate_bilinear_8888 (distx, idistx, disty, idisty, + ps0, ps1, (x >> 14) & ~3, pd); + + x += xStep; + pd += 4; + w -= 1; + } + + while (w) + { + interpolate_bilinear_8888 (256, 0, disty, idisty, + ps0, ps1, (x >> 14) & ~3, pd); + + pd += 4; + w -= 1; + } + } + else + { + while (w && x < 0) + { + *(CARD32 *) pd = *(CARD32 *) ps0; + + x += xStep; + pd += 4; + w -= 1; + } + + while (w && x < srcEnd) + { + *(CARD32 *) pd = ((CARD32 *) ps0)[x >> 16]; + + x += xStep; + pd += 4; + w -= 1; + } + + while (w) + { + *(CARD32 *) pd = ((CARD32 *) ps0)[x >> 16]; + + pd += 4; + w -= 1; + } + } + + y += yStep; + dst += dstStride; + + release_scanlines (&slb); + } + + fini_scanline_buffer (&slb); + } + else + { + CARD8 *py, *pu, *pv; + + src += srcStride * (ySrc >> 0) + srcYoff + (xSrc + srcXoff); + + while (height) + { + py = src; + pu = src + 1; + pv = src + 3; + pd = dst; + + w = width; + + while (w) + { + *((CARD32 *) pd) = loadyuv (py, pu, pv); + + pd += 4; + py += 2; + + if (w & 1) + { + pu += 4; + pv += 4; + } + + w--; + } + + dst += dstStride; + src += srcStride; + + height--; + } + } +} + #endif /* RENDER */ #endif /* USE_MMX */ --- fb/fbmmx.h 13 Apr 2006 13:28:27 -0000 1.8.8.1 +++ fb/fbmmx.h 2 Jun 2006 10:07:40 -0000 @@ -231,4 +231,18 @@ CARD16 width, CARD16 height); +void +fbCompositeSrc_yuy2x8888mmx (CARD8 op, + PicturePtr pSrc, + PicturePtr pMask, + PicturePtr pDst, + INT16 xSrc, + INT16 ySrc, + INT16 xMask, + INT16 yMask, + INT16 xDst, + INT16 yDst, + CARD16 width, + CARD16 height); + #endif /* USE_MMX */ --- fb/fbpict.c 13 Apr 2006 13:28:27 -0000 1.20.6.4 +++ fb/fbpict.c 2 Jun 2006 10:07:40 -0000 @@ -874,8 +874,8 @@ maskAlphaMap = pMask->alphaMap != 0; } - /* YV12 is only used internally for XVideo */ - if (pSrc->format == PICT_yv12) + /* YUV is only used internally for XVideo */ + if (pSrc->format == PICT_yv12 || pSrc->format == PICT_yuy2) { #ifdef USE_MMX /* non rotating transformation */ @@ -890,7 +890,12 @@ case PICT_a8r8g8b8: case PICT_x8r8g8b8: if (fbHaveMMX()) - func = fbCompositeSrc_yv12x8888mmx; + { + if (pSrc->format == PICT_yv12) + func = fbCompositeSrc_yv12x8888mmx; + else + func = fbCompositeSrc_yuy2x8888mmx; + } break; } } Index: hw/xgl/xglxv.c =================================================================== RCS file: /cvs/xorg/xserver/xorg/hw/xgl/xglxv.c,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 xglxv.c --- hw/xgl/xglxv.c 19 May 2006 12:36:26 -0000 1.1.2.3 +++ hw/xgl/xglxv.c 2 Jun 2006 10:07:40 -0000 @@ -298,7 +298,7 @@ ScreenPtr pScreen = pDrawable->pScreen; PicturePtr pSrc; PictTransform transform; - int depth, bpp, noVisual = FALSE; + int depth, bpp, stride, noVisual = FALSE; CARD32 format; XGL_SCREEN_PRIV (pScreen); @@ -306,11 +306,14 @@ XGL_DRAWABLE_PIXMAP (pDrawable); XGL_PIXMAP_PRIV (pPixmap); + stride = ((srcWidth + 7) & ~7); + switch (pImage->id) { case GLITZ_FOURCC_YUY2: bpp = depth = 16; format = PICT_yuy2; noVisual = !pScreenPriv->pXvVisual[XGL_XV_FORMAT_YUY2].format.surface; + stride *= 2; break; case GLITZ_FOURCC_YV12: depth = bpp = 12; @@ -321,6 +324,7 @@ depth = 24; bpp = 32; format = PICT_x8r8g8b8; + stride *= 4; break; default: return BadImplementation; @@ -339,7 +343,7 @@ srcWidth, srcHeight, depth, bpp, -1, (pointer) data); - XGL_GET_PIXMAP_PRIV (pPortPriv->pPixmap)->stride = -((srcWidth + 7) & ~7); + XGL_GET_PIXMAP_PRIV (pPortPriv->pPixmap)->stride = -stride; pPortPriv->pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER; @@ -594,11 +598,6 @@ pAdaptor->nImages = sizeof (xvImages) / sizeof (XvImageRec); pAdaptor->pImages = xvImages; - /* XXX: Disable YUY2 format as it's not accelerated and the software - fallback got issues. */ - pAdaptor->nImages = sizeof (xvImages) / sizeof (XvImageRec) - 1; - pAdaptor->pImages = &xvImages[1]; - /* TODO: Currently no attributes */ pAdaptor->nAttributes = 0; pAdaptor->pAttributes = 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 xen
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package xen checked in at Sat Jun 3 01:01:10 CEST 2006. -------- --- arch/i386/xen/xen.changes 2006-06-02 00:14:42.000000000 +0200 +++ xen/xen.changes 2006-06-02 19:45:21.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jun 2 11:08:07 MDT 2006 - ccoffing(a)novell.com + +- Include xen-3.0-testing changeset 9693. This scales the + ballooning timeout with the amount of memory being requested + (necessary for large memory machines). This is a more proper fix + for Novell bug #175805, and addresses XenSource bug #650. + +------------------------------------------------------------------- New: ---- xen-9693-wait-for-large-ballooning.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.ELlmgs/_old 2006-06-03 01:00:39.000000000 +0200 +++ /var/tmp/diff_new_pack.ELlmgs/_new 2006-06-03 01:00:39.000000000 +0200 @@ -19,7 +19,7 @@ %define with_pygrub 1 %define xen_build_dir xen-3.0-testing Version: 3.0.2_09697 -Release: 2 +Release: 3 License: GPL Group: System/Kernel Autoreqprov: on @@ -103,9 +103,10 @@ Patch114: xen-9685-segment-bases.diff Patch115: xen-9686-32-64-vmx-regs.diff Patch116: xen-9688-rm-broken-string-func.diff -Patch117: xen-9695-signed.diff -Patch118: xen-9696-rm-broken-string-func.diff -Patch119: xen-unstable-9967-summa.diff +Patch117: xen-9693-wait-for-large-ballooning.diff +Patch118: xen-9695-signed.diff +Patch119: xen-9696-rm-broken-string-func.diff +Patch120: xen-unstable-9967-summa.diff Patch200: xen-enable-hvm-debug.diff Patch201: xen-enable-debug Patch202: xen-poweroff.diff @@ -472,6 +473,7 @@ %patch117 -p1 %patch118 -p1 %patch119 -p1 +%patch120 -p1 # Now our patches... %patch1 -p1 %patch2 -p1 @@ -829,6 +831,11 @@ %{insserv_cleanup} %changelog -n xen +* Fri Jun 02 2006 - ccoffing(a)novell.com +- Include xen-3.0-testing changeset 9693. This scales the + ballooning timeout with the amount of memory being requested + (necessary for large memory machines). This is a more proper fix + for Novell bug #175805, and addresses XenSource bug #650. * Thu Jun 01 2006 - ccoffing(a)novell.com - Update the README, regarding how to make the mouse work properly with VNC in HVM. ++++++ xen-9693-wait-for-large-ballooning.diff ++++++ # HG changeset patch # User kaf24(a)firebug.cl.cam.ac.uk # Date Thu May 25 21:41:59 2006 +0100 # Node ID a4214205e288196afc4193cd47d8bf515712d16f # parent: 4664b4c68212133c84a1a8c6f8e8705e9c530130 [XEND] Wait sufficient time for memory to balloon out before creating a new domain. On the ES7000 when Dom0 boots up with all of system memory and you try to bring up a DomU with more than 2GB of memory, xend times out before the memory is freed causing the domain not to be created. This patch increases the timeout depending on the amount of memory that needs to be freed. It also places a cap on the sleep time so that it does not grow without a limit. This fixes bug# 650 http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=3D650 Signed-off-by: Aravindh Puthiyaparambil <aravindh.puthiyaparambil(a)unisys.com> xen-unstable changeset: 10165:93db1b536f383ee93359080097b0870ea3add01a xen-unstable date: Thu May 25 21:41:04 2006 +0100 --- a/tools/python/xen/xend/balloon.py Thu May 25 21:20:02 2006 +0100 +++ b/tools/python/xen/xend/balloon.py Thu May 25 21:41:59 2006 +0100 @@ -32,6 +32,7 @@ BALLOON_OUT_SLACK = 1 # MiB. We need th BALLOON_OUT_SLACK = 1 # MiB. We need this because the physinfo details are # rounded. RETRY_LIMIT = 10 +RETRY_LIMIT_INCR = 5 ## # The time to sleep between retries grows linearly, using this value (in # seconds). When the system is lightly loaded, memory should be scrubbed and @@ -118,7 +119,8 @@ def free(required): retries = 0 sleep_time = SLEEP_TIME_GROWTH last_new_alloc = None - while retries < RETRY_LIMIT: + rlimit = RETRY_LIMIT + while retries < rlimit: free_mem = xc.physinfo()['free_memory'] if free_mem >= need_mem: @@ -127,7 +129,9 @@ def free(required): return if retries == 0: - log.debug("Balloon: free %d; need %d.", free_mem, need_mem) + rlimit += ((need_mem - free_mem)/1024) * RETRY_LIMIT_INCR + log.debug("Balloon: free %d; need %d; retries: %d.", + free_mem, need_mem, rlimit) if dom0_min_mem > 0: dom0_alloc = get_dom0_current_alloc() @@ -143,8 +147,9 @@ def free(required): # Continue to retry, waiting for ballooning. time.sleep(sleep_time) + if retries < 2 * RETRY_LIMIT: + sleep_time += SLEEP_TIME_GROWTH retries += 1 - sleep_time += SLEEP_TIME_GROWTH # Not enough memory; diagnose the problem. if dom0_min_mem == 0: ++++++ xen-balloon.diff ++++++ --- /var/tmp/diff_new_pack.ELlmgs/_old 2006-06-03 01:00:43.000000000 +0200 +++ /var/tmp/diff_new_pack.ELlmgs/_new 2006-06-03 01:00:43.000000000 +0200 @@ -2,68 +2,37 @@ =================================================================== --- xen-3.0-testing.orig/tools/python/xen/xend/balloon.py +++ xen-3.0-testing/tools/python/xen/xend/balloon.py -@@ -31,7 +31,11 @@ PROC_XEN_BALLOON = '/proc/xen/balloon' +@@ -31,6 +31,9 @@ PROC_XEN_BALLOON = '/proc/xen/balloon' BALLOON_OUT_SLACK = 1 # MiB. We need this because the physinfo details are # rounded. --RETRY_LIMIT = 10 +RETURN_OVERSHOOT = 16 # MiB. Overshooting the target free memory by less + # than this amount is okay; more than this is returned + # to domain 0 (other domains may have died, freeing mem.) -+ -+RETRY_LIMIT = 20 + RETRY_LIMIT = 10 + RETRY_LIMIT_INCR = 5 ## - # The time to sleep between retries grows linearly, using this value (in - # seconds). When the system is lightly loaded, memory should be scrubbed and -@@ -127,26 +131,36 @@ def free(required): +@@ -128,7 +131,7 @@ def free(required): retries = 0 sleep_time = SLEEP_TIME_GROWTH - last_new_alloc = None + last_new_alloc = float('inf') -+ last_dom0_alloc = None -+ times_unchanged = 0 - while retries < RETRY_LIMIT: + rlimit = RETRY_LIMIT + while retries < rlimit: free_mem = xc.physinfo()['free_memory'] -+ dom0_alloc = get_dom0_current_alloc() -+ if dom0_alloc == last_dom0_alloc: -+ times_unchanged += 1 -+ else: -+ times_unchanged = 0 -+ last_dom0_alloc = dom0_alloc +@@ -148,7 +151,8 @@ def free(required): + new_alloc = dom0_alloc - (need_mem - free_mem) -+ log.debug("Balloon #%d: free %d; need %d", retries, free_mem, need_mem) - if free_mem >= need_mem: -- log.debug("Balloon: free %d; need %d; done.", free_mem, -- need_mem) - return - -- if retries == 0: -- log.debug("Balloon: free %d; need %d.", free_mem, need_mem) -+ # This gives it at least 2.1 seconds to respond any, yet prevents -+ # us from waiting the full time if nothing is going to happen. -+ if times_unchanged > 4: -+ break - - if dom0_min_mem > 0: -- dom0_alloc = get_dom0_current_alloc() -- new_alloc = dom0_alloc - (need_mem - free_mem) -+ log.debug("Balloon #%d: dom0_alloc %d; free %d; need %d.", -+ retries, dom0_alloc, free_mem, need_mem) - -+ new_alloc = dom0_alloc - (need_mem - free_mem) if (new_alloc >= dom0_min_mem and - new_alloc != last_new_alloc): -- log.debug("Balloon: setting dom0 target to %d.", -- new_alloc) + (new_alloc < last_new_alloc or + new_alloc > last_new_alloc + RETURN_OVERSHOOT)): -+ log.debug("Balloon: setting dom0 target to %d.", new_alloc) + log.debug("Balloon: setting dom0 target to %d.", + new_alloc) dom0 = XendDomain.instance().privilegedDomain() - dom0.setMemoryTarget(new_alloc) - last_new_alloc = new_alloc -@@ -157,7 +171,7 @@ def free(required): - sleep_time += SLEEP_TIME_GROWTH +@@ -162,7 +166,7 @@ def free(required): + retries += 1 # Not enough memory; diagnose the problem. - if dom0_min_mem == 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 vdr13
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package vdr13 checked in at Sat Jun 3 01:00:42 CEST 2006. -------- New Changes file: --- /dev/null 2002-12-09 23:01:21.000000000 +0100 +++ vdr13/vdr13-internal.changes 2006-06-02 15:59:14.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Jun 2 15:58:33 CEST 2006 - lnussel(a)suse.de + +- initial package branched off vdr 1.4.0 + --- vdr13/vdr13.changes 2006-05-30 08:50:43.000000000 +0200 +++ vdr13/vdr13.changes 2006-06-02 16:07:48.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 16:07:42 CEST 2006 - lnussel(a)suse.de + +- remove unused patches + +------------------------------------------------------------------- Old: ---- vdr-1.3.14-sc.diff New: ---- vdr-1.3.38-ffdecsa-0.1.3.diff vdr-1.3.38-sc.diff vdr-1.4.0-ffdecsa-cflags.diff vdr13-internal.changes vdr13-internal.spec vdr13.spec.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vdr13-internal.spec ++++++ # # spec file for package vdr13-internal (Version 1.4.0) # # 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://bugs.opensuse.org/ # # norootforbuild Name: vdr13-internal # !!! DO NOT EDIT THIS FILE, APPLY vdr13.spec.diff INSTEAD Provides: vdr13 BuildRequires: dvb freetype2-devel gcc-c++ libjpeg-devel %if %suse_version > 1000 BuildRequires: libcap-devel %else BuildRequires: libcap %endif %define with_freetype %{?_with_freetype:1}%{!?_with_freetype:0} Url: http://www.cadsoft.de/people/kls/vdr/ License: GPL Group: Hardware/TV Requires: dvb Prereq: /usr/sbin/useradd Version: 1.4.0 Release: 1 Summary: Video Disk Recorder Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2 Source1: rcvdr Source2: sysconfig.vdr Source3: vdr-shutdown.sh Source4: runvdr #Source5: README.SuSE-vdr Source6: openvt.diff #Source7: vdr-genindex.c Source8: channels.conf Source9: remote.conf Patch0: vdr13-scripts.diff Patch1: vdr-1.4.0-1_norunvdr.diff Patch2: vdr-1.4.0-2_norunvdr.diff Patch12: vdr-1.3.45-dvbplayer-nosleep.diff Patch13: vdr-1.3.25-utf8-0.0.3.patch Patch14: vdr-1.3.23-utf8-fonts.diff Patch20: runvdr.diff # unused patches Patch98: vdr-1.3.5-find-v4l-device-kernel-2.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %with_freetype Requires: xorg-x11-fonts-scalable %endif Patch80: vdr-1.3.38-sc.diff Patch81: vdr-1.3.38-ffdecsa-0.1.3.diff Patch82: vdr-1.4.0-ffdecsa-cflags.diff Patch85: vdr13.spec.diff %description This is a hard disk video recording software supporting the Siemens DVB-S card and compatible devices. %prep %setup -n vdr-%{version} cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE4} . # need to find a better solution for this ... if [ -x /usr/bin/quilt ]; then qpatch() { test -d patches || mkdir patches patch=$1; shift; quilt import "$@" -P ${patch##*/} "$patch" } qpush() { tac < patches/series > patches/series.1 mv patches/series.1 patches/series quilt push -a } else qpatch() { patch=$1; shift; [ -z "$*" ] && set -- -p1 case `file -b "$patch"` in gzip*) %{_gzipbin} -dc "$patch" ;; bzip2*) %{_bzip2bin} -dc "$patch" ;; *) cat "$patch" ;; esac | %__patch "$@" } qpush() { :; } fi # qpatch %PATCH0 qpatch %PATCH1 qpatch %PATCH2 qpatch %PATCH12 #qpatch %PATCH11 %if %with_freetype qpatch %PATCH13 qpatch %PATCH14 %endif qpatch %PATCH20 -p0 qpatch %PATCH80 -p1 qpatch %PATCH81 -p1 qpatch %PATCH82 -p1 qpush # cat > Make.config <<EOF ### The C compiler options: CFLAGS = $RPM_OPT_FLAGS -fPIC CXXFLAGS = -fPIC $RPM_OPT_FLAGS -Wall -Woverloaded-virtual ### The directory environment: DVBDIR = ./DVB MANDIR = %{_mandir} BINDIR = %{_bindir} VIDEODIR = /var/spool/video REMOTE = LIRC PLUGINLIBDIR = %{_libdir}/vdr13/ VDR_USER = vdr WITH_CAPABILITIES = 1 INCLUDES += -I/usr/include/freetype2 EOF # %build #cp %{SOURCE5} README.SuSE cp %{SOURCE6} . #cp %{SOURCE7} . make %{?jobs:-j%jobs} make plugins %install rm -rf $RPM_BUILD_ROOT install -d -m 755 %{buildroot}%{_mandir}/man{1,5} install -d -m 755 %{buildroot}%{_sbindir} install -d -m 755 %{buildroot}%{_bindir} install -d -m 755 %{buildroot}/etc/vdr13 install -d -m 755 %{buildroot}/etc/vdr13/plugins install -d -m 755 %{buildroot}/var/spool/video install -d -m 755 %{buildroot}%{_libdir}/vdr13/ install -d -m 755 %{buildroot}%{_includedir}/vdr13 make MANDIR=%{buildroot}%{_mandir} \ BINDIR=%{buildroot}%{_sbindir} \ VIDEODIR=%{buildroot}/var/spool/video \ PLUGINLIBDIR=%{buildroot}%{_libdir}/vdr13 \ install mv %{buildroot}%{_sbindir}/vdr %{buildroot}%{_sbindir}/vdr13 for i in %{buildroot}%{_mandir}/*/*; do r=${i##*/vdr}; mv $i ${i%%/*}/vdr13$r done install -m 644 *.conf %{buildroot}/etc/vdr13 for i in epg2html.pl svdrpsend.pl PLUGINS/src/sky/getskyepg.pl; do install -m 755 $i %{buildroot}%{_bindir}/vdr13-${i##*/} done install -m 644 *.h %{buildroot}%{_includedir}/vdr13 install -m 644 Make.config %{buildroot}%{_includedir}/vdr13 ln -s . %{buildroot}%{_includedir}/vdr13/vdr ln -s . %{buildroot}%{_includedir}/vdr13/include install -m 755 PLUGINS/lib/* %{buildroot}%{_libdir}/vdr13/ install -m 755 %{SOURCE3} %{buildroot}/etc/vdr13/shutdown.sh #sysconfig&init install -d -m 755 %{buildroot}/var/adm/fillup-templates install -m 644 sysconfig.vdr %{buildroot}/var/adm/fillup-templates/sysconfig.vdr13 install -d -m 755 %{buildroot}/etc/init.d install -m 755 rcvdr %{buildroot}/etc/init.d/vdr13 ln -s ../../etc/init.d/vdr13 %{buildroot}%{_sbindir}/rcvdr13 # create plugins doc dir mkdir plugins cp -a PLUGINS/src/sky/channels.conf.sky PLUGINS/src/sky/lircd.conf.sky plugins cp -a PLUGINS/src/sky/README plugins/README.sky cp -a PLUGINS/src/osddemo/README plugins/README.osddemo rm %{buildroot}%{_sbindir}/runvdr install -m 755 runvdr %{buildroot}%{_sbindir}/runvdr13 install -m 644 %{SOURCE8} %{buildroot}/etc/vdr13/channels.conf install -m 644 %{SOURCE9} %{buildroot}/etc/vdr13/remote.conf %clean rm -rf $RPM_BUILD_ROOT %pre /usr/sbin/useradd -r -d /var/spool/video -s /bin/false -c "Video Disk Recorder" -g video vdr 2> /dev/null || : %post %{fillup_and_insserv vdr13} %postun %{insserv_cleanup} %files %defattr(-,root,root) #%doc README.SuSE %doc COPYING INSTALL README CONTRIBUTORS HISTORY %doc MANUAL channels.conf.* PLUGINS.html plugins %doc openvt.diff %attr(755,vdr,root) %dir /var/spool/video %attr(755,vdr,root) %dir /etc/vdr13 %dir %{_libdir}/vdr13 %dir %{_includedir}/vdr13 %attr(-,vdr,root) %config(noreplace) /etc/vdr13/* %{_sbindir}/* %{_bindir}/* %{_libdir}/vdr13/* %{_includedir}/vdr13/* %{_mandir}/man?/* /etc/init.d/* /var/adm/fillup-templates/* %changelog -n vdr13-internal * Fri Jun 02 2006 - lnussel(a)suse.de - initial package branched off vdr 1.4.0 ++++++ vdr13.spec ++++++ --- /var/tmp/diff_new_pack.wN0NMk/_old 2006-06-03 01:00:12.000000000 +0200 +++ /var/tmp/diff_new_pack.wN0NMk/_new 2006-06-03 01:00:12.000000000 +0200 @@ -24,7 +24,7 @@ Requires: dvb Prereq: /usr/sbin/useradd Version: 1.4.0 -Release: 4 +Release: 5 Summary: Video Disk Recorder Source: ftp://ftp.cadsoft.de/vdr/Developer/vdr-%{version}.tar.bz2 Source1: rcvdr @@ -45,7 +45,6 @@ Patch20: runvdr.diff # unused patches Patch98: vdr-1.3.5-find-v4l-device-kernel-2.6.patch -Patch99: vdr-1.3.14-sc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %with_freetype Requires: xorg-x11-fonts-scalable @@ -92,7 +91,7 @@ { test -d patches || mkdir patches patch=$1; shift; - quilt import "$@" -n ${patch##*/} "$patch" + quilt import "$@" -P ${patch##*/} "$patch" } qpush() { @@ -228,6 +227,8 @@ /var/adm/fillup-templates/* %changelog -n vdr13 +* Fri Jun 02 2006 - lnussel(a)suse.de +- remove unused patches * Tue May 30 2006 - lnussel(a)suse.de - add maintenance patches 1 and 2 * Tue May 02 2006 - lnussel(a)suse.de ++++++ vdr-1.3.38-ffdecsa-0.1.3.diff ++++++ ++++ 7323 lines (skipped) ++++++ vdr-1.3.14-sc.diff -> vdr-1.3.38-sc.diff ++++++ --- vdr13/vdr-1.3.14-sc.diff 2005-05-12 15:52:39.000000000 +0200 +++ vdr13/vdr-1.3.38-sc.diff 2006-06-02 15:00:21.000000000 +0200 @@ -1,93 +1,126 @@ -diff -uN -X ex.vdr-sc vdr-1.3.14-orig/ci.c vdr-1.3.14/ci.c ---- vdr-1.3.14-orig/ci.c 2004-07-17 16:30:17.000000000 +0200 -+++ vdr-1.3.14/ci.c 2004-10-24 17:58:19.000000000 +0200 -@@ -1340,6 +1340,11 @@ - close(fd); - } - -+int cCiHandler::GetCaFd(void) -+{ -+ return dup(fd); -+} -+ - cCiHandler *cCiHandler::CreateCiHandler(const char *FileName) - { - int fd_ca = open(FileName, O_RDWR); -diff -uN -X ex.vdr-sc vdr-1.3.14-orig/ci.h vdr-1.3.14/ci.h ---- vdr-1.3.14-orig/ci.h 2004-02-08 15:36:23.000000000 +0100 -+++ vdr-1.3.14/ci.h 2004-10-24 17:58:19.000000000 +0200 -@@ -82,6 +82,8 @@ +diff -urN -X ex.vdr-sc vdr-1.3.38-orig/ci.h vdr-1.3.38/ci.h +--- vdr-1.3.38-orig/ci.h 2006-01-07 16:03:05.000000000 +0100 ++++ vdr-1.3.38/ci.h 2006-03-16 18:26:46.000000000 +0100 +@@ -96,6 +96,9 @@ class cCiTransportLayer; class cCiTransportConnection; -+#define VDR_IS_SC_PATCHED 314 ++#include <unistd.h> ++#define VDR_IS_SC_PATCHED 330 + class cCiHandler { private: cMutex mutex; -@@ -115,6 +117,7 @@ - bool ProvidesCa(const unsigned short *CaSystemIds); //XXX Slot??? - bool SetCaPmt(cCiCaPmt &CaPmt, int Slot); +@@ -175,6 +178,7 @@ + ///< Triggers sending all currently active CA_PMT entries to the CAM, + ///< so that it will start decrypting. bool Reset(int Slot); -+ int GetCaFd(void); ++ int GetCaFd(void) { return dup(fd); } }; #endif //__CI_H -diff -uN -X ex.vdr-sc vdr-1.3.14-orig/dvbdevice.c vdr-1.3.14/dvbdevice.c ---- vdr-1.3.14-orig/dvbdevice.c 2004-10-24 13:06:37.000000000 +0200 -+++ vdr-1.3.14/dvbdevice.c 2004-10-24 17:58:19.000000000 +0200 -@@ -448,13 +448,47 @@ - return fd_video >= 0 && fd_audio >= 0; +diff -urN -X ex.vdr-sc vdr-1.3.38-orig/dvbdevice.c vdr-1.3.38/dvbdevice.c +--- vdr-1.3.38-orig/dvbdevice.c 2006-01-07 16:15:01.000000000 +0100 ++++ vdr-1.3.38/dvbdevice.c 2006-03-16 18:26:46.000000000 +0100 +@@ -501,17 +501,31 @@ + return true; } -+#include "plugin.h" -+#define SC_NAME "sc" -+#define SC_MAGIC { 0,'S','C',0xc4,0x5e,0xa1 } -+#define OP_PROVIDES 0 -+#define OP_IGNORE 1 -+ -+struct ScLink { -+ char magic[6]; -+ short op; -+ const cDevice *dev; -+ unsigned short *caids; -+ const cChannel *channel; -+ int num; -+ }; ++#include "sclink.h" + int cDvbDevice::ProvidesCa(const cChannel *Channel) const { -+#ifndef HAVE_SOFTCSA - if (Channel->Ca() >= 0x0100 && ciHandler) { -+#else -+ if (Channel->Ca() >= 0x0100) { -+#endif - unsigned short ids[MAXCAIDS + 1]; - for (int i = 0; i <= MAXCAIDS; i++) // '<=' copies the terminating 0! - ids[i] = Channel->Ca(i); -- return ciHandler->ProvidesCa(ids); -+ struct ScLink link = { SC_MAGIC,0,this,ids,Channel,0 }; -+ cPlugin *p = cPluginManager::GetPlugin(SC_NAME); -+ int n; -+ if(ciHandler && (n=ciHandler->ProvidesCa(ids))) { -+ if(p) { // ignore this channel in SC (ugly hack!) -+ link.op=OP_IGNORE; -+ p->SetupParse((const char *)&link,""); -+ } -+ return n; -+ } -+ else if(p) { -+ // check if SC provides the ID (ugly hack!) -+ link.op=OP_PROVIDES; -+ p->SetupParse((const char *)&link,""); -+ return link.num; -+ } + int NumCams = 0; +- if (ciHandler) { ++ if (ciHandler) + NumCams = ciHandler->NumCams(); ++ struct ScLink link; ++ PrepareScLink(&link,this,OP_CAMS); ++ int n = DoScLinkOp(&link); ++ if (n > 0 && n > NumCams) ++ NumCams = n; ++ if (NumCams > 0) { + if (Channel->Ca() >= CA_ENCRYPTED_MIN) { + unsigned short ids[MAXCAIDS + 1]; + for (int i = 0; i <= MAXCAIDS; i++) // '<=' copies the terminating 0! + ids[i] = Channel->Ca(i); +- if (ciHandler->ProvidesCa(ids)) ++ if (ciHandler && ciHandler->ProvidesCa(ids)) + return NumCams + 1; ++ else { ++ PrepareScLink(&link,this,OP_PROVIDES); ++ link.data.caids=ids; ++ if (DoScLinkOp(&link) > 0) ++ return NumCams + 1; ++ } + } } - return cDevice::ProvidesCa(Channel); - } -diff -uN -X ex.vdr-sc vdr-1.3.14-orig/pat.c vdr-1.3.14/pat.c ---- vdr-1.3.14-orig/pat.c 2004-10-16 12:01:12.000000000 +0200 -+++ vdr-1.3.14/pat.c 2004-10-24 17:58:19.000000000 +0200 + int result = cDevice::ProvidesCa(Channel); +@@ -681,8 +695,18 @@ + LOG_ERROR; + return false; + } ++ struct ScLink link; ++ PrepareScLink(&link,this,OP_ADDPID); ++ link.data.pids.pid=Handle->pid; ++ link.data.pids.type=Type; ++ DoScLinkOp(&link); + } + else if (!Handle->used) { ++ struct ScLink link; ++ PrepareScLink(&link,this,OP_DELPID); ++ link.data.pids.pid=Handle->pid; ++ DoScLinkOp(&link); ++ + CHECK(ioctl(Handle->handle, DMX_STOP)); + if (Type <= ptTeletext) { + pesFilterParams.pid = 0x1FFF; +@@ -775,8 +799,14 @@ + if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) { + #ifdef DO_MULTIPLE_RECORDINGS + #ifndef DO_MULTIPLE_CA_CHANNELS +- if (Ca() >= CA_ENCRYPTED_MIN || Channel->Ca() >= CA_ENCRYPTED_MIN) +- needsDetachReceivers = Ca() != Channel->Ca(); ++ if (Ca() >= CA_ENCRYPTED_MIN || Channel->Ca() >= CA_ENCRYPTED_MIN) { ++ struct ScLink link; ++ PrepareScLink(&link,this,OP_ALLOWED); ++ if(Channel->Ca()<CA_ENCRYPTED_MIN || DoScLinkOp(&link)>0) ++ result = true; ++ else ++ needsDetachReceivers = Ca() != Channel->Ca(); ++ } + else + #endif + if (!IsPrimaryDevice()) +@@ -824,11 +854,25 @@ + + // Turn off live PIDs if necessary: + ++ if (!TurnOffLivePIDs && HasDecoder() && Channel->Ca() >= CA_ENCRYPTED_MIN && (pidHandles[ptAudio].pid || pidHandles[ptVideo].pid)) { ++ struct ScLink link; ++ PrepareScLink(&link,this,OP_LIVE); ++ if(DoScLinkOp(&link)>0) ++ TurnOffLivePIDs=true; ++ } ++ + if (TurnOffLivePIDs) + TurnOffLiveMode(LiveView); + + // Set the tuner: + ++ if(DoTune) { ++ struct ScLink link; ++ PrepareScLink(&link,this,OP_TUNE); ++ link.data.tune.source=Channel->Source(); ++ link.data.tune.transponder=Channel->Transponder(); ++ DoScLinkOp(&link); ++ } + dvbTuner->Set(Channel, DoTune); + + // If this channel switch was requested by the EITScanner we don't wait for +diff -urN -X ex.vdr-sc vdr-1.3.38-orig/pat.c vdr-1.3.38/pat.c +--- vdr-1.3.38-orig/pat.c 2005-09-04 16:32:39.000000000 +0200 ++++ vdr-1.3.38/pat.c 2006-03-16 18:26:46.000000000 +0100 @@ -158,7 +158,7 @@ for (cCaDescriptor *d = caDescriptors.First(); d; d = caDescriptors.Next(d)) { const unsigned short *caids = CaSystemIds; @@ -97,3 +130,81 @@ if (length + d->Length() <= BufSize) { if (IsStream >= 0 && IsStream != d->Stream()) dsyslog("CAM: different stream flag in CA descriptors"); +diff -urN -X ex.vdr-sc vdr-1.3.38-orig/sclink.h vdr-1.3.38/sclink.h +--- vdr-1.3.38-orig/sclink.h 1970-01-01 01:00:00.000000000 +0100 ++++ vdr-1.3.38/sclink.h 2006-03-16 18:26:46.000000000 +0100 +@@ -0,0 +1,74 @@ ++/* ++ * Softcam plugin to VDR (C++) ++ * ++ * This code 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; either version 2 ++ * of the License, or (at your option) any later version. ++ * ++ * This code is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html ++ */ ++ ++#define SC_NAME "sc" ++#define SC_MAGIC { 0,'S','C',0xc4,0x5e,0xa2 } ++ ++#define OP_PROVIDES 0 ++#define OP_ADDPID 1 ++#define OP_DELPID 2 ++#define OP_TUNE 3 ++#define OP_ALLOWED 4 ++#define OP_CAMS 5 ++#define OP_LIVE 6 ++ ++struct ScLink { ++ char magic[6]; ++ short op; ++ const cDevice *dev; ++ union { ++ unsigned short *caids; ++ struct { ++ int pid; ++ int type; ++ } pids; ++ struct { ++ int source; ++ int transponder; ++ } tune; ++ int live; ++ } data; ++ int num; ++ }; ++ ++static const char magic[] = SC_MAGIC; ++ ++#ifndef PLUGIN_COMPILE ++ ++#include "plugin.h" ++ ++void PrepareScLink(struct ScLink *link, const cDevice *dev, int op) ++{ ++ memcpy(link->magic,magic,sizeof(link->magic)); ++ link->op=op; ++ link->dev=dev; ++ link->num=-1; ++} ++ ++int DoScLinkOp(struct ScLink *link) ++{ ++ cPlugin *p=cPluginManager::GetPlugin(SC_NAME); ++ if(p) { ++ p->SetupParse((const char *)link,""); ++ return link->num; ++ } ++ return -1; ++} ++ ++#endif ++++++ vdr-1.4.0-ffdecsa-cflags.diff ++++++ Index: vdr-1.4.0/FFdecsa/Makefile =================================================================== --- vdr-1.4.0.orig/FFdecsa/Makefile +++ vdr-1.4.0/FFdecsa/Makefile @@ -19,7 +19,10 @@ #FLAGS += -pg COMPILER ?= g++ -FLAGS ?= -Wall -O3 -march=pentium -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops +#FLAGS ?= -Wall -O3 -march=pentium -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops + +-include ../Make.config +FLAGS = $(CFLAGS) H_FILES = FFdecsa.h parallel_generic.h parallel_std_def.h \ parallel_032_4char.h \ Index: vdr-1.4.0/Makefile =================================================================== --- vdr-1.4.0.orig/Makefile +++ vdr-1.4.0/Makefile @@ -93,7 +93,7 @@ endif OBJS += csa.o CPUOPT ?= pentium PARALLEL ?= PARALLEL_32_INT -CSAFLAGS = -Wall -fPIC -g -O3 -march=$(CPUOPT) -mmmx -DPARALLEL_MODE=$(PARALLEL) -fomit-frame-pointer -fexpensive-optimizations -funroll-loops +CSAFLAGS = $(CFLAGS) -DPARALLEL_MODE=$(PARALLEL) -fomit-frame-pointer -fexpensive-optimizations -funroll-loops FFDECSADIR = FFdecsa FFDECSA = $(FFDECSADIR)/FFdecsa.o ++++++ vdr13.spec.diff ++++++ Index: vdr13/vdr13-internal.spec =================================================================== --- vdr13.orig/vdr13-internal.spec +++ vdr13/vdr13-internal.spec @@ -10,7 +10,9 @@ # norootforbuild -Name: vdr13 +Name: vdr13-internal +# !!! DO NOT EDIT THIS FILE, APPLY vdr13.spec.diff INSTEAD +Provides: vdr13 BuildRequires: dvb freetype2-devel gcc-c++ libjpeg-devel %if %suse_version > 1000 BuildRequires: libcap-devel @@ -49,6 +51,10 @@ BuildRoot: %{_tmppath}/%{name}-%{ve %if %with_freetype Requires: xorg-x11-fonts-scalable %endif +Patch80: vdr-1.3.38-sc.diff +Patch81: vdr-1.3.38-ffdecsa-0.1.3.diff +Patch82: vdr-1.4.0-ffdecsa-cflags.diff +Patch85: vdr13.spec.diff %description This is a hard disk video recording software supporting the Siemens @@ -123,6 +129,9 @@ qpatch %PATCH13 qpatch %PATCH14 %endif qpatch %PATCH20 -p0 +qpatch %PATCH80 -p1 +qpatch %PATCH81 -p1 +qpatch %PATCH82 -p1 qpush # cat > Make.config <<EOF ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tin
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package tin checked in at Sat Jun 3 01:00:34 CEST 2006. -------- --- tin/tin.changes 2006-02-21 22:00:43.000000000 +0100 +++ tin/tin.changes 2006-06-02 18:33:33.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 2 18:32:00 CEST 2006 - max(a)suse.de + +- Update to version 1.8.2 +- Fixes two possible buffer overflows and some other bugs. + +------------------------------------------------------------------- Old: ---- tin-1.8.1.diff tin-1.8.1.tar.bz2 New: ---- tin-1.8.2.tar.bz2 tin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tin.spec ++++++ --- /var/tmp/diff_new_pack.bPb5As/_old 2006-06-03 00:59:56.000000000 +0200 +++ /var/tmp/diff_new_pack.bPb5As/_new 2006-06-03 00:59:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package tin (Version 1.8.1) +# spec file for package tin (Version 1.8.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,12 +16,12 @@ License: Other License(s), see package Group: Productivity/Networking/News/Clients Requires: urlview metamail -Version: 1.8.1 +Version: 1.8.2 Release: 1 Summary: A News Reader BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-%{version}.tar.bz2 -Patch: tin-%{version}.diff +Patch: tin.patch %description Tin is a full-screen, easy to use Netnews reader. It can read news @@ -84,6 +84,9 @@ /usr/bin/* %changelog -n tin +* Fri Jun 02 2006 - max(a)suse.de +- Update to version 1.8.2 +- Fixes two possible buffer overflows and some other bugs. * Tue Feb 21 2006 - max(a)suse.de - Update to version 1.8.1 to fix a security issue (#152451). * Wed Jan 25 2006 - mls(a)suse.de ++++++ tin-1.8.1.tar.bz2 -> tin-1.8.2.tar.bz2 ++++++ ++++ 2027 lines of diff (skipped) ++++++ tin.patch ++++++ --- src/Makefile.in +++ src/Makefile.in @@ -382,7 +382,7 @@ install : $(DESTDIR)$(INS_BINARY_DIR) @$(MAKE) all @$(ECHO) "Installing $(EXE) v$(VER) to $(DESTDIR)$(INS_BINARY_DIR) ..." - @$(INSTALL) -s $(BINDIR)/$(EXE) $(DESTDIR)$(INS_BINARY_DIR)/$(EXE) + @$(INSTALL) $(BINDIR)/$(EXE) $(DESTDIR)$(INS_BINARY_DIR)/$(EXE) @( $(CD) $(DESTDIR)$(INS_BINARY_DIR) && $(RM) -f r$(EXE) && $(LN) $(EXE) r$(EXE) ) @$(MAKE) install_helpers @$(MAKE) install_manpage ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sysconfig
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package sysconfig checked in at Sat Jun 3 00:59:56 CEST 2006. -------- --- sysconfig/sysconfig.changes 2006-05-22 22:38:26.000000000 +0200 +++ sysconfig/sysconfig.changes 2006-06-02 16:04:42.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Jun 2 08:24:08 CEST 2006 - zoz(a)suse.de + +- Changed comment for LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY; now + also rcacpid respects this setting (Bug 180654) +- Set LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=yes only for SLES and + not for SLED (Bug 162970) +- 'ifdown-dhcp all' kills dhcp clients with -9, because interfaces + with STARTMODE=nfsroot must stay up and running. (Bug 176804) +- ifdown calls ifdown-dhcp even if BOOTPROTO=static. We need this to + to stop dhcp client after reconfiguration to static ip address + via YaST (which calls rcnetwork reload). (Bug 179895) +- eliminated two error messages that occur when interface bonding + is activated. (Bug 181129) + +------------------------------------------------------------------- +Tue May 30 12:08:25 CEST 2006 - zoz(a)suse.de + +- Don't load module 'bonding' multiple times but create and delete + bonding interfaces via sysfs attribute. (Bug 157936) + +------------------------------------------------------------------- @@ -7 +28 @@ - state. [#160916] + state. (Bug 160916) Old: ---- sysconfig-0.50.9-syslog-reload.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.RMkOvA/_old 2006-06-03 00:59:46.000000000 +0200 +++ /var/tmp/diff_new_pack.RMkOvA/_new 2006-06-03 00:59:46.000000000 +0200 @@ -13,7 +13,7 @@ Name: sysconfig BuildRequires: autofs portmap sysfsutils ypbind Version: 0.50.9 -Release: 14 +Release: 15 Summary: The sysconfig scheme Group: System/Base License: GPL @@ -22,7 +22,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk /usr/bin/sed /usr/bin/grep Source: %name-%version.tar.bz2 -Patch: sysconfig-0.50.9-syslog-reload.dif %description This package provides the SuSE system configuration scheme. @@ -42,7 +41,6 @@ %prep %setup -n sysconfig-%{version} -%patch -p1 %build autoreconf --force --install @@ -73,9 +71,6 @@ touch $RPM_BUILD_ROOT/etc/sysconfig/network/config touch $RPM_BUILD_ROOT/etc/sysconfig/network/dhcp touch $RPM_BUILD_ROOT/etc/sysconfig/hardware/config -%if %sles_version >= 10 -sed -i 's/^LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY.*/LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=no/' $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.config-hardware -%endif %files %defattr(-,root,root) @@ -195,6 +190,10 @@ fi # We move all udev helper scripts to /lib/udev sed -i 's#/sbin/rename_netiface#/lib/udev/rename_netiface#' /etc/udev/rules.d/* +# Don't load unsupported modules only on SLES +if grep -qs "Enterprise Server" /etc/SuSE-release; then +sed -i 's/^LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY.*/LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=no/' /var/adm/fillup-templates/sysconfig.config-hardware +fi %{fillup_and_insserv -fY network} %{fillup_only -dns dhcp network network} %{fillup_only -dns config network network} @@ -208,11 +207,26 @@ %{insserv_cleanup} %changelog -n sysconfig +* Fri Jun 02 2006 - zoz(a)suse.de +- Changed comment for LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY; now + also rcacpid respects this setting (Bug 180654) +- Set LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=yes only for SLES and + not for SLED (Bug 162970) +- 'ifdown-dhcp all' kills dhcp clients with -9, because interfaces + with STARTMODE=nfsroot must stay up and running. (Bug 176804) +- ifdown calls ifdown-dhcp even if BOOTPROTO=static. We need this to + to stop dhcp client after reconfiguration to static ip address + via YaST (which calls rcnetwork reload). (Bug 179895) +- eliminated two error messages that occur when interface bonding + is activated. (Bug 181129) +* Tue May 30 2006 - zoz(a)suse.de +- Don't load module 'bonding' multiple times but create and delete + bonding interfaces via sysfs attribute. (Bug 157936) * Mon May 22 2006 - poeml(a)suse.de - fix dhcpcd-hook so that syslog picks up a changed hostname during bootup, by reloading syslog. The reload was already being done during IP address change ("renew state") but not during "up" - state. [#160916] + state. (Bug 160916) * Thu May 18 2006 - zoz(a)suse.de - rcnetwork: quoted two occurrences $OLDPWD to allow spaces in directory names. (Bug 174029) ++++++ sysconfig-0.50.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/ChangeLog new/sysconfig-0.50.9/ChangeLog --- old/sysconfig-0.50.9/ChangeLog 2006-05-18 20:51:05.000000000 +0200 +++ new/sysconfig-0.50.9/ChangeLog 2006-06-02 14:03:08.000000000 +0200 @@ -1,4 +1,88 @@ ------------------------------------------------------------------------ +r1492 | zoz | 2006-06-02 14:02:32 +0200 (Fr, 02 Jun 2006) | 3 lines +GeÃ€nderte Pfade: + M /trunk/package/sysconfig.spec.in + +.spec: fixed if expression (for modification of +LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY) + +------------------------------------------------------------------------ +r1491 | zoz | 2006-06-02 13:51:44 +0200 (Fr, 02 Jun 2006) | 3 lines +GeÃ€nderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/functions + M /trunk/scripts/network + +eliminated two error messages that occur when interface bonding +is activated. (Bug 181129) + +------------------------------------------------------------------------ +r1490 | zoz | 2006-06-02 13:43:54 +0200 (Fr, 02 Jun 2006) | 5 lines +GeÃ€nderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/ifup + +ifdown calls ifdown-dhcp even if BOOTPROTO=static. We need this to +to stop dhcp client after reconfiguration to static ip address +via YaST (which calls rcnetwork reload). (Bug 179895) +(reload does not call 'ifdown-dhcp all') + +------------------------------------------------------------------------ +r1489 | zoz | 2006-06-02 11:17:29 +0200 (Fr, 02 Jun 2006) | 3 lines +GeÃ€nderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/package/sysconfig.spec.in + +Set LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=yes only for SLES and +not for SLED (Bug 162970) + +------------------------------------------------------------------------ +r1488 | zoz | 2006-06-02 11:01:50 +0200 (Fr, 02 Jun 2006) | 4 lines +GeÃ€nderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/ifup-dhcp + +'ifdown-dhcp all' kills dhcp clients with -9, because interfaces with +STARTMODE=nfsroot must stay up and running. (Bug 176804) + + +------------------------------------------------------------------------ +r1487 | zoz | 2006-06-02 10:30:37 +0200 (Fr, 02 Jun 2006) | 3 lines +GeÃ€nderte Pfade: + M /trunk/config/hardware/sysconfig.config-hardware + M /trunk/package/sysconfig.changes + +Changed comment for LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY; now also +rcacpid respects this setting (Bug 180654) + +------------------------------------------------------------------------ +r1486 | zoz | 2006-05-30 15:53:22 +0200 (Di, 30 Mai 2006) | 7 lines +GeÃ€nderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/functions + M /trunk/scripts/ifup + +Fixed bug 157936: +- scripts/functions: + + modified load_bond(): Don't load module 'bonding' multiple times but create + and delete bonding interfaces via sysfs attribute. + + added remove_bond(): remove a bonding interface via sysfs +- scripts/ifup: use remove_bond and don't explicitely flush slaves. + +------------------------------------------------------------------------ +r1485 | zoz | 2006-05-25 14:57:38 +0200 (Do, 25 Mai 2006) | 2 lines +GeÃ€nderte Pfade: + M /trunk/package/sysconfig.changes + +Changelog entry for last patchset + +------------------------------------------------------------------------ +r1484 | poeml | 2006-05-22 18:00:56 +0200 (Mo, 22 Mai 2006) | 1 line +GeÃ€nderte Pfade: + M /trunk/scripts/dhcpcd-hook + +fix for bug 160916: reload syslog after setting the interface to 'up', so the new hostname is reflected in the logs +------------------------------------------------------------------------ r1483 | zoz | 2006-05-18 20:50:17 +0200 (Do, 18 Mai 2006) | 2 lines GeÃ€nderte Pfade: M /trunk/package/sysconfig.changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/config/hardware/sysconfig.config-hardware new/sysconfig-0.50.9/config/hardware/sysconfig.config-hardware --- old/sysconfig-0.50.9/config/hardware/sysconfig.config-hardware 2006-03-10 17:30:59.000000000 +0100 +++ new/sysconfig-0.50.9/config/hardware/sysconfig.config-hardware 2006-06-02 13:51:54.000000000 +0200 @@ -36,8 +36,9 @@ # problem if your kernel is marked as tainted. In this case you firstly have # to avoid loading of unsupported modules. # If you set this variable to no, then no unsupported module will be loaded -# automatically via udev (hotplug), except there is a dedicated configuration -# file for the device. +# automatically via +# - udev (hotplug), except modules from dedicated configuration files +# - rcacpid, except there is a manually written list of modules # Note that there are many other places where modules are loaded which do not # respect this setting. LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=yes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/package/sysconfig.spec.in new/sysconfig-0.50.9/package/sysconfig.spec.in --- old/sysconfig-0.50.9/package/sysconfig.spec.in 2006-03-10 21:08:01.000000000 +0100 +++ new/sysconfig-0.50.9/package/sysconfig.spec.in 2006-06-02 14:02:37.000000000 +0200 @@ -70,9 +70,6 @@ touch $RPM_BUILD_ROOT/etc/sysconfig/network/config touch $RPM_BUILD_ROOT/etc/sysconfig/network/dhcp touch $RPM_BUILD_ROOT/etc/sysconfig/hardware/config -%if %sles_version >= 10 -sed -i 's/^LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY.*/LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=no/' $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.config-hardware -%endif %files %defattr(-,root,root) @@ -192,6 +189,11 @@ fi # We move all udev helper scripts to /lib/udev sed -i 's#/sbin/rename_netiface#/lib/udev/rename_netiface#' /etc/udev/rules.d/* + +# Don't load unsupported modules only on SLES +if grep -qs "Enterprise Server" /etc/SuSE-release; then +sed -i 's/^LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY.*/LOAD_UNSUPPORTED_MODULES_AUTOMATICALLY=no/' /var/adm/fillup-templates/sysconfig.config-hardware +fi %{fillup_and_insserv -fY network} %{fillup_only -dns dhcp network network} %{fillup_only -dns config network network} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/dhcpcd-hook new/sysconfig-0.50.9/scripts/dhcpcd-hook --- old/sysconfig-0.50.9/scripts/dhcpcd-hook 2006-01-13 13:50:25.000000000 +0100 +++ new/sysconfig-0.50.9/scripts/dhcpcd-hook 2006-05-29 13:19:44.000000000 +0200 @@ -19,7 +19,7 @@ # # Author: Peter Poeml <poeml(a)suse.de> # -# $Id: dhcpcd-hook 1287 2005-09-30 13:30:50Z poeml $ +# $Id: dhcpcd-hook 1484 2006-05-22 16:00:56Z poeml $ # @@ -106,6 +106,9 @@ up) $debug && $log_dbg "Running ifup $INTERFACE -o dhcp" ifup $INTERFACE -o dhcp + + # reload syslog so it knows the new hostname + /etc/init.d/syslog reload ;; down) # We now call PRE_DOWN_SCRIPT directly from ifdown, because it was called diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/functions new/sysconfig-0.50.9/scripts/functions --- old/sysconfig-0.50.9/scripts/functions 2006-05-18 19:17:59.000000000 +0200 +++ new/sysconfig-0.50.9/scripts/functions 2006-06-02 13:51:54.000000000 +0200 @@ -22,7 +22,7 @@ # Authors: Michal Svec <msvec(a)suse.cz> # Mads Martin Joergensen <mmj(a)suse.de> # -# $Id: functions 1481 2006-05-18 17:17:50Z zoz $ +# $Id: functions 1491 2006-06-02 11:51:44Z zoz $ # . /etc/sysconfig/network/scripts/functions.common @@ -146,42 +146,76 @@ 0x${NORM_2:0:2} 0x${NORM_2:2:2} } -# Loads one instance of the module 'bonding' with the name of the interface. +# Loads module 'bonding' if not already loaded. +# Creates a new bonding master interface and sets its options. # Usage: load_bond $INTERFACE $BONDING_MODULE_OPTIONS -# !!! Don't use module option 'max_bonds'. It will break this code !!! -# !!! Use one configuration file per bonding interface !!! +# Module option 'max_bonds' will be ignored. Use one configuration file per +# bonding interface instead. load_bond() { - local IF BIF NIF OPTS - test -z "$1" && return 0 - IF=$1 + local NIF OPT OPT_NAME OPT_VALUE IF=$1 + test -z "$IF" && return 0 shift - OPTS=$* - BIF=`cd /sys/class/net; ls -d bond* 2>/dev/null` - NIF= - if ls /sys/class/net/$IF &>/dev/null; then - return 0 - else - /sbin/modprobe -o $IF bonding $OPTS - for a in `seq 100`; do - for b in `cd /sys/class/net; ls -d bond* 2>/dev/null`; do - for c in $BIF; do - test "$b" = "$c" && continue 2 - done - NIF=$b # "$NIF $b" - break - done - test -n "$NIF" && break - usleep 100000 + if [ -d /sys/class/net/$IF -a ! -d /sys/class/net/$IF/bonding ] ; then + return 1 # Iface exists but of another type + fi + if [ ! -r /sys/class/net/bonding_masters ] ; then + /sbin/modprobe bonding + # If we add module option max_bonds=0 in the modprobe command above then + # we may skip the following lines in this if-fi block. + for a in `seq 33`; do + test -r /sys/class/net/bonding_masters && break + usleep 300000 done - if [ "$NIF" != "$IF" ] ; then + NIF=`cat /sys/class/net/bonding_masters` + if [ -n "$NIF" -a "$NIF" != "$IF" ] ; then nameif -r $IF $NIF fi fi - if ls /sys/class/net/$IF &>/dev/null; then - return 0 - else + if [ ! -d /sys/class/net/$IF/bonding ] ; then + echo "+$IF" > /sys/class/net/bonding_masters + fi + for a in `seq 33`; do + test -d /sys/class/net/$IF/bonding && break + usleep 300000 + done + if [ ! -d /sys/class/net/$IF/bonding ] ; then return 1 fi + # Set options + sleep 1 + for OPT in $*; do + read OPT_NAME OPT_VALUE < <(IFS==; echo $OPT) + if [ "$OPT_NAME" == max_bonds ] ; then + err_mesg "Don't use option max_bonds." + continue + fi + if [ ! -w /sys/class/net/$IF/bonding/$OPT_NAME ] ; then + err_mesg "There is no option '$OPT_NAME' for interface '$IF'." + echo "-$IF" > /sys/class/net/bonding_masters + return 1 # or continue? I guess its better to fail completely + fi + if ! echo "$OPT_VALUE" > /sys/class/net/$IF/bonding/$OPT_NAME ; then + err_mesg "Option '$OPT_NAME' of interface '$IF' cannot be set to" \ + "'$OPT_VALUE'." + echo "-$IF" > /sys/class/net/bonding_masters + return 1 # or continue? I guess its better to fail completely + fi + done + return 0 +} + +# Removes a bonding master interface +# Usage: remove_bond $INTERFACE +remove_bond () { + local IF=$1 + if [ ! -d /sys/class/net/$IF ] ; then + return 0 # Interface does not exist; nothing to do + fi + if [ ! -d /sys/class/net/$IF/bonding ] ; then + return 1 # Interface is not a bonding master + fi + ip link set down dev $1 + echo "-$IF" > /sys/class/net/bonding_masters } get_variable () { @@ -432,13 +466,13 @@ if [ -d "$VLAN_PATH" ]; then DEP_VLANS=`cd "$VLAN_PATH" - grep -lw "Device: *$BASE_IFACE" *` + grep -lws "Device: *$BASE_IFACE" *` DEP_IFACES="$DEP_VLANS" fi if [ -d "$BOND_PATH" ]; then DEP_BONDS=`cd "$BOND_PATH" - grep -lw "Slave Interface: *$BASE_IFACE" *` + grep -lws "Slave Interface: *$BASE_IFACE" *` DEP_IFACES="$DEP_IFACES${DEP_BONDS:+ $DEP_BONDS}" fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/ifup new/sysconfig-0.50.9/scripts/ifup --- old/sysconfig-0.50.9/scripts/ifup 2006-03-06 16:56:45.000000000 +0100 +++ new/sysconfig-0.50.9/scripts/ifup 2006-06-02 13:51:54.000000000 +0200 @@ -25,7 +25,7 @@ # Bjoern Jacke # Michal Ludvig <mludvig(a)suse.cz> # -# $Id: ifup 1437 2006-03-02 15:25:38Z zoz $ +# $Id: ifup 1490 2006-06-02 11:43:54Z zoz $ # usage () { @@ -885,6 +885,7 @@ fi if ! load_bond $INTERFACE $BONDING_MODULE_OPTS ; then logerror "Bonding: could not get interface $INTERFACE" + exit $R_NODEV fi fi # Get all slave interfaces from hardware descriptions @@ -1179,15 +1180,13 @@ ifup-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} ;; ifdown) + ifdown-dhcp $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} ifdown-route $CONFIG $INTERFACE ${OPTIONS:+-o $OPTIONS} ip addr flush dev $INTERFACE &>/dev/null ip link set dev $INTERFACE down &>/dev/null - # If this is an bonding master, flush slaves + # If this is an bonding master, remove it if [ "$BONDING_MASTER" = yes ] ; then - for BSIFACE in $BSINTERFACES; do - ip addr flush dev $BSIFACE - done - rmmod $INTERFACE + remove_bond $INTERFACE fi retcode=0 # $? ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/ifup-dhcp new/sysconfig-0.50.9/scripts/ifup-dhcp --- old/sysconfig-0.50.9/scripts/ifup-dhcp 2006-02-14 20:18:29.000000000 +0100 +++ new/sysconfig-0.50.9/scripts/ifup-dhcp 2006-06-02 13:51:54.000000000 +0200 @@ -18,7 +18,7 @@ # Author: Christian Zoz <zoz(a)suse.de>, 2002-2006 # Peter Poeml <poeml(a)suse.de>, 2002-2006 # -# $Id: ifup-dhcp 1413 2006-02-14 19:18:24Z zoz $ +# $Id: ifup-dhcp 1488 2006-06-02 09:01:50Z zoz $ # usage () { @@ -430,7 +430,8 @@ ;; esac - test "$INTERFACE" = all && killall $DHCLIENT_BIN &>/dev/null + # We send -9 because interfaces have to stay up for STARTMODE==nfsroot + test "$INTERFACE" = all && killall -9 $DHCLIENT_BIN &>/dev/null # delete primary flag from cache file delete_from_cached_config_data primary yes $INTERFACE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.50.9/scripts/network new/sysconfig-0.50.9/scripts/network --- old/sysconfig-0.50.9/scripts/network 2006-05-18 20:50:26.000000000 +0200 +++ new/sysconfig-0.50.9/scripts/network 2006-06-02 13:51:54.000000000 +0200 @@ -21,7 +21,7 @@ # Christian Zoz <zoz(a)suse.de> # Mads Martin Jørgensen <mmj(a)suse.de> # -# $Id: network 1483 2006-05-18 18:50:17Z zoz $ +# $Id: network 1491 2006-06-02 11:51:44Z zoz $ # # /etc/init.d/network # @@ -461,6 +461,7 @@ for a in $(type_filter `ls -A /sys/class/net/`); do test "$a" = lo && continue; test "$a" = sit0 && continue; + test "$a" = bonding_masters && continue; test "${a#wifi}" != "$a" && continue case $a in eth*|ath*|wlan*|ra*) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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