openSUSE Commits April 2006

commit@lists.opensuse.org

1 participants
1177 discussions

by root＠suse.de

Hello community, here is the log from the commit of package swi-prolog checked in at Sun Apr 2 12:32:16 CEST 2006. -------- --- swi-prolog/swi-prolog.changes 2006-01-25 21:41:56.000000000 +0100 +++ swi-prolog/swi-prolog.changes 2006-04-01 19:24:45.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 1 19:19:35 CEST 2006 - schwab(a)suse.de + +- Remove use of kernel headers to fix build on ppc. + +------------------------------------------------------------------- Old: ---- minmem New: ---- pl-5.6.3.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swi-prolog.spec ++++++ --- /var/tmp/diff_new_pack.yDbHOW/_old 2006-04-02 12:31:44.000000000 +0200 +++ /var/tmp/diff_new_pack.yDbHOW/_new 2006-04-02 12:31:44.000000000 +0200 @@ -5,7 +5,7 @@ # 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 +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -17,13 +17,14 @@ Obsoletes: swi_pl Autoreqprov: on Version: 5.6.3 -Release: 1 +Release: 8 Summary: SWI-Prolog distribution Source: pl-%{version}.tar.gz Source1: refman.pdf Source2: HTMLmanual.tar.gz Source3: userguide.pdf Source4: userguide.html.tgz +Patch: pl-%{version}.diff URL: http://www.swi-prolog.org Group: Development/Languages/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,6 +44,7 @@ %prep %setup -q -n pl-%{version} +%patch %build %{?suse_update_config:%{suse_update_config -f src packages}} @@ -59,7 +61,6 @@ %endif %install -rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_defaultdocdir}/swi-prolog/packages ############################################# ### Launch a virtual framebuffer X server ### @@ -134,6 +135,8 @@ %doc %{_prefix}/share/man/*/* %changelog -n swi-prolog +* Sat Apr 01 2006 - schwab(a)suse.de +- Remove use of kernel headers to fix build on ppc. * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Mon Jan 23 2006 - sndirsch(a)suse.de ++++++ pl-5.6.3.diff ++++++ --- src/configure.in +++ src/configure.in @@ -539,8 +539,8 @@ AC_TRY_COMPILE( [ #include <sys/types.h> -#include <linux/unistd.h> -_syscall0(pid_t,gettid) +#include <sys/syscall.h> +static inline pid_t gettid() { return syscall(SYS_gettid); } ], [ pid_t t = gettid(); ], AC_DEFINE(HAVE_GETTID, 1, --- src/pl-thread.c +++ src/pl-thread.c @@ -74,8 +74,8 @@ #include <errno.h> #if defined(__linux__) && defined(HAVE_GETTID) -#include <linux/unistd.h> -_syscall0(pid_t,gettid) +#include <sys/syscall.h> +static inline pid_t gettid() { return syscall(SYS_gettid); } #endif #ifdef HAVE_SEMA_INIT /* Solaris */ --- src/pl-trace.c +++ src/pl-trace.c @@ -581,8 +581,7 @@ case 'c': FeedBack("creep\n"); clear(frame, FR_SKIPPED); return ACTION_CONTINUE; - case '\04': - case EOF: FeedBack("EOF: "); + case '\04': FeedBack("EOF: "); case 'e': FeedBack("exit\n"); exitFromDebugger(0); case 'f': FeedBack("fail\n"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 1 month

commit yast2-bootloader

by root＠suse.de

Hello community, here is the log from the commit of package yast2-bootloader checked in at Sun Apr 2 11:50:35 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-03-29 18:54:46.000000000 +0200 +++ yast2-bootloader/yast2-bootloader.changes 2006-04-01 23:27:58.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Apr 1 23:25:58 CEST 2006 - od(a)suse.de + +- added TESTME comment: test parted partition activation with BSD + slices +- remove more old-style backticks +- add needed comments +- added parted to Requires (#161316) +- changed a y2internal -> y2milestone +- fixed harmless typos +- 2.13.35 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.34.tar.bz2 New: ---- yast2-bootloader-2.13.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.Bt3ETg/_old 2006-04-02 11:50:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Bt3ETg/_new 2006-04-02 11:50:02.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.34) +# spec file for package yast2-bootloader (Version 2.13.35) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,16 +11,16 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.34 +Version: 2.13.35 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.34.tar.bz2 +Source0: yast2-bootloader-2.13.35.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 -Requires: yast2 yast2-core yast2-storage perl-Bootloader limal-bootloader +Requires: yast2 yast2-core yast2-storage perl-Bootloader limal-bootloader parted %ifarch %ix86 x86_64 Requires: master-boot-code %endif @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.34 +%setup -n yast2-bootloader-2.13.35 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,15 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Sat Apr 01 2006 - od(a)suse.de +- added TESTME comment: test parted partition activation with BSD + slices +- remove more old-style backticks +- add needed comments +- added parted to Requires (#161316) +- changed a y2internal -> y2milestone +- fixed harmless typos +- 2.13.35 * Wed Mar 29 2006 - od(a)suse.de - using parted for activation of boot partition now (instead of /sbin/activate from the lilo package) (#161316) ++++++ yast2-bootloader-2.13.34.tar.bz2 -> yast2-bootloader-2.13.35.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/VERSION new/yast2-bootloader-2.13.35/VERSION --- old/yast2-bootloader-2.13.34/VERSION 2006-03-29 18:52:03.000000000 +0200 +++ new/yast2-bootloader-2.13.35/VERSION 2006-04-01 23:25:39.000000000 +0200 @@ -1 +1 @@ -2.13.34 +2.13.35 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/src/modules/BootELILO.ycp new/yast2-bootloader-2.13.35/src/modules/BootELILO.ycp --- old/yast2-bootloader-2.13.34/src/modules/BootELILO.ycp 2006-03-17 23:43:43.000000000 +0100 +++ new/yast2-bootloader-2.13.35/src/modules/BootELILO.ycp 2006-03-30 16:50:27.000000000 +0200 @@ -13,7 +13,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Andreas Schwab <schwab(a)suse.de> * - * $Id: BootELILO.ycp 28904 2006-03-13 15:35:23Z jplack $ + * $Id: BootELILO.ycp 29574 2006-03-30 14:50:24Z odabrunz $ * */ @@ -211,7 +211,7 @@ boolean ret = BootCommon::Read (reread); efi_entry_name = (string)SCR::Read (.sysconfig.bootloader.LOADER_LOCATION); - y2internal ("EFI entry: %1", efi_entry_name); + y2milestone ("EFI entry: %1", efi_entry_name); // check for meaningless EFI entry name in sysconfig if ("mbr" == efi_entry_name || "" == efi_entry_name || nil == efi_entry_name) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.35/src/modules/BootPOWERLILO.ycp --- old/yast2-bootloader-2.13.34/src/modules/BootPOWERLILO.ycp 2006-03-21 17:41:44.000000000 +0100 +++ new/yast2-bootloader-2.13.35/src/modules/BootPOWERLILO.ycp 2006-04-01 23:05:49.000000000 +0200 @@ -14,7 +14,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootPOWERLILO.ycp 29231 2006-03-21 16:38:03Z jplack $ + * $Id: BootPOWERLILO.ycp 29590 2006-03-31 14:28:39Z jplack $ * */ @@ -93,7 +93,7 @@ // misc. functions -global define void initBoardType () ``{ +global define void initBoardType () { if (Arch::board_iseries ()) { board_type = "iseries"; @@ -120,13 +120,13 @@ } } -global define string getBoardType () ``{ +global define string getBoardType () { if (board_type == nil) initBoardType (); return board_type; } -global define void setBoardType (string board) ``{ +global define void setBoardType (string board) { board_type = board; currentBoardInit (); } @@ -134,7 +134,7 @@ /** * Initialize the attribute of currently used board type */ - global define void currentBoardInit () ``{ + global define void currentBoardInit () { if (getBoardType () == "iseries") { iSeriesInit (); @@ -414,7 +414,7 @@ /** * Propose bootloader settings */ -global define void Propose () ``{ +global define void Propose () { y2debug ("Started propose: Glob: %1, Sec: %2", BootCommon::globals, BootCommon::sections); @@ -474,7 +474,7 @@ /** * Propose bootloader settings * - global define void Propose () ``{ + global define void Propose () { boolean initial_propose = true; if (BootCommon::was_proposed) { @@ -544,7 +544,7 @@ * Export bootloader settings to a map * @return bootloader settings */ -global define map Export () ``{ +global define map Export () { map exp = $[ "global": BootCommon::globals, "sections" : BootCommon::sections, @@ -559,7 +559,7 @@ * @param settings map of bootloader settings * @return boolean true on success */ -global define boolean Import (map settings) ``{ +global define boolean Import (map settings) { BootCommon::globals = settings["global"]:$[]; BootCommon::sections = settings["sections"]:[]; BootCommon::activate = settings["activate"]:false; @@ -606,7 +606,8 @@ if (clean) { BootCommon::RemoveUnexistentSections ("", ""); - BootCommon::UpdateInitrdLine (); + // FIXME: this is not needed, unclear code + // BootCommon::UpdateInitrdLine (); BootCommon::UpdateAppend (); } @@ -724,9 +725,9 @@ // if we find a section that looks like it has been initially proposed // from the installer, replace with the actual "good" proposal if (contains(sections_to_recreate, oname)) { - sections_to_recreate = filter (string this_name, sections_to_recreate, ``( - this_name != oname - )); + sections_to_recreate = filter (string this_name, + sections_to_recreate, ``(this_name != oname) + ); return CreateImageSection(oname); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/src/ppc/misc.ycp new/yast2-bootloader-2.13.35/src/ppc/misc.ycp --- old/yast2-bootloader-2.13.34/src/ppc/misc.ycp 2006-03-07 22:16:46.000000000 +0100 +++ new/yast2-bootloader-2.13.35/src/ppc/misc.ycp 2006-03-30 16:43:27.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: misc.ycp 28675 2006-03-07 21:16:39Z odabrunz $ + * $Id: misc.ycp 29550 2006-03-30 09:01:31Z mvidner $ * */ @@ -119,7 +119,7 @@ map<string,map> tm = Storage::GetTargetMap (); string vg = ""; foreach (string dev, map info, tm, { - if (info["type"]:`CT_UNKNONW==`CT_LVM) + if (info["type"]:`CT_UNKNOWN==`CT_LVM) { list<map> volumes = info["partitions"]:[]; foreach (map v, volumes, { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.34/src/routines/misc.ycp new/yast2-bootloader-2.13.35/src/routines/misc.ycp --- old/yast2-bootloader-2.13.34/src/routines/misc.ycp 2006-03-29 18:23:36.000000000 +0200 +++ new/yast2-bootloader-2.13.35/src/routines/misc.ycp 2006-04-01 23:25:23.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: misc.ycp 29538 2006-03-29 16:23:31Z odabrunz $ + * $Id: misc.ycp 29603 2006-04-01 21:25:19Z odabrunz $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -243,12 +243,12 @@ list<string> floppies = getFloppyDevices (); devices = filter (string k, map v, devices, - ``(v["type"]:`CT_UNKNONW != `CT_LVM)); + ``(v["type"]:`CT_UNKNOWN != `CT_LVM)); if (type == `boot || type == `boot_other) { devices = filter (string k, map v, devices, - ``(v["type"]:`CT_UNKNONW == `CT_DISK)); + ``(v["type"]:`CT_UNKNOWN == `CT_DISK)); } list<string> all_disks = (list<string>) maplist (string k, map v, devices, ``(k)); @@ -510,6 +510,8 @@ string dev = ""; string mp = ""; integer max = 0; + // + // FIXME: this is broken code, implement a proper prefix match!! see below foreach (string k, list v, mountpoints, ``{ if (k != "swap" && issubstring (fullpth, k) && size (k) > max) { @@ -521,6 +523,7 @@ if (mp == "") return []; + // FIXME: pth will be wrong for fullpth=='(hd0,1)/boot/vmlinux' !! string pth = substring (fullpth, size (mp)); if (substring (pth, 0, 1) != "/") pth = "/" + pth; @@ -1094,6 +1097,13 @@ y2milestone ("Activating partition %1 on %2", num, mbr_dev); // FIXME: this is the most rotten code since molded sliced bread // move to bootloader/Core/GRUB.pm or similar + // TESTME: make sure that parted does not destroy BSD + // slices (#suse24740): cf. section 5.1 of "info parted": + // Parted only supports the BSD disk label system. + // Parted is unlikely to support the partition slice + // system in the future because the semantics are rather + // strange, and don't work like "normal" partition tables + // do. string command = sformat ("/usr/sbin/parted -s %1 set %2 boot on", mbr_dev, num); y2milestone ("Running command %1", command); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 1 month

commit kernel-source

by root＠suse.de

Hello community, here is the log from the commit of package kernel-source checked in at Sun Apr 2 11:49:56 CEST 2006. -------- --- kernel-source/kernel-bigsmp.changes 2006-03-31 12:03:08.000000000 +0200 +++ kernel-source/kernel-bigsmp.changes 2006-04-02 11:17:53.000000000 +0200 @@ -1,0 +2,44 @@ +Sat Apr 1 19:36:50 CEST 2006 - olh(a)suse.de + +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one + +------------------------------------------------------------------- +Sat Apr 1 13:31:32 CEST 2006 - ak(a)suse.de + +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE + +------------------------------------------------------------------- +Sat Apr 1 10:11:06 CEST 2006 - olh(a)suse.de + +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) + +------------------------------------------------------------------- +Sat Apr 1 10:00:04 CEST 2006 - olh(a)suse.de + +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again + +------------------------------------------------------------------- +Fri Mar 31 17:03:39 CEST 2006 - schwab(a)suse.de + +- Increase max number of nodes to 1024 [#160976]. + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-smp.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:15.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 8 +Release: 9 Summary: Kernel with Multiprocessor Support and PAE License: GPL Group: System/Kernel @@ -115,7 +115,7 @@ -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -441,6 +441,35 @@ %files -f kernel.files %changelog -n kernel-bigsmp +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:15.000000000 +0200 @@ -17,7 +17,7 @@ Summary: Internal dummy package for synchronizing release numbers Group: System/Kernel Version: 2.6.16 -Release: 8 +Release: 9 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -27,7 +27,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %install @@ -40,6 +40,35 @@ /etc/dummy %changelog -n kernel-dummy +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:15.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 7 +Release: 8 Summary: 64-Bit Kernel for iSeries License: GPL Group: System/Kernel @@ -116,7 +116,7 @@ -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -442,6 +442,35 @@ %files -f kernel.files %changelog -n kernel-iseries64 +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:15.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 8 +Release: 9 Summary: kernel for kdump License: GPL Group: System/Kernel @@ -125,7 +125,7 @@ -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -451,6 +451,35 @@ %files -f kernel.files %changelog -n kernel-kdump +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:15.000000000 +0200 @@ -20,7 +20,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 7 +Release: 8 Summary: Kernel for ppc64 Systems License: GPL, LGPL Group: System/Kernel @@ -130,7 +130,7 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux-pmac-benh/CREDITS for more details. -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -456,6 +456,35 @@ %files -f kernel.files %changelog -n kernel-ppc64 +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:15.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 7 +Release: 8 Summary: The Standard Kernel License: GPL Group: System/Kernel @@ -113,7 +113,7 @@ -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -439,6 +439,35 @@ %files -f kernel.files %changelog -n kernel-s390 +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) ++++++ kernel-smp.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:15.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:15.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 8 +Release: 9 Summary: Kernel with Multiprocessor Support License: GPL Group: System/Kernel @@ -124,7 +124,7 @@ -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -450,6 +450,35 @@ %files -f kernel.files %changelog -n kernel-smp +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:16.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:16.000000000 +0200 @@ -25,7 +25,7 @@ %endif PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status Version: 2.6.16 -Release: 8 +Release: 9 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 Source1: functions.sh Source2: source-post.sh @@ -93,7 +93,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -273,6 +273,35 @@ %files -f kernel-source.files %changelog -n kernel-source +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:16.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:16.000000000 +0200 @@ -49,7 +49,7 @@ Summary: Kernel Symbol Versions (modversions) Group: Development/Sources Version: 2.6.16 -Release: 8 +Release: 9 Requires: linux Requires: kernel-source = 2.6.16-%release Source11: arch-symbols @@ -84,7 +84,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %install @@ -127,6 +127,35 @@ /boot/symsets-*-*.tar.gz %changelog -n kernel-syms +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.V1WZmA/_old 2006-04-02 11:46:16.000000000 +0200 +++ /var/tmp/diff_new_pack.V1WZmA/_new 2006-04-02 11:46:16.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 8 +Release: 9 Summary: The User Mode Linux kernel. License: GPL Group: System/Kernel @@ -116,7 +116,7 @@ -Source Timestamp: 2006-03-31 09:19:02 +0000 +Source Timestamp: 2006-04-01 22:00:07 +0000 %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then @@ -442,6 +442,35 @@ %files -f kernel.files %changelog -n kernel-um +* Sat Apr 01 2006 - olh(a)suse.de +- update to 2.6.16.1 + dm: bio split bvec fix + TCP: Do not use inet->id of global tcp_socket when sending RST (CVE-2006-1242) + Fix speedstep-smi assembly bug in speedstep_smi_ownership + DMI: fix DMI onboard device discovery + fix scheduler deadlock + i810fb_cursor(): use GFP_ATOMIC + NET: Ensure device name passed to SO_BINDTODEVICE is NULL terminated. + V4L/DVB (3324): Fix Samsung tuner frequency ranges + sata_mv: fix irq port status usage + rtc.h broke strace(1) builds + v9fs: assign dentry ops to negative dentries + 2.6.xx: sata_mv: another critical fix + Kconfig: VIDEO_DECODER must select FW_LOADER + XFS writeout fix + proc: fix duplicate line in /proc/devices + cciss: fix use-after-free in cciss_init_one +* Sat Apr 01 2006 - ak(a)suse.de +- patches.arch/x86_64-mce-nmi-watchdog: Fix compilation + without CONFIG_X86_MCE +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-pseries-rtas-mtcr-bug.patch + Workaround for pSeries RTAS bug (162384 - LTC21927) +* Sat Apr 01 2006 - olh(a)suse.de +- add patches.arch/ppc-floppy-isa-dma.patch + make ISA floppies work again +* Fri Mar 31 2006 - schwab(a)suse.de +- Increase max number of nodes to 1024 [#160976]. * Fri Mar 31 2006 - olh(a)suse.de - add patches.arch/ppc-pseries-lparcfg-1.7.patch pass correct databuf size to ibm,get-system-parameter (162380 - LTC22746) kernel-xen.spec: same change kernel-xenpae.spec: same change ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2006-03-31 12:03:04.000000000 +0200 +++ kernel-source/build-source-timestamp 2006-04-02 11:17:53.000000000 +0200 @@ -1 +1 @@ -2006-03-31 09:19:02 +0000 +2006-04-01 22:00:07 +0000 ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2006-03-28 16:05:43.000000000 +0200 +++ new/config/ia64/debug 2006-04-01 14:04:22.000000000 +0200 @@ -122,6 +122,7 @@ CONFIG_FORCE_MAX_ZONEORDER=17 CONFIG_SMP=y CONFIG_NR_CPUS=1024 +CONFIG_IA64_NR_NODES=1024 CONFIG_HOTPLUG_CPU=y CONFIG_SCHED_SMT=y # CONFIG_PREEMPT is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2006-03-28 16:05:43.000000000 +0200 +++ new/config/ia64/default 2006-04-01 14:04:22.000000000 +0200 @@ -122,6 +122,7 @@ CONFIG_FORCE_MAX_ZONEORDER=17 CONFIG_SMP=y CONFIG_NR_CPUS=1024 +CONFIG_IA64_NR_NODES=1024 CONFIG_HOTPLUG_CPU=y CONFIG_SCHED_SMT=y # CONFIG_PREEMPT is not set ++++++ kabi.tar.bz2 ++++++ ++++++ minmem ++++++ --- kernel-source/minmem 2006-03-31 15:44:28.000000000 +0200 +++ kernel-source/minmem 2006-04-02 11:18:00.000000000 +0200 @@ -1 +1 @@ -514000 +1048576 ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/i386-kexec-apic-ack new/patches.arch/i386-kexec-apic-ack --- old/patches.arch/i386-kexec-apic-ack 2006-03-30 16:49:55.000000000 +0200 +++ new/patches.arch/i386-kexec-apic-ack 2006-03-31 14:37:54.000000000 +0200 @@ -1,6 +1,7 @@ From: Vivek Goyal <vgoyal(a)in.ibm.com> Subject: [PATCH] i386 kdump timer vector lockup fix Acked-by: ak(a)suse.de +Patch-mainline: 2.6.17 Porting the patch I posted for x86_64 to i386. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-floppy-isa-dma.patch new/patches.arch/ppc-floppy-isa-dma.patch --- old/patches.arch/ppc-floppy-isa-dma.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/ppc-floppy-isa-dma.patch 2006-04-01 10:00:47.000000000 +0200 @@ -0,0 +1,56 @@ +From: Stephen Rothwell <sfr(a)canb.auug.org.au> Tue, 28 Mar 2006 14:40:58 +1100 +Subject: [PATCH] powerpc: make ISA floppies work again +X-Git-Commit: b239cbe957ae730caa8af2f169a4d35b8c1bb299 + + +We used to assume that a DMA mapping request with a NULL dev was for +ISA DMA. This assumption was broken at some point. Now we explicitly +pass the detected ISA PCI device in the floppy setup. + +Signed-off-by: Stephen Rothwell <sfr(a)canb.auug.org.au> +Signed-off-by: Paul Mackerras <paulus(a)samba.org> +Signed-off-by: Olaf Hering <olh(a)suse.de> + + arch/powerpc/kernel/pci_64.c | 1 + + include/asm-powerpc/floppy.h | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +Index: linux-2.6.16/arch/powerpc/kernel/pci_64.c +=================================================================== +--- linux-2.6.16.orig/arch/powerpc/kernel/pci_64.c ++++ linux-2.6.16/arch/powerpc/kernel/pci_64.c +@@ -78,6 +78,7 @@ int global_phb_number; /* Global phb co + + /* Cached ISA bridge dev. */ + struct pci_dev *ppc64_isabridge_dev = NULL; ++EXPORT_SYMBOL_GPL(ppc64_isabridge_dev); + + static void fixup_broken_pcnet32(struct pci_dev* dev) + { +Index: linux-2.6.16/include/asm-powerpc/floppy.h +=================================================================== +--- linux-2.6.16.orig/include/asm-powerpc/floppy.h ++++ linux-2.6.16/include/asm-powerpc/floppy.h +@@ -35,6 +35,7 @@ + #ifdef CONFIG_PCI + + #include <linux/pci.h> ++#include <asm/ppc-pci.h> /* for ppc64_isabridge_dev */ + + #define fd_dma_setup(addr,size,mode,io) powerpc_fd_dma_setup(addr,size,mode,io) + +@@ -52,12 +53,12 @@ static __inline__ int powerpc_fd_dma_set + if (bus_addr + && (addr != prev_addr || size != prev_size || dir != prev_dir)) { + /* different from last time -- unmap prev */ +- pci_unmap_single(NULL, bus_addr, prev_size, prev_dir); ++ pci_unmap_single(ppc64_isabridge_dev, bus_addr, prev_size, prev_dir); + bus_addr = 0; + } + + if (!bus_addr) /* need to map it */ +- bus_addr = pci_map_single(NULL, addr, size, dir); ++ bus_addr = pci_map_single(ppc64_isabridge_dev, addr, size, dir); + + /* remember this one as prev */ + prev_addr = addr; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-pseries-rtas-mtcr-bug.patch new/patches.arch/ppc-pseries-rtas-mtcr-bug.patch --- old/patches.arch/ppc-pseries-rtas-mtcr-bug.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/ppc-pseries-rtas-mtcr-bug.patch 2006-04-01 10:11:40.000000000 +0200 @@ -0,0 +1,45 @@ +From: Mike Kravetz <kravetz(a)us.ibm.com> +Subject: [PATCH] powerpc: Workaround for pSeries RTAS bug +X-Git-Commit: 9fe901d124871f5781b9c4ccbb7ff93fdff9d39e + +Bug 162384 - LTC21927-Unable to DLPAR add memory on sles10 beta4 + +A bug in the RTAS services incorrectly interprets some bits in the CR +when called from the OS. Specifically, bits in CR4. The result could +be a firmware crash that also takes down the partition. A firmware +fix is in the works. We have seen this situation when performing DLPAR +operations. As a temporary workaround, clear the CR in enter_rtas(). +Note that enter_rtas() will not set any bits in CR4 before calling RTAS. + +Also note that the 32 bit version of enter_rtas() should have the same +work around even though the chances of hitting the bug are much smaller +due to the lack of DLPAR on 32 bit kernels. However, my assembly skills +are a bit rusty and the 32 bit code doesn't seem to follow the conventions +for where things should be saved. In addition, I don't have a system +to test 32 bit kernels. Help creating and at least touch testing the +same workaround for 32 bit would be appreciated. + +Signed-off-by: Mike Kravetz <kravetz(a)us.ibm.com> +Signed-off-by: Paul Mackerras <paulus(a)samba.org> +Signed-off-by: Olaf Hering <olh(a)suse.de> + + arch/powerpc/kernel/entry_64.S | 6 ++++++ + 1 file changed, 6 insertions(+) + +Index: linux-2.6.16/arch/powerpc/kernel/entry_64.S +=================================================================== +--- linux-2.6.16.orig/arch/powerpc/kernel/entry_64.S ++++ linux-2.6.16/arch/powerpc/kernel/entry_64.S +@@ -619,6 +619,12 @@ _GLOBAL(enter_rtas) + mfsrr1 r10 + std r10,_SRR1(r1) + ++ /* Temporary workaround to clear CR until RTAS can be modified to ++ * ignore all bits. ++ */ ++ li r0,0 ++ mtcr r0 ++ + /* There is no way it is acceptable to get here with interrupts enabled, + * check it with the asm equivalent of WARN_ON + */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_64-gart-relax new/patches.arch/x86_64-gart-relax --- old/patches.arch/x86_64-gart-relax 2006-02-10 14:35:10.000000000 +0100 +++ new/patches.arch/x86_64-gart-relax 2006-04-01 14:04:23.000000000 +0200 @@ -1,5 +1,6 @@ Subject: Use cpu_relax in poll loop in GART IOMMU From: ak(a)suse.de +Patch-mainline: 2.6.17 The code waits for the GART to clear the TLB flush bit. Use cpu_relax in this time to allow hypervisors to yield the CPU in this time. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_64-mce-nmi-watchdog new/patches.arch/x86_64-mce-nmi-watchdog --- old/patches.arch/x86_64-mce-nmi-watchdog 2006-03-30 16:49:55.000000000 +0200 +++ new/patches.arch/x86_64-mce-nmi-watchdog 2006-04-01 13:32:00.000000000 +0200 @@ -18,7 +18,7 @@ #define MISC_MCELOG_MINOR 227 #define NR_BANKS 6 -+atomic_t mce_entry; ++atomic_t mce_entry; + static int mce_dont_init; @@ -27,7 +27,7 @@ int i; int panicm_found = 0; -+ atomic_inc(&mce_entry); ++ atomic_inc(&mce_entry); + if (regs) notify_die(DIE_NMI, "machine check", regs, error_code, 18, SIGKILL); @@ -58,14 +58,16 @@ /* * lapic_nmi_owner tracks the ownership of the lapic NMI hardware: -@@ -480,6 +481,10 @@ void __kprobes nmi_watchdog_tick(struct +@@ -480,6 +481,12 @@ void __kprobes nmi_watchdog_tick(struct __get_cpu_var(nmi_touch) = 0; touched = 1; } ++#ifdef CONFIG_X86_MCE + /* Could check oops_in_progress here too, but it's safer + not too */ -+ if (atomic_read(&mce_entry) > 0) ++ if (atomic_read(&mce_entry) > 0) + touched = 1; ++#endif if (!touched && __get_cpu_var(last_irq_sum) == sum) { /* * Ayiee, looks like this CPU is stuck ... diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_64-memmap-alloc new/patches.arch/x86_64-memmap-alloc --- old/patches.arch/x86_64-memmap-alloc 2006-03-09 08:39:46.000000000 +0100 +++ new/patches.arch/x86_64-memmap-alloc 2006-04-01 14:04:23.000000000 +0200 @@ -1,6 +1,7 @@ Subject: Try to allocate node memmap near the end of node From: ak(a)suse.de References: 154694 +Patch-mainline: 2.6.17 This fixes problems with very large nodes (over 128GB) filling up all of the first 4GB with their mem_map and not leaving enough diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_64-nmi-watchdog-timeout new/patches.arch/x86_64-nmi-watchdog-timeout --- old/patches.arch/x86_64-nmi-watchdog-timeout 2006-01-09 20:12:25.000000000 +0100 +++ new/patches.arch/x86_64-nmi-watchdog-timeout 2006-04-01 14:04:23.000000000 +0200 @@ -1,6 +1,7 @@ From: ak(a)suse.de Patch-mainline: never Subject: Increase NMI watchdog timeout to 30s +Patch-mainline: never Be a bit more tolerant to broken drivers. Defensive programming for enterprises. ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/driver-0001-sysfs-sysfs_remove_dir-needs-to-invalidate-the-dentry.patch new/patches.drivers/driver-0001-sysfs-sysfs_remove_dir-needs-to-invalidate-the-dentry.patch --- old/patches.drivers/driver-0001-sysfs-sysfs_remove_dir-needs-to-invalidate-the-dentry.patch 2006-03-23 19:33:14.000000000 +0100 +++ new/patches.drivers/driver-0001-sysfs-sysfs_remove_dir-needs-to-invalidate-the-dentry.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -From nobody Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh(a)suse.de> -Date: Thu Mar 16 15:44:26 2006 -0800 -Subject: [PATCH 01/23] sysfs: sysfs_remove_dir() needs to invalidate the dentry (#144041) -Patch-Mainline: 2.6.16.1 - -When calling sysfs_remove_dir() don't allow any further sysfs functions -to work for this kobject anymore. This fixes a nasty USB cdc-acm oops -on disconnect. - -Many thanks to Bob Copeland and Paul Fulghum for taking the time to -track this down. - -Cc: Bob Copeland <email(a)bobcopeland.com> -Cc: Paul Fulghum <paulkf(a)microgate.com> -Cc: Maneesh Soni <maneesh(a)in.ibm.com> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> - ---- - - fs/sysfs/dir.c | 1 + - fs/sysfs/inode.c | 6 +++++- - 2 files changed, 6 insertions(+), 1 deletions(-) - -641e6f30a095f3752ed84fd9d279382f5d3ef4c1 -diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c -index 49bd219..cfd290d 100644 ---- a/fs/sysfs/dir.c -+++ b/fs/sysfs/dir.c -@@ -302,6 +302,7 @@ void sysfs_remove_dir(struct kobject * k - * Drop reference from dget() on entrance. - */ - dput(dentry); -+ kobj->dentry = NULL; - } - - int sysfs_rename_dir(struct kobject * kobj, const char *new_name) -diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c -index 689f7bc..6beee6f 100644 ---- a/fs/sysfs/inode.c -+++ b/fs/sysfs/inode.c -@@ -227,12 +227,16 @@ void sysfs_drop_dentry(struct sysfs_dire - void sysfs_hash_and_remove(struct dentry * dir, const char * name) - { - struct sysfs_dirent * sd; -- struct sysfs_dirent * parent_sd = dir->d_fsdata; -+ struct sysfs_dirent * parent_sd; -+ -+ if (!dir) -+ return; - - if (dir->d_inode == NULL) - /* no inode means this hasn't been made visible yet */ - return; - -+ parent_sd = dir->d_fsdata; - mutex_lock(&dir->d_inode->i_mutex); - list_for_each_entry(sd, &parent_sd->s_children, s_sibling) { - if (!sd->s_element) --- -1.2.4 - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/driver-0014-firmware-fix-BUG-in-fw_realloc_buffer.patch new/patches.drivers/driver-0014-firmware-fix-BUG-in-fw_realloc_buffer.patch --- old/patches.drivers/driver-0014-firmware-fix-BUG-in-fw_realloc_buffer.patch 2006-03-23 19:33:14.000000000 +0100 +++ new/patches.drivers/driver-0014-firmware-fix-BUG-in-fw_realloc_buffer.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -From nobody Mon Sep 17 00:00:00 2001 -From: Jeff Moyer <jmoyer(a)redhat.com> -Date: Mon Feb 13 14:52:38 2006 -0800 -Subject: [PATCH 14/23] firmware: fix BUG: in fw_realloc_buffer -Patch-Mainline: 2.6.16.1 - -The fw_realloc_buffer routine does not handle an increase in buffer size of -more than 4k. It's not clear to me why it expects that it will only get an -extra 4k of data. The attached patch modifies fw_realloc_buffer to vmalloc -as much memory as is requested, instead of what we previously had + 4k. - -I've tested this on my laptop, which would crash occaisionally on boot -without the patch. With the patch, it hasn't crashed, but I can't be -certain that this code path is exercised. - -Signed-off-by: Jeff Moyer <jmoyer(a)redhat.com> -Signed-off-by: Andrew Morton <akpm(a)osdl.org> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> - ---- - - drivers/base/firmware_class.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -30560ba6eda308c13a361d08eb5d4eaab94ab37e -diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c -index e97e911..4723182 100644 ---- a/drivers/base/firmware_class.c -+++ b/drivers/base/firmware_class.c -@@ -211,18 +211,20 @@ static int - fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size) - { - u8 *new_data; -+ int new_size = fw_priv->alloc_size; - - if (min_size <= fw_priv->alloc_size) - return 0; - -- new_data = vmalloc(fw_priv->alloc_size + PAGE_SIZE); -+ new_size = ALIGN(min_size, PAGE_SIZE); -+ new_data = vmalloc(new_size); - if (!new_data) { - printk(KERN_ERR "%s: unable to alloc buffer\n", __FUNCTION__); - /* Make sure that we don't keep incomplete data */ - fw_load_abort(fw_priv); - return -ENOMEM; - } -- fw_priv->alloc_size += PAGE_SIZE; -+ fw_priv->alloc_size = new_size; - if (fw_priv->fw->data) { - memcpy(new_data, fw_priv->fw->data, fw_priv->fw->size); - vfree(fw_priv->fw->data); --- -1.2.4 - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/driver-0021-get_cpu_sysdev-signedness-fix.patch new/patches.drivers/driver-0021-get_cpu_sysdev-signedness-fix.patch --- old/patches.drivers/driver-0021-get_cpu_sysdev-signedness-fix.patch 2006-03-23 19:33:14.000000000 +0100 +++ new/patches.drivers/driver-0021-get_cpu_sysdev-signedness-fix.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -From nobody Mon Sep 17 00:00:00 2001 -From: Andrew Morton <akpm(a)osdl.org> -Date: Tue Mar 7 23:53:25 2006 -0800 -Subject: [PATCH 21/23] get_cpu_sysdev() signedness fix -Patch-Mainline: 2.6.16.1 - -Doing (int < NR_CPUS) doesn't dtrt if it's negative.. - -Signed-off-by: Andrew Morton <akpm(a)osdl.org> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> - ---- - - drivers/base/cpu.c | 2 +- - include/linux/cpu.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -a29d642a4aa99c5234314ab2523281139226c231 -diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c -index 07a7f97..29f3d75 100644 ---- a/drivers/base/cpu.c -+++ b/drivers/base/cpu.c -@@ -141,7 +141,7 @@ int __devinit register_cpu(struct cpu *c - return error; - } - --struct sys_device *get_cpu_sysdev(int cpu) -+struct sys_device *get_cpu_sysdev(unsigned cpu) - { - if (cpu < NR_CPUS) - return cpu_sys_devices[cpu]; -diff --git a/include/linux/cpu.h b/include/linux/cpu.h -index 0ed1d48..d612b89 100644 ---- a/include/linux/cpu.h -+++ b/include/linux/cpu.h -@@ -32,7 +32,7 @@ struct cpu { - }; - - extern int register_cpu(struct cpu *, int, struct node *); --extern struct sys_device *get_cpu_sysdev(int cpu); -+extern struct sys_device *get_cpu_sysdev(unsigned cpu); - #ifdef CONFIG_HOTPLUG_CPU - extern void unregister_cpu(struct cpu *, struct node *); - #endif --- -1.2.4 - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/driver-0023-sysfs-fix-a-kobject-leak-in-sysfs_add_link-on-the-error-path.patch new/patches.drivers/driver-0023-sysfs-fix-a-kobject-leak-in-sysfs_add_link-on-the-error-path.patch --- old/patches.drivers/driver-0023-sysfs-fix-a-kobject-leak-in-sysfs_add_link-on-the-error-path.patch 2006-03-23 19:33:14.000000000 +0100 +++ new/patches.drivers/driver-0023-sysfs-fix-a-kobject-leak-in-sysfs_add_link-on-the-error-path.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -From nobody Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh(a)suse.de> -Date: Thu Mar 16 15:44:26 2006 -0800 -Subject: [PATCH 23/23] sysfs: fix a kobject leak in sysfs_add_link on the error path -Patch-Mainline: 2.6.16.1 - -As pointed out by Oliver Neukum. - -Cc: Maneesh Soni <maneesh(a)in.ibm.com> -Cc: Oliver Neukum <oliver(a)neukum.org> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> - ---- - - fs/sysfs/symlink.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -b3229087c5e08589cea4f5040dab56f7dc11332a -diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c -index fe23f47..d2eac3c 100644 ---- a/fs/sysfs/symlink.c -+++ b/fs/sysfs/symlink.c -@@ -66,6 +66,7 @@ static int sysfs_add_link(struct dentry - if (!error) - return 0; - -+ kobject_put(target); - kfree(sl->link_name); - exit2: - kfree(sl); --- -1.2.4 - ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/md-raid1-hang new/patches.fixes/md-raid1-hang --- old/patches.fixes/md-raid1-hang 2006-03-24 01:03:45.000000000 +0100 +++ new/patches.fixes/md-raid1-hang 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -From: NeilBrown <neilb(a)suse.de> -Subject: md: Fix bug: BIO_RW_BARRIER requests to md/raid1 hang. -Patch-mainline: 2.6.16.1 -References: 159435 - -Both R1BIO_Barrier and R1BIO_Returned are 4 !!!! - -This means that barrier requests don't get returned (i.e. b_endio called) -because it looks like they already have been. - - -Signed-off-by: Neil Brown <neilb(a)suse.de> - -Index: linux-2.6.16/include/linux/raid/raid1.h -=================================================================== ---- linux-2.6.16.orig/include/linux/raid/raid1.h 2006-03-20 16:53:29.000000000 +1100 -+++ linux-2.6.16/include/linux/raid/raid1.h 2006-03-24 10:38:29.000000000 +1100 -@@ -130,6 +130,6 @@ - * with failure when last write completes (and all failed). - * Record that bi_end_io was called with this flag... - */ --#define R1BIO_Returned 4 -+#define R1BIO_Returned 6 - - #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/patch-2.6.16.1 new/patches.fixes/patch-2.6.16.1 --- old/patches.fixes/patch-2.6.16.1 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/patch-2.6.16.1 2006-04-01 19:45:02.000000000 +0200 @@ -0,0 +1,476 @@ +Subject: Linux 2.6.16.1 +From: Greg KH <gregkh(a)suse.de> + + arch/i386/kernel/cpu/cpufreq/speedstep-smi.c | 4 +- + arch/i386/kernel/dmi_scan.c | 2 - + drivers/base/cpu.c | 2 - + drivers/base/firmware_class.c | 6 ++- + drivers/block/cciss.c | 2 - + drivers/md/dm.c | 45 +++++++++++++++------------ + drivers/media/video/Kconfig | 1 + drivers/media/video/tuner-types.c | 4 +- + drivers/scsi/sata_mv.c | 7 +++- + drivers/video/i810/i810_main.c | 2 - + fs/9p/vfs_inode.c | 3 - + fs/proc/proc_misc.c | 2 - + fs/sysfs/dir.c | 1 + fs/sysfs/inode.c | 6 +++ + fs/sysfs/symlink.c | 1 + fs/xfs/linux-2.6/xfs_aops.c | 2 - + include/linux/cpu.h | 2 - + include/linux/raid/raid1.h | 2 - + include/linux/rtc.h | 4 +- + kernel/sched.c | 9 ++++- + net/core/sock.c | 5 +-- + net/ipv4/ip_output.c | 6 --- + 22 files changed, 69 insertions(+), 49 deletions(-) + +diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c +index 28cc5d5..cfc4276 100644 +--- a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c ++++ b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c +@@ -75,7 +75,9 @@ static int speedstep_smi_ownership (void + __asm__ __volatile__( + "out %%al, (%%dx)\n" + : "=D" (result) +- : "a" (command), "b" (function), "c" (0), "d" (smi_port), "D" (0), "S" (magic) ++ : "a" (command), "b" (function), "c" (0), "d" (smi_port), ++ "D" (0), "S" (magic) ++ : "memory" + ); + + dprintk("result is %x\n", result); +diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c +index 6a93d75..ca2a0cb 100644 +--- a/arch/i386/kernel/dmi_scan.c ++++ b/arch/i386/kernel/dmi_scan.c +@@ -106,7 +106,7 @@ static void __init dmi_save_devices(stru + struct dmi_device *dev; + + for (i = 0; i < count; i++) { +- char *d = ((char *) dm) + (i * 2); ++ char *d = (char *)(dm + 1) + (i * 2); + + /* Skip disabled device */ + if ((*d & 0x80) == 0) +diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c +index 07a7f97..29f3d75 100644 +--- a/drivers/base/cpu.c ++++ b/drivers/base/cpu.c +@@ -141,7 +141,7 @@ int __devinit register_cpu(struct cpu *c + return error; + } + +-struct sys_device *get_cpu_sysdev(int cpu) ++struct sys_device *get_cpu_sysdev(unsigned cpu) + { + if (cpu < NR_CPUS) + return cpu_sys_devices[cpu]; +diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c +index e97e911..4723182 100644 +--- a/drivers/base/firmware_class.c ++++ b/drivers/base/firmware_class.c +@@ -211,18 +211,20 @@ static int + fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size) + { + u8 *new_data; ++ int new_size = fw_priv->alloc_size; + + if (min_size <= fw_priv->alloc_size) + return 0; + +- new_data = vmalloc(fw_priv->alloc_size + PAGE_SIZE); ++ new_size = ALIGN(min_size, PAGE_SIZE); ++ new_data = vmalloc(new_size); + if (!new_data) { + printk(KERN_ERR "%s: unable to alloc buffer\n", __FUNCTION__); + /* Make sure that we don't keep incomplete data */ + fw_load_abort(fw_priv); + return -ENOMEM; + } +- fw_priv->alloc_size += PAGE_SIZE; ++ fw_priv->alloc_size = new_size; + if (fw_priv->fw->data) { + memcpy(new_data, fw_priv->fw->data, fw_priv->fw->size); + vfree(fw_priv->fw->data); +diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c +index 0d65394..c149d57 100644 +--- a/drivers/block/cciss.c ++++ b/drivers/block/cciss.c +@@ -3269,8 +3269,8 @@ clean2: + unregister_blkdev(hba[i]->major, hba[i]->devname); + clean1: + release_io_mem(hba[i]); +- free_hba(i); + hba[i]->busy_initializing = 0; ++ free_hba(i); + return(-1); + } + +diff --git a/drivers/md/dm.c b/drivers/md/dm.c +index 745ca1f..d559569 100644 +--- a/drivers/md/dm.c ++++ b/drivers/md/dm.c +@@ -533,30 +533,35 @@ static void __clone_and_map(struct clone + + } else { + /* +- * Create two copy bios to deal with io that has +- * been split across a target. ++ * Handle a bvec that must be split between two or more targets. + */ + struct bio_vec *bv = bio->bi_io_vec + ci->idx; ++ sector_t remaining = to_sector(bv->bv_len); ++ unsigned int offset = 0; + +- clone = split_bvec(bio, ci->sector, ci->idx, +- bv->bv_offset, max); +- __map_bio(ti, clone, tio); +- +- ci->sector += max; +- ci->sector_count -= max; +- ti = dm_table_find_target(ci->map, ci->sector); +- +- len = to_sector(bv->bv_len) - max; +- clone = split_bvec(bio, ci->sector, ci->idx, +- bv->bv_offset + to_bytes(max), len); +- tio = alloc_tio(ci->md); +- tio->io = ci->io; +- tio->ti = ti; +- memset(&tio->info, 0, sizeof(tio->info)); +- __map_bio(ti, clone, tio); ++ do { ++ if (offset) { ++ ti = dm_table_find_target(ci->map, ci->sector); ++ max = max_io_len(ci->md, ci->sector, ti); ++ ++ tio = alloc_tio(ci->md); ++ tio->io = ci->io; ++ tio->ti = ti; ++ memset(&tio->info, 0, sizeof(tio->info)); ++ } ++ ++ len = min(remaining, max); ++ ++ clone = split_bvec(bio, ci->sector, ci->idx, ++ bv->bv_offset + offset, len); ++ ++ __map_bio(ti, clone, tio); ++ ++ ci->sector += len; ++ ci->sector_count -= len; ++ offset += to_bytes(len); ++ } while (remaining -= len); + +- ci->sector += len; +- ci->sector_count -= len; + ci->idx++; + } + } +diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig +index d82c8a3..ef42a26 100644 +--- a/drivers/media/video/Kconfig ++++ b/drivers/media/video/Kconfig +@@ -349,6 +349,7 @@ config VIDEO_AUDIO_DECODER + config VIDEO_DECODER + tristate "Add support for additional video chipsets" + depends on VIDEO_DEV && I2C && EXPERIMENTAL ++ select FW_LOADER + ---help--- + Say Y here to compile drivers for SAA7115, SAA7127 and CX25840 + video decoders. +diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c +index 6fe7817..5f3d46d 100644 +--- a/drivers/media/video/tuner-types.c ++++ b/drivers/media/video/tuner-types.c +@@ -1087,8 +1087,8 @@ static struct tuner_params tuner_tnf_533 + /* ------------ TUNER_SAMSUNG_TCPN_2121P30A - Samsung NTSC ------------ */ + + static struct tuner_range tuner_samsung_tcpn_2121p30a_ntsc_ranges[] = { +- { 16 * 175.75 /*MHz*/, 0x01, }, +- { 16 * 410.25 /*MHz*/, 0x02, }, ++ { 16 * 130.00 /*MHz*/, 0x01, }, ++ { 16 * 364.50 /*MHz*/, 0x02, }, + { 16 * 999.99 , 0x08, }, + }; + +diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c +index 2770005..b00af08 100644 +--- a/drivers/scsi/sata_mv.c ++++ b/drivers/scsi/sata_mv.c +@@ -1102,6 +1102,7 @@ static u8 mv_get_crpb_status(struct ata_ + void __iomem *port_mmio = mv_ap_base(ap); + struct mv_port_priv *pp = ap->private_data; + u32 out_ptr; ++ u8 ata_status; + + out_ptr = readl(port_mmio + EDMA_RSP_Q_OUT_PTR_OFS); + +@@ -1109,6 +1110,8 @@ static u8 mv_get_crpb_status(struct ata_ + assert(((out_ptr >> EDMA_RSP_Q_PTR_SHIFT) & MV_MAX_Q_DEPTH_MASK) == + pp->rsp_consumer); + ++ ata_status = pp->crpb[pp->rsp_consumer].flags >> CRPB_FLAG_STATUS_SHIFT; ++ + /* increment our consumer index... */ + pp->rsp_consumer = mv_inc_q_index(&pp->rsp_consumer); + +@@ -1123,7 +1126,7 @@ static u8 mv_get_crpb_status(struct ata_ + writelfl(out_ptr, port_mmio + EDMA_RSP_Q_OUT_PTR_OFS); + + /* Return ATA status register for completed CRPB */ +- return (pp->crpb[pp->rsp_consumer].flags >> CRPB_FLAG_STATUS_SHIFT); ++ return ata_status; + } + + /** +@@ -1192,7 +1195,6 @@ static void mv_host_intr(struct ata_host + u32 hc_irq_cause; + int shift, port, port0, hard_port, handled; + unsigned int err_mask; +- u8 ata_status = 0; + + if (hc == 0) { + port0 = 0; +@@ -1210,6 +1212,7 @@ static void mv_host_intr(struct ata_host + hc,relevant,hc_irq_cause); + + for (port = port0; port < port0 + MV_PORTS_PER_HC; port++) { ++ u8 ata_status = 0; + ap = host_set->ports[port]; + hard_port = port & MV_PORT_MASK; /* range 0-3 */ + handled = 0; /* ensure ata_status is set if handled++ */ +diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c +index d8467c0..788297e 100644 +--- a/drivers/video/i810/i810_main.c ++++ b/drivers/video/i810/i810_main.c +@@ -1508,7 +1508,7 @@ static int i810fb_cursor(struct fb_info + int size = ((cursor->image.width + 7) >> 3) * + cursor->image.height; + int i; +- u8 *data = kmalloc(64 * 8, GFP_KERNEL); ++ u8 *data = kmalloc(64 * 8, GFP_ATOMIC); + + if (data == NULL) + return -ENOMEM; +diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c +index 3ad8455..651a9e1 100644 +--- a/fs/9p/vfs_inode.c ++++ b/fs/9p/vfs_inode.c +@@ -614,6 +614,7 @@ static struct dentry *v9fs_vfs_lookup(st + + sb = dir->i_sb; + v9ses = v9fs_inode2v9ses(dir); ++ dentry->d_op = &v9fs_dentry_operations; + dirfid = v9fs_fid_lookup(dentry->d_parent); + + if (!dirfid) { +@@ -681,8 +682,6 @@ static struct dentry *v9fs_vfs_lookup(st + goto FreeFcall; + + fid->qid = fcall->params.rstat.stat.qid; +- +- dentry->d_op = &v9fs_dentry_operations; + v9fs_stat2inode(&fcall->params.rstat.stat, inode, inode->i_sb); + + d_add(dentry, inode); +diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c +index 1d24fea..826c131 100644 +--- a/fs/proc/proc_misc.c ++++ b/fs/proc/proc_misc.c +@@ -312,7 +312,7 @@ static void *devinfo_next(struct seq_fil + case BLK_HDR: + info->state = BLK_LIST; + (*pos)++; +- break; ++ /*fallthrough*/ + case BLK_LIST: + if (get_blkdev_info(info->blkdev,&idummy,&ndummy)) { + /* +diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c +index 49bd219..cfd290d 100644 +--- a/fs/sysfs/dir.c ++++ b/fs/sysfs/dir.c +@@ -302,6 +302,7 @@ void sysfs_remove_dir(struct kobject * k + * Drop reference from dget() on entrance. + */ + dput(dentry); ++ kobj->dentry = NULL; + } + + int sysfs_rename_dir(struct kobject * kobj, const char *new_name) +diff --git a/fs/sysfs/inode.c b/fs/sysfs/inode.c +index 689f7bc..6beee6f 100644 +--- a/fs/sysfs/inode.c ++++ b/fs/sysfs/inode.c +@@ -227,12 +227,16 @@ void sysfs_drop_dentry(struct sysfs_dire + void sysfs_hash_and_remove(struct dentry * dir, const char * name) + { + struct sysfs_dirent * sd; +- struct sysfs_dirent * parent_sd = dir->d_fsdata; ++ struct sysfs_dirent * parent_sd; ++ ++ if (!dir) ++ return; + + if (dir->d_inode == NULL) + /* no inode means this hasn't been made visible yet */ + return; + ++ parent_sd = dir->d_fsdata; + mutex_lock(&dir->d_inode->i_mutex); + list_for_each_entry(sd, &parent_sd->s_children, s_sibling) { + if (!sd->s_element) +diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c +index e38d633..e5ce6e7 100644 +--- a/fs/sysfs/symlink.c ++++ b/fs/sysfs/symlink.c +@@ -66,6 +66,7 @@ static int sysfs_add_link(struct dentry + if (!error) + return 0; + ++ kobject_put(target); + kfree(sl->link_name); + exit2: + kfree(sl); +diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c +index 74d8be8..a980736 100644 +--- a/fs/xfs/linux-2.6/xfs_aops.c ++++ b/fs/xfs/linux-2.6/xfs_aops.c +@@ -616,7 +616,7 @@ xfs_is_delayed_page( + acceptable = (type == IOMAP_UNWRITTEN); + else if (buffer_delay(bh)) + acceptable = (type == IOMAP_DELAY); +- else if (buffer_mapped(bh)) ++ else if (buffer_dirty(bh) && buffer_mapped(bh)) + acceptable = (type == 0); + else + break; +diff --git a/include/linux/cpu.h b/include/linux/cpu.h +index 0ed1d48..d612b89 100644 +--- a/include/linux/cpu.h ++++ b/include/linux/cpu.h +@@ -32,7 +32,7 @@ struct cpu { + }; + + extern int register_cpu(struct cpu *, int, struct node *); +-extern struct sys_device *get_cpu_sysdev(int cpu); ++extern struct sys_device *get_cpu_sysdev(unsigned cpu); + #ifdef CONFIG_HOTPLUG_CPU + extern void unregister_cpu(struct cpu *, struct node *); + #endif +diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h +index 9d5494a..3009c81 100644 +--- a/include/linux/raid/raid1.h ++++ b/include/linux/raid/raid1.h +@@ -130,6 +130,6 @@ struct r1bio_s { + * with failure when last write completes (and all failed). + * Record that bi_end_io was called with this flag... + */ +-#define R1BIO_Returned 4 ++#define R1BIO_Returned 6 + + #endif +diff --git a/include/linux/rtc.h b/include/linux/rtc.h +index 0b2ba67..b739ac1 100644 +--- a/include/linux/rtc.h ++++ b/include/linux/rtc.h +@@ -11,8 +11,6 @@ + #ifndef _LINUX_RTC_H_ + #define _LINUX_RTC_H_ + +-#include <linux/interrupt.h> +- + /* + * The struct used to pass data via the following ioctl. Similar to the + * struct tm in <time.h>, but it needs to be here so that the kernel +@@ -95,6 +93,8 @@ struct rtc_pll_info { + + #ifdef __KERNEL__ + ++#include <linux/interrupt.h> ++ + typedef struct rtc_task { + void (*func)(void *private_data); + void *private_data; +diff --git a/kernel/sched.c b/kernel/sched.c +index 4d46e90..4e7efac 100644 +--- a/kernel/sched.c ++++ b/kernel/sched.c +@@ -237,6 +237,7 @@ struct runqueue { + + task_t *migration_thread; + struct list_head migration_queue; ++ int cpu; + #endif + + #ifdef CONFIG_SCHEDSTATS +@@ -1660,6 +1661,9 @@ unsigned long nr_iowait(void) + /* + * double_rq_lock - safely lock two runqueues + * ++ * We must take them in cpu order to match code in ++ * dependent_sleeper and wake_dependent_sleeper. ++ * + * Note this does not disable interrupts like task_rq_lock, + * you need to do so manually before calling. + */ +@@ -1671,7 +1675,7 @@ static void double_rq_lock(runqueue_t *r + spin_lock(&rq1->lock); + __acquire(rq2->lock); /* Fake it out ;) */ + } else { +- if (rq1 < rq2) { ++ if (rq1->cpu < rq2->cpu) { + spin_lock(&rq1->lock); + spin_lock(&rq2->lock); + } else { +@@ -1707,7 +1711,7 @@ static void double_lock_balance(runqueue + __acquires(this_rq->lock) + { + if (unlikely(!spin_trylock(&busiest->lock))) { +- if (busiest < this_rq) { ++ if (busiest->cpu < this_rq->cpu) { + spin_unlock(&this_rq->lock); + spin_lock(&busiest->lock); + spin_lock(&this_rq->lock); +@@ -6035,6 +6039,7 @@ void __init sched_init(void) + rq->push_cpu = 0; + rq->migration_thread = NULL; + INIT_LIST_HEAD(&rq->migration_queue); ++ rq->cpu = i; + #endif + atomic_set(&rq->nr_iowait, 0); + +diff --git a/net/core/sock.c b/net/core/sock.c +index 6e00811..5621198 100644 +--- a/net/core/sock.c ++++ b/net/core/sock.c +@@ -404,8 +404,9 @@ set_rcvbuf: + if (!valbool) { + sk->sk_bound_dev_if = 0; + } else { +- if (optlen > IFNAMSIZ) +- optlen = IFNAMSIZ; ++ if (optlen > IFNAMSIZ - 1) ++ optlen = IFNAMSIZ - 1; ++ memset(devname, 0, sizeof(devname)); + if (copy_from_user(devname, optval, optlen)) { + ret = -EFAULT; + break; +diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c +index 8ee4d01..f75ff1d 100644 +--- a/net/ipv4/ip_output.c ++++ b/net/ipv4/ip_output.c +@@ -1249,11 +1249,7 @@ int ip_push_pending_frames(struct sock * + iph->tos = inet->tos; + iph->tot_len = htons(skb->len); + iph->frag_off = df; +- if (!df) { +- __ip_select_ident(iph, &rt->u.dst, 0); +- } else { +- iph->id = htons(inet->id++); +- } ++ ip_select_ident(iph, &rt->u.dst, sk); + iph->ttl = ttl; + iph->protocol = sk->sk_protocol; + iph->saddr = rt->rt_src; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sn-max-node-count-1 new/patches.fixes/sn-max-node-count-1 --- old/patches.fixes/sn-max-node-count-1 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sn-max-node-count-1 2006-03-31 17:22:04.000000000 +0200 @@ -0,0 +1,60 @@ +From: Jack Steiner <steiner(a)sgi.com> +Date: Thu, 2 Mar 2006 22:02:21 +0000 (-0600) +Subject: [IA64] Increase max node count on SN platforms +X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdi… +Refernces: 160976 +Acked-by: schwab(a)suse.de + +[IA64] Increase max node count on SN platforms + +Add a configuration option to allow the maximum +number of nodes to be configurable for GENERIC or SN +kernels. + +Signed-off-by: Jack Steiner <steiner(a)sgi.com> +Signed-off-by: Tony Luck <tony.luck(a)intel.com> +--- + +--- a/arch/ia64/Kconfig ++++ b/arch/ia64/Kconfig +@@ -252,6 +252,15 @@ config NR_CPUS + than 64 will cause the use of a CPU mask array, causing a small + performance hit. + ++config IA64_NR_NODES ++ int "Maximum number of NODEs (256-1024)" if (IA64_SGI_SN2 || IA64_GENERIC) ++ range 256 1024 ++ depends on IA64_SGI_SN2 || IA64_GENERIC ++ default "256" ++ help ++ This option specifies the maximum number of nodes in your SSI system. ++ If in doubt, use the default. ++ + config HOTPLUG_CPU + bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" + depends on SMP && EXPERIMENTAL +--- a/include/asm-ia64/numnodes.h ++++ b/include/asm-ia64/numnodes.h +@@ -3,13 +3,18 @@ + + #ifdef CONFIG_IA64_DIG + /* Max 8 Nodes */ +-#define NODES_SHIFT 3 ++# define NODES_SHIFT 3 + #elif defined(CONFIG_IA64_HP_ZX1) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB) + /* Max 32 Nodes */ +-#define NODES_SHIFT 5 ++# define NODES_SHIFT 5 + #elif defined(CONFIG_IA64_SGI_SN2) || defined(CONFIG_IA64_GENERIC) +-/* Max 256 Nodes */ +-#define NODES_SHIFT 8 ++# if CONFIG_IA64_NR_NODES == 256 ++# define NODES_SHIFT 8 ++# elif CONFIG_IA64_NR_NODES <= 512 ++# define NODES_SHIFT 9 ++# elif CONFIG_IA64_NR_NODES <= 1024 ++# define NODES_SHIFT 10 ++# endif + #endif + + #endif /* _ASM_MAX_NUMNODES_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sn-max-node-count-2 new/patches.fixes/sn-max-node-count-2 --- old/patches.fixes/sn-max-node-count-2 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sn-max-node-count-2 2006-03-31 17:22:04.000000000 +0200 @@ -0,0 +1,107 @@ +From: Jack Steiner <steiner(a)sgi.com> +Date: Thu, 2 Mar 2006 22:02:25 +0000 (-0600) +Subject: [IA64] Increase max node count on SN platforms +X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdi… +Refernces: 160976 +Acked-by: schwab(a)suse.de + +[IA64] Increase max node count on SN platforms + +Add support in IA64 acpi for platforms that support more than +256 nodes. Currently, ACPI is limited to 256 nodes because the +proximity domain number is 8-bits. + +Long term, we expect to use ACPI3.0 to support >256 nodes. +This patch is an interim solution that works with platforms +that pass the high order bits of the proximity domain in +"reserved" fields of the ACPI tables. This code is enabled +ONLY on SN platforms. + +Signed-off-by: Jack Steiner <steiner(a)sgi.com> +Signed-off-by: Tony Luck <tony.luck(a)intel.com> +--- + + arch/ia64/kernel/acpi.c | 32 ++++++++++++++++++++++++++++---- + include/asm-ia64/acpi.h | 4 ++++ + 2 files changed, 32 insertions(+), 4 deletions(-) + +Index: linux/arch/ia64/kernel/acpi.c +=================================================================== +--- linux.orig/arch/ia64/kernel/acpi.c 2006-03-19 23:53:29.000000000 -0600 ++++ linux/arch/ia64/kernel/acpi.c 2006-03-27 10:10:23.823015354 -0600 +@@ -414,6 +414,26 @@ int __devinitdata pxm_to_nid_map[MAX_PXM + int __initdata nid_to_pxm_map[MAX_NUMNODES]; + static struct acpi_table_slit __initdata *slit_table; + ++static int get_processor_proximity_domain(struct acpi_table_processor_affinity *pa) ++{ ++ int pxm; ++ ++ pxm = pa->proximity_domain; ++ if (ia64_platform_is("sn2")) ++ pxm += pa->reserved[0] << 8; ++ return pxm; ++} ++ ++static int get_memory_proximity_domain(struct acpi_table_memory_affinity *ma) ++{ ++ int pxm; ++ ++ pxm = ma->proximity_domain; ++ if (ia64_platform_is("sn2")) ++ pxm += ma->reserved1[0] << 8; ++ return pxm; ++} ++ + /* + * ACPI 2.0 SLIT (System Locality Information Table) + * http://devresource.hp.com/devresource/Docs/TechPapers/IA64/slit.pdf +@@ -437,13 +457,17 @@ void __init acpi_numa_slit_init(struct a + void __init + acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa) + { ++ int pxm; ++ ++ pxm = get_processor_proximity_domain(pa); ++ + /* record this node in proximity bitmap */ +- pxm_bit_set(pa->proximity_domain); ++ pxm_bit_set(pxm); + + node_cpuid[srat_num_cpus].phys_id = + (pa->apic_id << 8) | (pa->lsapic_eid); + /* nid should be overridden as logical node id later */ +- node_cpuid[srat_num_cpus].nid = pa->proximity_domain; ++ node_cpuid[srat_num_cpus].nid = pxm; + srat_num_cpus++; + } + +@@ -451,10 +475,10 @@ void __init + acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma) + { + unsigned long paddr, size; +- u8 pxm; ++ int pxm; + struct node_memblk_s *p, *q, *pend; + +- pxm = ma->proximity_domain; ++ pxm = get_memory_proximity_domain(ma); + + /* fill node memory chunk structure */ + paddr = ma->base_addr_hi; +Index: linux/include/asm-ia64/acpi.h +=================================================================== +--- linux.orig/include/asm-ia64/acpi.h 2006-03-19 23:53:29.000000000 -0600 ++++ linux/include/asm-ia64/acpi.h 2006-03-27 09:51:02.133276875 -0600 +@@ -111,7 +111,11 @@ extern int additional_cpus; + + #ifdef CONFIG_ACPI_NUMA + /* Proximity bitmap length; _PXM is at most 255 (8 bit)*/ ++#ifdef CONFIG_IA64_NR_NODES ++#define MAX_PXM_DOMAINS CONFIG_IA64_NR_NODES ++#else + #define MAX_PXM_DOMAINS (256) ++#endif + extern int __devinitdata pxm_to_nid_map[MAX_PXM_DOMAINS]; + extern int __initdata nid_to_pxm_map[MAX_NUMNODES]; + #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sn-max-node-count-3 new/patches.fixes/sn-max-node-count-3 --- old/patches.fixes/sn-max-node-count-3 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sn-max-node-count-3 2006-03-31 17:22:04.000000000 +0200 @@ -0,0 +1,39 @@ +From: Jack Steiner <steiner(a)sgi.com> +Date: Thu, 2 Mar 2006 22:02:28 +0000 (-0600) +Subject: [IA64] Increase max node count on SN platforms +X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdi… +Refernces: 160976 +Acked-by: schwab(a)suse.de + +[IA64] Increase max node count on SN platforms + +Node number are kept in the cpu_to_node_map which is +currently defined as u8. Change to u16 to accomodate +larger node numbers. + +Signed-off-by: Jack Steiner <steiner(a)sgi.com> +Signed-off-by: Tony Luck <tony.luck(a)intel.com> +--- + +--- a/arch/ia64/kernel/numa.c ++++ b/arch/ia64/kernel/numa.c +@@ -25,7 +25,7 @@ + #include <asm/processor.h> + #include <asm/smp.h> + +-u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned; ++u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned; + EXPORT_SYMBOL(cpu_to_node_map); + + cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned; +--- a/include/asm-ia64/numa.h ++++ b/include/asm-ia64/numa.h +@@ -23,7 +23,7 @@ + + #include <asm/mmzone.h> + +-extern u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned; ++extern u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned; + extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned; + + /* Stuff below this line could be architecture independent */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sn-max-node-count-4 new/patches.fixes/sn-max-node-count-4 --- old/patches.fixes/sn-max-node-count-4 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/sn-max-node-count-4 2006-03-31 17:22:04.000000000 +0200 @@ -0,0 +1,45 @@ +From: Jack Steiner <steiner(a)sgi.com> +Date: Thu, 2 Mar 2006 22:02:32 +0000 (-0600) +Subject: [IA64] Increase max node count on SN platforms +X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdi… +Refernces: 160976 +Acked-by: schwab(a)suse.de + +[IA64] Increase max node count on SN platforms + +Update configuration files with new CONFIG option. + +Signed-off-by: Jack Steiner <steiner(a)sgi.com> +Signed-off-by: Tony Luck <tony.luck(a)intel.com> +--- + +--- a/arch/ia64/configs/gensparse_defconfig ++++ b/arch/ia64/configs/gensparse_defconfig +@@ -116,6 +116,7 @@ CONFIG_IOSAPIC=y + CONFIG_FORCE_MAX_ZONEORDER=17 + CONFIG_SMP=y + CONFIG_NR_CPUS=512 ++CONFIG_IA64_NR_NODES=256 + CONFIG_HOTPLUG_CPU=y + # CONFIG_SCHED_SMT is not set + # CONFIG_PREEMPT is not set +--- a/arch/ia64/configs/sn2_defconfig ++++ b/arch/ia64/configs/sn2_defconfig +@@ -116,6 +116,7 @@ CONFIG_IA64_SGI_SN_XP=m + CONFIG_FORCE_MAX_ZONEORDER=17 + CONFIG_SMP=y + CONFIG_NR_CPUS=1024 ++CONFIG_IA64_NR_NODES=256 + # CONFIG_HOTPLUG_CPU is not set + CONFIG_SCHED_SMT=y + CONFIG_PREEMPT=y +--- a/arch/ia64/defconfig ++++ b/arch/ia64/defconfig +@@ -116,6 +116,7 @@ CONFIG_IOSAPIC=y + CONFIG_FORCE_MAX_ZONEORDER=17 + CONFIG_SMP=y + CONFIG_NR_CPUS=512 ++CONFIG_IA64_NR_NODES=256 + CONFIG_HOTPLUG_CPU=y + # CONFIG_SCHED_SMT is not set + # CONFIG_PREEMPT is not set ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/lkcd.patch new/patches.suse/lkcd.patch --- old/patches.suse/lkcd.patch 2006-03-24 12:09:55.000000000 +0100 +++ new/patches.suse/lkcd.patch 2006-04-02 11:13:23.000000000 +0200 @@ -1424,7 +1424,7 @@ extern int nr_processes(void); extern unsigned long nr_running(void); extern unsigned long nr_uninterruptible(void); -@@ -1002,6 +1003,88 @@ +@@ -1002,6 +1003,89 @@ void yield(void); /* @@ -1486,6 +1486,7 @@ + + task_t *migration_thread; + struct list_head migration_queue; ++ int cpu; +#endif + +#ifdef CONFIG_SCHEDSTATS @@ -1703,7 +1704,7 @@ /* * Convert user-nice values [ -20 ... 0 ... 19 ] * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ], -@@ -185,89 +193,7 @@ +@@ -185,90 +193,7 @@ EXPORT_SYMBOL_GPL(__put_task_struct_cb); @@ -1766,6 +1767,7 @@ - - task_t *migration_thread; - struct list_head migration_queue; +- int cpu; -#endif - -#ifdef CONFIG_SCHEDSTATS ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++++ series.conf ++++++ --- kernel-source/series.conf 2006-03-31 12:03:08.000000000 +0200 +++ kernel-source/series.conf 2006-04-02 11:18:00.000000000 +0200 @@ -21,6 +21,7 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... + patches.fixes/patch-2.6.16.1 patches.fixes/setuid-dumpable-wrongdir patches.fixes/git-kbuild.patch @@ -156,6 +157,8 @@ patches.arch/ppc-protect-remove_proc_entry.patch patches.arch/ppc-device-tree-dupnodes.patch patches.arch/ppc-pseries-lparcfg-1.7.patch + patches.arch/ppc-floppy-isa-dma.patch + patches.arch/ppc-pseries-rtas-mtcr-bug.patch # KDB v4.4 @@ -453,11 +456,6 @@ patches.drivers/export_symbol_gpl_future-rcu.patch patches.drivers/export_symbol_gpl_future-usb.patch - # These will be in 2.6.16.1 and are in 2.6.17 - patches.drivers/driver-0001-sysfs-sysfs_remove_dir-needs-to-invalidate-the-dentry.patch - patches.drivers/driver-0014-firmware-fix-BUG-in-fw_realloc_buffer.patch - patches.drivers/driver-0021-get_cpu_sysdev-signedness-fix.patch - patches.drivers/driver-0023-sysfs-fix-a-kobject-leak-in-sysfs_add_link-on-the-error-path.patch ######################################################## # USB @@ -897,7 +895,6 @@ patches.fixes/nfsd-setuser-fix patches.fixes/nfsd-putrootfh-dont-setuser - patches.fixes/md-raid1-hang patches.drivers/libata-device-spindown patches.fixes/libata-resume-drive_port-mode @@ -929,6 +926,12 @@ patches.fixes/sn-hwperf-geoid-to-cnode-loop patches.fixes/ahci-init-on-resume patches.fixes/msi-save-restore-for-suspend-resume.patch + + # bug #160976 + patches.fixes/sn-max-node-count-1 + patches.fixes/sn-max-node-count-2 + patches.fixes/sn-max-node-count-3 + patches.fixes/sn-max-node-count-4 # PLEASE KEEP THESE PATCHES AT THE END OF series.conf # (as all other arch specific patches should be kept at the end ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 1 month

commit kdebase3-SuSE

by root＠suse.de

Hello community, here is the log from the commit of package kdebase3-SuSE checked in at Sun Apr 2 11:43:21 CEST 2006. -------- --- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2006-03-30 13:54:37.000000000 +0200 +++ kdebase3-SuSE/kdebase3-SuSE.changes 2006-03-31 17:51:24.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Mar 31 17:51:03 CEST 2006 - dmueller(a)suse.de + +- fix wallpaper upgrade bug (#162169) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.bFG5mb/_old 2006-04-02 11:42:03.000000000 +0200 +++ /var/tmp/diff_new_pack.bFG5mb/_new 2006-04-02 11:42:03.000000000 +0200 @@ -31,7 +31,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 10.1 -Release: 43 +Release: 44 Source0: kdebase-SuSE-%{version}.tar.bz2 Source2: kdebase3-SuSE-displaymanager.fillup Source3: kdebase3-SuSE-windowmanager.fillup @@ -185,6 +185,8 @@ /var/lib/kde-profiles %changelog -n kdebase3-SuSE +* Fri Mar 31 2006 - dmueller(a)suse.de +- fix wallpaper upgrade bug (#162169) * Thu Mar 30 2006 - stbinner(a)suse.de - update kdm and kthememanager screenshots/definitions (#156165) * Mon Mar 27 2006 - stbinner(a)suse.de ++++++ kdebase-SuSE-10.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/env/startkde.update.sh new/kdebase-SuSE/config-files/opt/kde3/env/startkde.update.sh --- old/kdebase-SuSE/config-files/opt/kde3/env/startkde.update.sh 2006-03-20 18:01:11.000000000 +0100 +++ new/kdebase-SuSE/config-files/opt/kde3/env/startkde.update.sh 2006-03-31 17:36:56.000000000 +0200 @@ -8,12 +8,14 @@ kdesktopfile="$HOME/.kde/share/config/kdesktoprc" if [ ! -e "$HOME/.skel/kdebase3.wallpaper101" -a -e "$kdesktopfile" ]; then - if grep -q "[Desktop0]" "$kdesktopfile"; then + if ! fgrep -q "[Desktop0]" "$kdesktopfile"; then WALLPAPER=$(/opt/kde3/bin/startkde.pick_wallpaper) echo "[Desktop0]" >> "$kdesktopfile" echo "Wallpaper=$WALLPAPER" >> "$kdesktopfile" else - wallpaper=`sed -n -e '/^\[Desktop0\]/,/^\[/ s,^Wallpaper=$.*$,\1,p' "$kdesktopfile"` + w=`sed -n -e '/^\[Desktop0\]/,/^\[/ s,^Wallpaper=$.*$,\1,p' "$kdesktopfile"` + # expand $HOME and other stuff + eval "wallpaper=\"$w\"" if [ ! -e "$wallpaper" ]; then WALLPAPER=$(/opt/kde3/bin/startkde.pick_wallpaper) sed -e "/^\[Desktop0\]/,/^\[/ s,^Wallpaper=$.*$,Wallpaper=$WALLPAPER," "$kdesktopfile" > "$kdesktopfile.new" && \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 1 month

commit zmd

by root＠suse.de

Hello community, here is the log from the commit of package zmd checked in at Sat Apr 1 13:14:17 CEST 2006. -------- --- zmd/zmd.changes 2006-03-30 10:12:57.000000000 +0200 +++ zmd/zmd.changes 2006-04-01 00:15:34.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Mar 31 22:47:49 CEST 2006 - maw(a)suse.de + +- New source drop (r26565) which: +- Reverts lots of brokenness + +------------------------------------------------------------------- +Fri Mar 31 01:29:09 CEST 2006 - maw(a)suse.de + +- New source drop (r26498) which: +- Actually writes out the zmd.sleeping file when we goto sleep, + and ensure that it has correct permissions. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.0NzaJf/_old 2006-04-01 13:13:49.000000000 +0200 +++ /var/tmp/diff_new_pack.0NzaJf/_new 2006-04-01 13:13:49.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1 -Release: 35 +Release: 36 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-7.1.1.tar.bz2 @@ -156,6 +156,13 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Fri Mar 31 2006 - maw(a)suse.de +- New source drop (r26565) which: +- Reverts lots of brokenness +* Fri Mar 31 2006 - maw(a)suse.de +- New source drop (r26498) which: +- Actually writes out the zmd.sleeping file when we goto sleep, + and ensure that it has correct permissions. * Thu Mar 30 2006 - aj(a)suse.de - Package /var/run/zmd [#162079]. * Thu Mar 30 2006 - maw(a)suse.de ++++++ zmd-7.1.1.tar.bz2 ++++++ ++++ 18534 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/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog --- old/zmd-7.1.1/modules/ChangeLog 2006-03-30 02:29:20.000000000 +0200 +++ new/zmd-7.1.1/modules/ChangeLog 2006-03-31 18:52:53.000000000 +0200 @@ -1,3 +1,37 @@ +2006-03-31 Tambet Ingo <tambet(a)ximian.com> + + * linux/ResolvableBase.cs: + * linux/SqlPackage.cs: + + Revert Dan's yesterday's changes, it broke a lot of stuff horribly. + + * linux/Database.cs: Create triggers correctly to remove all types of + resolvables from the database when the parent from resolvables table + gets removed. + Add catalog changed listeners to catch subscription changes and update + the database accordingly. Fixes #162467. + (AddIndeces): Implmenent. + (RemoveIndeces): Implement. + + * linux/RCEService.cs: Remove database indeces before starting to add + packages to the database and recreate them when done. + +2006-03-30 Dan Mills <thunder(a)ximian.com> + + * linux/SqlPackage.cs: + * linux/ResolvableBase.cs: + + Move dependency auto-loading code from SqlPackage to ResolvableBase. + +2006-03-28 James Willcox <james(a)ximian.com> + + * linux/Transaction.cs: add Block and Allow static methods + * linux/PackageManager.cs: use the above methods + * linux/PatchBundle.cs: also use the above methods + + Don't allow package transactions to occur while installing a + patch bundle. + 2006-03-29 Chris Rivera <cmr(a)ximian.com> * linux/PackageManager.cs: Add arch filtering for QueryLatest and 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/zmd-7.1.1/modules/linux/Database.cs new/zmd-7.1.1/modules/linux/Database.cs --- old/zmd-7.1.1/modules/linux/Database.cs 2006-03-28 21:12:12.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/Database.cs 2006-03-31 18:52:53.000000000 +0200 @@ -194,6 +194,33 @@ CreateResolvableTables (); // Indeces, triggers, etc + AddIndeces (); + + sql = + "CREATE TRIGGER remove_catalogs AFTER DELETE ON catalogs" + + " BEGIN" + + " DELETE FROM resolvables WHERE catalog = old.id;" + + " END;"; + ExecNonQuery (sql); + + sql = + "CREATE TRIGGER remove_resolvables AFTER DELETE ON resolvables" + + " BEGIN" + + " DELETE FROM package_details WHERE resolvable_id = old.id;" + + " DELETE FROM patch_details WHERE resolvable_id = old.id;" + + " DELETE FROM pattern_details WHERE resolvable_id = old.id;" + + " DELETE FROM product_details WHERE resolvable_id = old.id;" + + " DELETE FROM message_details WHERE resolvable_id = old.id;" + + " DELETE FROM script_details WHERE resolvable_id = old.id;" + + " DELETE FROM dependencies WHERE resolvable_id = old.id;" + + " DELETE FROM files WHERE resolvable_id = old.id;" + + " END;"; + ExecNonQuery (sql); + } + + public static void AddIndeces () { + + string sql; sql = "CREATE INDEX resolvable_catalog ON resolvables (catalog)"; ExecNonQuery (sql); @@ -209,21 +236,24 @@ sql = "CREATE INDEX dependency_resolvable ON dependencies (resolvable_id)"; ExecNonQuery (sql); + } - sql = - "CREATE TRIGGER remove_catalogs AFTER DELETE ON catalogs" + - " BEGIN" + - " DELETE FROM resolvables WHERE catalog = old.id;" + - " END;"; + public static void RemoveIndeces () { + string sql; + + sql = "DROP INDEX resolvable_catalog"; ExecNonQuery (sql); - sql = - "CREATE TRIGGER remove_resolvables AFTER DELETE ON resolvables" + - " BEGIN" + - " DELETE FROM package_details WHERE resolvable_id = old.id;" + - " DELETE FROM dependencies WHERE resolvable_id = old.id;" + - " DELETE FROM files WHERE resolvable_id = old.id;" + - " END;"; + sql = "DROP INDEX resolvable_name"; + ExecNonQuery (sql); + + sql = "DROP INDEX resolvable_spec"; + ExecNonQuery (sql); + + sql = "DROP INDEX package_details"; + ExecNonQuery (sql); + + sql = "DROP INDEX dependency_resolvable"; ExecNonQuery (sql); } @@ -284,10 +314,18 @@ } public static void RemoveCatalog (Catalog catalog) { - RemoveCatalog (catalog.Id); + catalog.Changed -= UpdateCatalog; + + string sql = String.Format ("DELETE FROM catalogs WHERE id = '{0}'", SqlString (catalog.Id)); + ExecNonQuery (sql); } private static void RemoveCatalog (string id) { + Catalog catalog = BundleManager.LookupCatalogById (id); + + if (catalog != null) + catalog.Changed -= UpdateCatalog; + string sql = String.Format ("DELETE FROM catalogs WHERE id = '{0}'", SqlString (id)); ExecNonQuery (sql); } @@ -324,12 +362,50 @@ using (CatalogWriter writer = new CatalogWriter ()) { writer.Write (catalog); } + + catalog.Changed += UpdateCatalog; + } + + private static void UpdateCatalog (object o, EventArgs args) { + Catalog catalog = (Catalog) o; + + // Only subscribed can change, right? + + string sql = + "UPDATE catalogs " + + "SET subscribed = ? " + + "WHERE id = ?"; + + IDbCommand command = (SqliteCommand) Connection.CreateCommand (); + command.CommandText = sql; + + IDataParameter subscribed = new SqliteParameter ("subscribed", DbType.Int32); + IDataParameter id = new SqliteParameter ("id", DbType.String); + + command.Parameters.Add (subscribed); + command.Parameters.Add (id); + command.Prepare (); + + subscribed.Value = Convert.ToInt32 (catalog.IsSubscribed); + id.Value = Database.SqlString (catalog.Id); + + GetLock (false); + + try { + command.ExecuteNonQuery (); + } finally { + ReleaseLock (false); + command.Dispose (); + } } public static void AddCatalog (Catalog[] catalogs) { using (CatalogWriter writer = new CatalogWriter ()) { writer.Write (catalogs); } + + foreach (Catalog c in catalogs) + c.Changed += UpdateCatalog; } public static PackageFile[] GetPackageFiles (Package package) { 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/zmd-7.1.1/modules/linux/PackageManager.cs new/zmd-7.1.1/modules/linux/PackageManager.cs --- old/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 02:12:02.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/PackageManager.cs 2006-03-30 22:36:23.000000000 +0200 @@ -40,7 +40,6 @@ private static SystemPackageCollection installed; private static MultiPackageCollection packages; - private static object transactionLock = new object (); private static Transaction transaction; public static EventHandler AvailablePackagesAdded; @@ -150,18 +149,20 @@ } public static ResolverResult Verify () { - lock (transactionLock) { - if (transaction != null) - throw new ZenException (GettextCatalog.GetString ("Another transaction is already running.")); + try { + Transaction.Block (); return Backend.Current.Verify (); + } finally { + Transaction.Allow (); } } public static ResolverResult Resolve (IResolvable[] installs, IResolvable[] upgrades, IResolvable[] removals) { - lock (transactionLock) { - if (transaction != null) - throw new ZenException (GettextCatalog.GetString ("Another transaction is already running.")); + try { + Transaction.Block (); return Backend.Current.ResolveDependencies (installs, upgrades, removals); + } finally { + Transaction.Allow (); } } @@ -241,23 +242,24 @@ public static Transaction CreateTransaction (RollbackInfo rb, TransactionFlags flags) { if (!CheckPermissions (rb.Installs, null, rb.Removals)) throw new ZenException (GettextCatalog.GetString ("You do not have permission to install and/or remove packages.")); - lock (transactionLock) { - if (transaction != null) - throw new ZenException (GettextCatalog.GetString ("Another transaction is already running.")); - - try { - transaction = new Transaction (); - transaction.Installs = rb.Installs; - transaction.Removals = rb.Removals; - transaction.RestoreFiles = rb.Files; - transaction.Flags = flags; - } catch (Exception e) { - // Something went wrong, don't leave stale transactions around - transaction = null; - throw e; - } + + Transaction.Block (); + + try { + transaction = new Transaction (); + transaction.Installs = rb.Installs; + transaction.Removals = rb.Removals; + transaction.RestoreFiles = rb.Files; + transaction.Flags = flags; + } catch (Exception e) { + // Something went wrong, don't leave stale transactions around + transaction = null; + Transaction.Allow (); + throw e; } + transaction.TransactionProgress.Stopped += new ProgressUpdate (TransactionDone); + return transaction; } @@ -267,33 +269,29 @@ if (!CheckPermissions (installs, upgrades, removals)) throw new ZenException (GettextCatalog.GetString ("You do not have permission to install and/or remove packages.")); - lock (transactionLock) { - - if (transaction != null) - throw new ZenException (GettextCatalog.GetString ("Another transaction is already running.")); - - try { - transaction = new Transaction (); - transaction.Installs = installs; - transaction.Upgrades = upgrades; - transaction.Removals = removals; - transaction.Flags = flags; - } catch (Exception e) { - // Something went wrong, don't leave stale transactions around - transaction = null; - throw e; - } - - transaction.TransactionProgress.Stopped += new ProgressUpdate (TransactionDone); + Transaction.Block (); + + try { + transaction = new Transaction (); + transaction.Installs = installs; + transaction.Upgrades = upgrades; + transaction.Removals = removals; + transaction.Flags = flags; + } catch (Exception e) { + // Something went wrong, don't leave stale transactions around + transaction = null; + Transaction.Allow (); + throw e; } + transaction.TransactionProgress.Stopped += new ProgressUpdate (TransactionDone); + return transaction; } private static void TransactionDone (Progress progress) { - lock (transactionLock) { - transaction = null; - } + Transaction.Allow (); + transaction = null; } public static IEnumerable Query (IList query) { 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/zmd-7.1.1/modules/linux/PatchBundle.cs new/zmd-7.1.1/modules/linux/PatchBundle.cs --- old/zmd-7.1.1/modules/linux/PatchBundle.cs 2006-03-22 17:08:43.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/PatchBundle.cs 2006-03-30 22:36:23.000000000 +0200 @@ -242,6 +242,11 @@ string patch; string args; + if (Transaction.IsBlocked) + throw new ZenException (GettextCatalog.GetString ("Another transaction is already running.")); + + Transaction.Block (); + if (product.Name == "SUSE LINUX") patch = patchName; else @@ -274,6 +279,8 @@ progress.Finish (); OnTransacted (); } + + Transaction.Allow (); } public override void Remove (Progress progress, BundleTransactionFlags flags) { 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/zmd-7.1.1/modules/linux/RCEService.cs new/zmd-7.1.1/modules/linux/RCEService.cs --- old/zmd-7.1.1/modules/linux/RCEService.cs 2006-03-22 20:03:40.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/RCEService.cs 2006-03-31 18:52:53.000000000 +0200 @@ -104,13 +104,16 @@ Progress progress = cache.DownloadAsync (WebCache.GetMergedUri (uri, "serviceinfo.xml")); progress.Stopped += OnServiceInfoComplete; + Database.RemoveIndeces (); return refreshProgress; } private void OnRefreshFinished (Progress progress) { + Database.AddIndeces (); + dephash = null; - + if (progress.Status != ProgressStatus.Finished) { RemoveCatalogs (); } 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/zmd-7.1.1/modules/linux/ResolvableBase.cs new/zmd-7.1.1/modules/linux/ResolvableBase.cs --- old/zmd-7.1.1/modules/linux/ResolvableBase.cs 2006-03-27 04:02:22.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/ResolvableBase.cs 2006-03-31 18:52:53.000000000 +0200 @@ -60,6 +60,22 @@ set { installed = value; } } + public virtual ICollection Requires { + get { return requires; } + } + + public virtual ICollection Provides { + get { return provides; } + } + + public virtual ICollection Conflicts { + get { return conflicts; } + } + + public virtual ICollection Obsoletes { + get { return obsoletes; } + } + public virtual Catalog Catalog { get { return catalog; } set { catalog = value; } @@ -89,22 +105,6 @@ get { return category; } } - public virtual ICollection Requires { - get { return requires; } - } - - public virtual ICollection Provides { - get { return provides; } - } - - public virtual ICollection Conflicts { - get { return conflicts; } - } - - public virtual ICollection Obsoletes { - get { return obsoletes; } - } - public virtual string VersionToString () { ResolvableDep dep = new ResolvableDep (); dep.Epoch = epoch; 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/zmd-7.1.1/modules/linux/Transaction.cs new/zmd-7.1.1/modules/linux/Transaction.cs --- old/zmd-7.1.1/modules/linux/Transaction.cs 2006-03-29 02:26:06.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/Transaction.cs 2006-03-30 22:36:23.000000000 +0200 @@ -39,7 +39,9 @@ public class Transaction { private static readonly ILog log = LogManager.GetLogger (typeof (Transaction)); - + private static bool locked; + private static object lockObject = new object (); + private MultiProgress downloadProgress = new MultiProgress ("Downloading Packages"); private TransactionProgress transactionProgress = Backend.Current.TransactionProgress (); private IResolvable[] installs; @@ -48,7 +50,40 @@ private TransactionFlags flags; private PackageHistoryFile[] restoreFiles; private ArrayList logEntries = new ArrayList (); + + public static void Block () { + Block (true); + } + public static void Block (bool throwex) { + lock (lockObject) { + if (locked) { + if (throwex) { + throw new ZenException (GettextCatalog.GetString ("A transaction is already in progress")); + } else { + while (locked) { + Monitor.Wait (lockObject); + } + } + } + + locked = true; + } + } + + public static void Allow () { + lock (lockObject) { + locked = false; + Monitor.Pulse (lockObject); + } + } + + public static bool IsBlocked { + get { + return locked; + } + } + public Progress DownloadProgress { get { return downloadProgress; } } 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/zmd-7.1.1/modules/linux/red-carpet-backend/Makefile.am new/zmd-7.1.1/modules/linux/red-carpet-backend/Makefile.am --- old/zmd-7.1.1/modules/linux/red-carpet-backend/Makefile.am 2006-03-17 22:50:33.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/red-carpet-backend/Makefile.am 2006-03-30 22:36:23.000000000 +0200 @@ -11,9 +11,6 @@ action-reader.c \ action-reader.h -helperdir = $(libdir)/zmd -helper_SCRIPTS = update-status - query_filesdir = $(libdir)/zmd query_files_PROGRAMS = query-files query_files_SOURCES = query-files.c $(PACKAGE_WRITER) Binary files old/zmd-7.1.1/po/de_DE.gmo and new/zmd-7.1.1/po/de_DE.gmo differ 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/zmd-7.1.1/po/de_DE.po new/zmd-7.1.1/po/de_DE.po --- old/zmd-7.1.1/po/de_DE.po 2006-03-29 02:30:22.000000000 +0200 +++ new/zmd-7.1.1/po/de_DE.po 2006-03-31 22:44:49.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-31 14:44-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -105,17 +105,11 @@ msgstr "" "Transaktionsverlauf und bearbeitete Dateien speichern, Rollback zulassen" -#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178 -#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288 -#, fuzzy -msgid "Another transaction is already running." -msgstr "Eine andere Transaktion wird bereits ausgeführt." - -#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283 +#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270 msgid "You do not have permission to install and/or remove packages." msgstr "" -#: modules/linux/PackageManager.cs:357 +#: modules/linux/PackageManager.cs:406 msgid "File list not available." msgstr "" @@ -128,12 +122,17 @@ msgid "Preparing Scripts" msgstr "Skriptvorbereitung" -#: modules/linux/PatchBundle.cs:268 +#: modules/linux/PatchBundle.cs:246 +#, fuzzy +msgid "Another transaction is already running." +msgstr "Eine andere Transaktion wird bereits ausgeführt." + +#: modules/linux/PatchBundle.cs:273 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\": online_update exited with code {1}" msgstr "online_update beendet mit Code {0}: {1}" -#: modules/linux/PatchBundle.cs:272 +#: modules/linux/PatchBundle.cs:277 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\"" msgstr "Initialisieren von Modul \"{0}\" nicht möglich: {1}" @@ -142,12 +141,17 @@ msgid "Aborted" msgstr "Abgebrochen" -#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81 +#: modules/linux/Transaction.cs:62 +#, fuzzy +msgid "A transaction is already in progress" +msgstr "Eine andere Transaktion wird bereits ausgeführt." + +#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116 #, fuzzy, csharp-format msgid "Resolvable {0} is already installed." msgstr "Bundle '{0}' ist bereits installiert." -#: modules/linux/Transaction.cs:200 +#: modules/linux/Transaction.cs:235 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -712,25 +716,25 @@ msgid "Refreshing Services" msgstr "Dienstaktualisierung" -#: src/ServiceManager.cs:621 +#: src/ServiceManager.cs:622 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "Der Dienst '{0}' unterstützt keine Registrierung." -#: src/ServiceManager.cs:784 +#: src/ServiceManager.cs:785 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Unbekannte Dienstspeicherversion '{0}'" -#: src/ShutdownManager.cs:55 +#: src/ShutdownManager.cs:56 msgid "Device shutdown or restart delay in minutes" msgstr "" -#: src/ShutdownManager.cs:56 +#: src/ShutdownManager.cs:57 msgid "Device" msgstr "" -#: src/ShutdownManager.cs:110 +#: src/ShutdownManager.cs:112 msgid "Shutdown is not blocked" msgstr "Das Herunterfahren ist nicht blockiert." Binary files old/zmd-7.1.1/po/en_US.gmo and new/zmd-7.1.1/po/en_US.gmo differ 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/zmd-7.1.1/po/en_US.po new/zmd-7.1.1/po/en_US.po --- old/zmd-7.1.1/po/en_US.po 2006-03-29 02:30:22.000000000 +0200 +++ new/zmd-7.1.1/po/en_US.po 2006-03-31 22:44:49.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-31 14:44-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -102,17 +102,11 @@ msgid "Save transaction history and changed files, allowing rollback" msgstr "Save transaction history and changed files, allowing rollback" -#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178 -#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288 -#, fuzzy -msgid "Another transaction is already running." -msgstr "Another transaction is already in progress" - -#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283 +#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270 msgid "You do not have permission to install and/or remove packages." msgstr "" -#: modules/linux/PackageManager.cs:357 +#: modules/linux/PackageManager.cs:406 msgid "File list not available." msgstr "" @@ -125,12 +119,17 @@ msgid "Preparing Scripts" msgstr "Preparing Scripts" -#: modules/linux/PatchBundle.cs:268 +#: modules/linux/PatchBundle.cs:246 +#, fuzzy +msgid "Another transaction is already running." +msgstr "Another transaction is already in progress" + +#: modules/linux/PatchBundle.cs:273 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\": online_update exited with code {1}" msgstr "online_update exited with code {0}: {1}" -#: modules/linux/PatchBundle.cs:272 +#: modules/linux/PatchBundle.cs:277 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\"" msgstr "Could not initialize module \"{0}\": {1}" @@ -139,12 +138,17 @@ msgid "Aborted" msgstr "Aborted" -#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81 +#: modules/linux/Transaction.cs:62 +#, fuzzy +msgid "A transaction is already in progress" +msgstr "Another transaction is already in progress" + +#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116 #, fuzzy, csharp-format msgid "Resolvable {0} is already installed." msgstr "Bundle '{0}' is already installed." -#: modules/linux/Transaction.cs:200 +#: modules/linux/Transaction.cs:235 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -701,25 +705,25 @@ msgid "Refreshing Services" msgstr "Refreshing Services" -#: src/ServiceManager.cs:621 +#: src/ServiceManager.cs:622 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "The '{0}' service does not support registration." -#: src/ServiceManager.cs:784 +#: src/ServiceManager.cs:785 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Unknown service storage version '{0}'" -#: src/ShutdownManager.cs:55 +#: src/ShutdownManager.cs:56 msgid "Device shutdown or restart delay in minutes" msgstr "" -#: src/ShutdownManager.cs:56 +#: src/ShutdownManager.cs:57 msgid "Device" msgstr "" -#: src/ShutdownManager.cs:110 +#: src/ShutdownManager.cs:112 msgid "Shutdown is not blocked" msgstr "Shutdown is not blocked" Binary files old/zmd-7.1.1/po/es_ES.gmo and new/zmd-7.1.1/po/es_ES.gmo differ 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/zmd-7.1.1/po/es_ES.po new/zmd-7.1.1/po/es_ES.po --- old/zmd-7.1.1/po/es_ES.po 2006-03-29 02:30:22.000000000 +0200 +++ new/zmd-7.1.1/po/es_ES.po 2006-03-31 22:44:49.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-31 14:44-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -108,17 +108,11 @@ "Guardar historial de transacciones y archivos cambiados, permitiendo " "retroceso" -#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178 -#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288 -#, fuzzy -msgid "Another transaction is already running." -msgstr "Hay otra transacción en proceso" - -#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283 +#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270 msgid "You do not have permission to install and/or remove packages." msgstr "" -#: modules/linux/PackageManager.cs:357 +#: modules/linux/PackageManager.cs:406 msgid "File list not available." msgstr "" @@ -131,12 +125,17 @@ msgid "Preparing Scripts" msgstr "Preparando guiones" -#: modules/linux/PatchBundle.cs:268 +#: modules/linux/PatchBundle.cs:246 +#, fuzzy +msgid "Another transaction is already running." +msgstr "Hay otra transacción en proceso" + +#: modules/linux/PatchBundle.cs:273 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\": online_update exited with code {1}" msgstr "Se ha cerrado online_update con el código {0}: {1}" -#: modules/linux/PatchBundle.cs:272 +#: modules/linux/PatchBundle.cs:277 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\"" msgstr "No es posible iniciar el módulo \"{0}\": {1}" @@ -145,12 +144,17 @@ msgid "Aborted" msgstr "Abortados" -#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81 +#: modules/linux/Transaction.cs:62 +#, fuzzy +msgid "A transaction is already in progress" +msgstr "Hay otra transacción en proceso" + +#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116 #, fuzzy, csharp-format msgid "Resolvable {0} is already installed." msgstr "El lote '{0}' ya está instalado." -#: modules/linux/Transaction.cs:200 +#: modules/linux/Transaction.cs:235 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -714,25 +718,25 @@ msgid "Refreshing Services" msgstr "Actualizando servicios" -#: src/ServiceManager.cs:621 +#: src/ServiceManager.cs:622 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "El servicio '{0}' no admite registro." -#: src/ServiceManager.cs:784 +#: src/ServiceManager.cs:785 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Versión de almacenamiento de servicio no válida '{0}'" -#: src/ShutdownManager.cs:55 +#: src/ShutdownManager.cs:56 msgid "Device shutdown or restart delay in minutes" msgstr "" -#: src/ShutdownManager.cs:56 +#: src/ShutdownManager.cs:57 msgid "Device" msgstr "" -#: src/ShutdownManager.cs:110 +#: src/ShutdownManager.cs:112 msgid "Shutdown is not blocked" msgstr "Cierre sin bloquear" Binary files old/zmd-7.1.1/po/fr_FR.gmo and new/zmd-7.1.1/po/fr_FR.gmo differ 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/zmd-7.1.1/po/fr_FR.po new/zmd-7.1.1/po/fr_FR.po --- old/zmd-7.1.1/po/fr_FR.po 2006-03-29 02:30:22.000000000 +0200 +++ new/zmd-7.1.1/po/fr_FR.po 2006-03-31 22:44:49.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-31 14:44-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -107,17 +107,11 @@ "Enregistrer l'historique de la transaction et les fichiers modifiés, en " "permettant le retour à l'état initial" -#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178 -#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288 -#, fuzzy -msgid "Another transaction is already running." -msgstr "Une autre transaction est déjà en cours" - -#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283 +#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270 msgid "You do not have permission to install and/or remove packages." msgstr "" -#: modules/linux/PackageManager.cs:357 +#: modules/linux/PackageManager.cs:406 msgid "File list not available." msgstr "" @@ -130,12 +124,17 @@ msgid "Preparing Scripts" msgstr "Préparation des scripts" -#: modules/linux/PatchBundle.cs:268 +#: modules/linux/PatchBundle.cs:246 +#, fuzzy +msgid "Another transaction is already running." +msgstr "Une autre transaction est déjà en cours" + +#: modules/linux/PatchBundle.cs:273 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\": online_update exited with code {1}" msgstr "online_update a quitté avec le code {0}: {1}" -#: modules/linux/PatchBundle.cs:272 +#: modules/linux/PatchBundle.cs:277 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\"" msgstr "Impossible d'initialiser le module \"{0}\" : {1}" @@ -144,12 +143,17 @@ msgid "Aborted" msgstr "Abandonné" -#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81 +#: modules/linux/Transaction.cs:62 +#, fuzzy +msgid "A transaction is already in progress" +msgstr "Une autre transaction est déjà en cours" + +#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116 #, fuzzy, csharp-format msgid "Resolvable {0} is already installed." msgstr "L'ensemble '{0}' est déjà installé." -#: modules/linux/Transaction.cs:200 +#: modules/linux/Transaction.cs:235 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -713,25 +717,25 @@ msgid "Refreshing Services" msgstr "Rafraîchissement des services" -#: src/ServiceManager.cs:621 +#: src/ServiceManager.cs:622 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "Le service '{0}' ne prend pas en charge l'enregistrement." -#: src/ServiceManager.cs:784 +#: src/ServiceManager.cs:785 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Version de stockage de service '{0}' inconnue" -#: src/ShutdownManager.cs:55 +#: src/ShutdownManager.cs:56 msgid "Device shutdown or restart delay in minutes" msgstr "" -#: src/ShutdownManager.cs:56 +#: src/ShutdownManager.cs:57 msgid "Device" msgstr "" -#: src/ShutdownManager.cs:110 +#: src/ShutdownManager.cs:112 msgid "Shutdown is not blocked" msgstr "L'arrêt n'est pas bloqué" Binary files old/zmd-7.1.1/po/pt_BR.gmo and new/zmd-7.1.1/po/pt_BR.gmo differ 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/zmd-7.1.1/po/pt_BR.po new/zmd-7.1.1/po/pt_BR.po --- old/zmd-7.1.1/po/pt_BR.po 2006-03-29 02:30:22.000000000 +0200 +++ new/zmd-7.1.1/po/pt_BR.po 2006-03-31 22:44:49.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-31 14:44-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -104,17 +104,11 @@ msgid "Save transaction history and changed files, allowing rollback" msgstr "Gravar histórico de transações e arquivos mudados, permitindo rollback" -#: modules/linux/PackageManager.cs:170 modules/linux/PackageManager.cs:178 -#: modules/linux/PackageManager.cs:261 modules/linux/PackageManager.cs:288 -#, fuzzy -msgid "Another transaction is already running." -msgstr "Já existe outra transação em andamento" - -#: modules/linux/PackageManager.cs:258 modules/linux/PackageManager.cs:283 +#: modules/linux/PackageManager.cs:244 modules/linux/PackageManager.cs:270 msgid "You do not have permission to install and/or remove packages." msgstr "" -#: modules/linux/PackageManager.cs:357 +#: modules/linux/PackageManager.cs:406 msgid "File list not available." msgstr "" @@ -127,12 +121,17 @@ msgid "Preparing Scripts" msgstr "Preparando Scripts" -#: modules/linux/PatchBundle.cs:268 +#: modules/linux/PatchBundle.cs:246 +#, fuzzy +msgid "Another transaction is already running." +msgstr "Já existe outra transação em andamento" + +#: modules/linux/PatchBundle.cs:273 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\": online_update exited with code {1}" msgstr "online_update saiu com o código {0}: {1}" -#: modules/linux/PatchBundle.cs:272 +#: modules/linux/PatchBundle.cs:277 #, fuzzy, csharp-format msgid "Could not install patch \"{0}\"" msgstr "Não foi possível inicializar o módulo \"{0}\": {1}" @@ -141,12 +140,17 @@ msgid "Aborted" msgstr "Anulado" -#: modules/linux/Transaction.cs:66 modules/linux/Transaction.cs:81 +#: modules/linux/Transaction.cs:62 +#, fuzzy +msgid "A transaction is already in progress" +msgstr "Já existe outra transação em andamento" + +#: modules/linux/Transaction.cs:101 modules/linux/Transaction.cs:116 #, fuzzy, csharp-format msgid "Resolvable {0} is already installed." msgstr "O bundle '{0}' já está instalado." -#: modules/linux/Transaction.cs:200 +#: modules/linux/Transaction.cs:235 #, csharp-format msgid "Can not download package {0}." msgstr "" @@ -708,25 +712,25 @@ msgid "Refreshing Services" msgstr "Atualizando Serviços" -#: src/ServiceManager.cs:621 +#: src/ServiceManager.cs:622 #, csharp-format msgid "The '{0}' service does not support registration." msgstr "O serviço '{0}' não suporta registro." -#: src/ServiceManager.cs:784 +#: src/ServiceManager.cs:785 #, csharp-format msgid "Unknown service storage version '{0}'" msgstr "Versão de armazenamento de serviço desconhecida '{0}'" -#: src/ShutdownManager.cs:55 +#: src/ShutdownManager.cs:56 msgid "Device shutdown or restart delay in minutes" msgstr "" -#: src/ShutdownManager.cs:56 +#: src/ShutdownManager.cs:57 msgid "Device" msgstr "" -#: src/ShutdownManager.cs:110 +#: src/ShutdownManager.cs:112 msgid "Shutdown is not blocked" msgstr "Desligamento desbloqueado" 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/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs --- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-30 02:15:40.000000000 +0200 +++ new/zmd-7.1.1/src/BuildConfig.cs 2006-03-31 22:44:44.000000000 +0200 @@ -1,14 +1,14 @@ namespace Novell.Zenworks.Zmd { public class BuildConfig { - public const string PREFIX = "/usr"; - public const string SYSCONFDIR = "/etc"; - public const string DATADIR = "/usr/share"; - public const string LIBDIR = "/usr/lib64"; - public const string LIBDIR_MANAGED = "/usr" + "/lib"; - public const string LOCALSTATEDIR = "/var"; + public const string PREFIX = "/usr/local"; + public const string SYSCONFDIR = "/usr/local/etc"; + public const string DATADIR = "/usr/local/share"; + public const string LIBDIR = "/usr/local/lib"; + public const string LIBDIR_MANAGED = "/usr/local" + "/lib"; + public const string LOCALSTATEDIR = "/usr/local/var"; - public const string LOGDIR = "/var/log"; + public const string LOGDIR = "/usr/local/var/log"; public const string LOGFILE = LOGDIR + "/zmd-messages.log"; public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules"; 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/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog --- old/zmd-7.1.1/src/ChangeLog 2006-03-30 02:26:02.000000000 +0200 +++ new/zmd-7.1.1/src/ChangeLog 2006-03-31 18:52:52.000000000 +0200 @@ -1,3 +1,13 @@ +2006-03-31 Tambet Ingo <tambet(a)ximian.com> + + * Identity.cs (IsWellFormedUsername): Fix a typo, add '-' to the list + of allowed characters. Fixes #152457. + +2006-03-30 James Willcox <james(a)ximian.com> + + * ShutdownManager.cs: actually write out the zmd.sleeping file + when we go to sleep, and ensure it has correct permissions. + 2006-03-29 James Willcox <james(a)ximian.com> * ServiceManager.cs: expire the cache after refresh 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/zmd-7.1.1/src/Identity.cs new/zmd-7.1.1/src/Identity.cs --- old/zmd-7.1.1/src/Identity.cs 2006-03-11 05:29:34.000000000 +0100 +++ new/zmd-7.1.1/src/Identity.cs 2006-03-31 18:52:52.000000000 +0200 @@ -95,7 +95,7 @@ if (str == null) return false; for (int i = 0; i < str.Length; i++) - if (!Char.IsLetterOrDigit (str[i]) || str[i] == '_') + if (!(Char.IsLetterOrDigit (str[i]) || str[i] == '_' || str[i] == '-')) return false; return true; } 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/zmd-7.1.1/src/Prefs.cs new/zmd-7.1.1/src/Prefs.cs --- old/zmd-7.1.1/src/Prefs.cs 2006-03-29 02:26:06.000000000 +0200 +++ new/zmd-7.1.1/src/Prefs.cs 2006-03-30 22:36:20.000000000 +0200 @@ -564,7 +564,7 @@ this.description = GettextCatalog.GetString ("If true, inventory information will be collected and sent to the server"); this.category = GettextCatalog.GetString ("Server"); this.type = typeof (bool); - this.default_value = (bool) true; + this.default_value = (bool) false; } } } 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/zmd-7.1.1/src/ShutdownManager.cs new/zmd-7.1.1/src/ShutdownManager.cs --- old/zmd-7.1.1/src/ShutdownManager.cs 2006-03-15 17:13:38.000000000 +0100 +++ new/zmd-7.1.1/src/ShutdownManager.cs 2006-03-31 00:56:27.000000000 +0200 @@ -21,6 +21,7 @@ using System; +using System.IO; using System.Collections; using System.Diagnostics; using System.Threading; @@ -62,6 +63,7 @@ public class ShutdownManager { private static readonly ILog log = LogManager.GetLogger (typeof (ShutdownManager)); + private static readonly string sleepFile = "/var/run/zmd/zmd.sleeping"; private static int counter; private static ShutdownType pending = ShutdownType.None; @@ -130,6 +132,12 @@ return (string[]) list.ToArray (typeof (string)); } + private static void WriteSleepFile () { + using (File.Open (sleepFile, FileMode.Create)); + Syscall.chmod (sleepFile, FilePermissions.S_IRUSR | FilePermissions.S_IWUSR | + FilePermissions.S_IRGRP | FilePermissions.S_IROTH); + } + private static void StartShutdownInternal (ShutdownType type, bool force, int timeout) { if (counter > 0 && !force) { pending = type; @@ -151,6 +159,7 @@ log.Warn ("Preparing to restart..."); break; case ShutdownType.Sleep: + WriteSleepFile (); log.Warn ("Preparing to sleep..."); break; case ShutdownType.DeviceShutdown: 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/zmd-7.1.1/zmd.conf new/zmd-7.1.1/zmd.conf --- old/zmd-7.1.1/zmd.conf 2006-03-22 17:08:44.000000000 +0100 +++ new/zmd-7.1.1/zmd.conf 2006-03-28 03:10:58.000000000 +0200 @@ -1,5 +1,9 @@ [Server] bind-ip=127.0.0.1 +<<<<<<< .mine +remote-enabled=False +======= refresh-interval=86400 remote-enabled=false +>>>>>>> .r26285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 1 month

commit rug

by root＠suse.de

Hello community, here is the log from the commit of package rug checked in at Sat Apr 1 13:12:39 CEST 2006. -------- --- rug/rug.changes 2006-03-31 08:20:39.000000000 +0200 +++ rug/rug.changes 2006-04-01 00:09:03.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Mar 31 23:57:06 CEST 2006 - maw(a)suse.de + +- New source drop (r26568) which: +- Backs out the patch status reporting; it requires changes in + zmd which are not yet ready. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rug.spec ++++++ --- /var/tmp/diff_new_pack.ZErn07/_old 2006-04-01 13:11:09.000000000 +0200 +++ /var/tmp/diff_new_pack.ZErn07/_new 2006-04-01 13:11:09.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: gtkdoc mono-basic mono-data-sqlite mono-devel zmd-devel URL: http://www.novell.com Version: 7.1.1 -Release: 20 +Release: 21 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Command Line Client for zmd @@ -78,6 +78,10 @@ %_mandir/*/*/*.gz %changelog -n rug +* Fri Mar 31 2006 - maw(a)suse.de +- New source drop (r26568) which: +- Backs out the patch status reporting; it requires changes in + zmd which are not yet ready. * Fri Mar 31 2006 - thunder(a)suse.de - New source drop (r26522): - Improves patch status reporting. ++++++ rug-7.1.1.tar.bz2 ++++++ ++++ 11554 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 1 month

commit jpilot-Backup

by root＠suse.de

Hello community, here is the log from the commit of package jpilot-Backup checked in at Sat Apr 1 12:25:46 CEST 2006. -------- --- jpilot-Backup/jpilot-Backup.changes 2006-01-25 21:37:05.000000000 +0100 +++ jpilot-Backup/jpilot-Backup.changes 2006-03-29 15:55:39.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 29 15:55:14 CEST 2006 - dgollub(a)suse.de + +- removed pilot-link 0.12.0 API patch from spec file. + downgrade to pilot-link version 0.11.8 - see #161722 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jpilot-Backup.spec ++++++ --- /var/tmp/diff_new_pack.MzSUS7/_old 2006-04-01 12:25:39.000000000 +0200 +++ /var/tmp/diff_new_pack.MzSUS7/_new 2006-04-01 12:25:39.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package jpilot-Backup (Version 0.51) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,9 +13,9 @@ Name: jpilot-Backup BuildRequires: gtk-devel gtk2-devel jpilot pilot-link-devel update-desktop-files Version: 0.51 -Release: 3 +Release: 11 License: GPL -Summary: Backup plugin for J-Pilot +Summary: Backup Plug-In for J-Pilot Group: Hardware/Palm Autoreqprov: on Requires: jpilot @@ -27,9 +27,9 @@ URL: http://jasonday.home.att.net %description -n jpilot-Backup -Backups are automatic, you configure when (every sync, daily, weekly, -or monthly) Multiple archives (1 - 7) and configure which databases to -backup and which to ignore before starting. +Backups are automatic. You configure when (every sync, daily, weekly, +or monthly), how many archives (1-7), and which databases to backup and +which to ignore before starting. @@ -41,7 +41,7 @@ %setup -q -n jpilot-backup-%{version} %patch %patch1 -%patch2 +#%patch2 downgrade to pilot-link 0.11.8 - see #161722 %build %{?suse_update_config:%{suse_update_config -f}} @@ -66,6 +66,9 @@ %{_libdir}/jpilot %changelog -n jpilot-Backup +* Wed Mar 29 2006 - dgollub(a)suse.de +- removed pilot-link 0.12.0 API patch from spec file. + downgrade to pilot-link version 0.11.8 - see #161722 * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Tue Oct 25 2005 - postadal(a)suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

16 years, 1 month

Jump to page:

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openSUSE Commits April 2006