November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit netcfg for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package netcfg for openSUSE:Factory checked in at Tue Nov 2 16:15:55 CET 2010. -------- --- netcfg/netcfg.changes 2008-10-23 15:05:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/netcfg/netcfg.changes 2010-10-21 17:36:56.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 21 17:35:30 CEST 2010 - pgajdos(a)suse.cz + +- assigned port 4003 to rquotad [bnc#637382] + * modified services-suse.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcfg.spec ++++++ --- /var/tmp/diff_new_pack.rPm9Wp/_old 2010-11-02 16:15:03.000000000 +0100 +++ /var/tmp/diff_new_pack.rPm9Wp/_new 2010-11-02 16:15:03.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package netcfg (Version 11.1) +# spec file for package netcfg (Version 11.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,12 @@ Name: netcfg -License: GPL v2 or later +License: GPLv2+ Group: System/Base AutoReqProv: on PreReq: coreutils aaa_base Summary: Network Configuration Files in /etc -Version: 11.1 +Version: 11.4 Release: 1 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ services-suse.diff ++++++ --- /var/tmp/diff_new_pack.rPm9Wp/_old 2010-11-02 16:15:03.000000000 +0100 +++ /var/tmp/diff_new_pack.rPm9Wp/_new 2010-11-02 16:15:03.000000000 +0100 @@ -1,5 +1,5 @@ ---- services.orig 2008-03-25 15:16:20.000000000 +0100 -+++ services 2008-10-23 14:05:02.000000000 +0200 +--- services.orig 2010-10-21 17:20:04.000000000 +0200 ++++ services 2010-10-21 17:24:00.000000000 +0200 @@ -1,3 +1,13 @@ +# +# Network services, Internet style @@ -65,6 +65,17 @@ nfs 2049/tcp # Network File System - Sun Microsystems nfs 2049/udp # Network File System - Sun Microsystems # Brent Callaghan <brent&terra.eng.sun.com> +@@ -10610,8 +10624,8 @@ + # Jim Philippou <jphilippou&newoak.com> + pxc-spvr-ft 4002/tcp # pxc-spvr-ft + pxc-spvr-ft 4002/udp # pxc-spvr-ft +-pxc-splr-ft 4003/tcp # pxc-splr-ft +-pxc-splr-ft 4003/udp # pxc-splr-ft ++rquotad 4003/tcp # rquotad ++rquotad 4003/udp # rquotad + pxc-roid 4004/tcp # pxc-roid + pxc-roid 4004/udp # pxc-roid + pxc-pin 4005/tcp # pxc-pin @@ -12184,6 +12198,7 @@ netops-broker 5465/udp # NETOPS-BROKER # John R. Deuel <kink&netops.com> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit timezone for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package timezone for openSUSE:Factory checked in at Tue Nov 2 16:14:52 CET 2010. -------- --- timezone/timezone-java.changes 2010-10-05 15:43:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/timezone/timezone-java.changes 2010-11-02 11:57:51.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 2 11:57:20 CET 2010 - dmueller(a)suse.de + +- update to 2010o: + * fix Pacific/Apia and Austalasia/Fiji + +------------------------------------------------------------------- timezone.changes: same change calling whatdependson for head-i586 Old: ---- tzcode2010m.tar.gz tzdata2010m.tar.gz New: ---- tzcode2010n.tar.gz tzdata2010o.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ timezone-java.spec ++++++ --- /var/tmp/diff_new_pack.k6N8F3/_old 2010-11-02 16:14:47.000000000 +0100 +++ /var/tmp/diff_new_pack.k6N8F3/_new 2010-11-02 16:14:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package timezone-java (Version 2010m) +# spec file for package timezone-java (Version 2010o) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,10 +25,10 @@ Group: System/Base # COMMON-BEGIN # COMMON-BEGIN -Version: 2010m +Version: 2010o Release: 1 Source: tzdata%{version}.tar.gz -Source1: tzcode2010m.tar.gz +Source1: tzcode2010n.tar.gz # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html ++++++ timezone.spec ++++++ --- /var/tmp/diff_new_pack.k6N8F3/_old 2010-11-02 16:14:47.000000000 +0100 +++ /var/tmp/diff_new_pack.k6N8F3/_new 2010-11-02 16:14:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package timezone (Version 2010m) +# spec file for package timezone (Version 2010o) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,10 +25,10 @@ Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem, coreutils # COMMON-BEGIN -Version: 2010m +Version: 2010o Release: 1 Source: tzdata%{version}.tar.gz -Source1: tzcode2010m.tar.gz +Source1: tzcode2010n.tar.gz # COMMON-END Patch0: tzdata-china.diff Patch1: tzcode-zic.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit sblim-gather for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package sblim-gather for openSUSE:Factory checked in at Tue Nov 2 16:14:42 CET 2010. -------- --- sblim-gather/sblim-gather.changes 2009-10-02 13:44:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-gather/sblim-gather.changes 2010-09-14 22:26:39.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Sep 14 20:25:37 UTC 2010 - kkaempf(a)novell.com + +- Fix RH/Fedora build + +------------------------------------------------------------------- +Wed Sep 8 00:23:37 UTC 2010 - aj(a)suse.de + +- BuildRequire sysfsutils-devel + +------------------------------------------------------------------- +Mon Mar 29 15:36:43 UTC 2010 - kkaempf(a)novell.com + +- Sysfs wrapper incorrectly calls open_device_path in stead of + open_device_tree (bnc#590239) + +------------------------------------------------------------------- +Wed Oct 14 15:50:37 CEST 2009 - mhrusecky(a)suse.cz + +- sending current development version to SLE11 SP1 (fate#307089) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- use-open_device_tree-in-sysfs-wrapper.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-gather.spec ++++++ --- /var/tmp/diff_new_pack.bsvUes/_old 2010-11-02 16:14:17.000000000 +0100 +++ /var/tmp/diff_new_pack.bsvUes/_new 2010-11-02 16:14:17.000000000 +0100 @@ -19,22 +19,38 @@ Name: sblim-gather -BuildRequires: gcc-c++ libvirt-devel openslp-devel openssl-devel pam-devel sblim-cmpi-base-devel sblim-indication_helper-devel sblim-testsuite sysfsutils +BuildRequires: gcc-c++ libvirt-devel openssl-devel pam-devel sblim-cmpi-base-devel sblim-indication_helper-devel sblim-testsuite +%if 0%{?rhel_version} != 501 +BuildRequires: openslp-devel +%endif +BuildRequires: glib2-devel +%if 0%{?suse_version} +BuildRequires: pkg-config +%if 0%{?suse_version} > 1130 +BuildRequires: sysfsutils-devel +%else +BuildRequires: sysfsutils +%endif +%else +BuildRequires: pkgconfig +BuildRequires: libsysfs-devel +%endif Url: http://sblim.wiki.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: SBLIM Performance Data Gatherer and Provider Version: 2.2.0 -Release: 1 +Release: 6 Group: System/Management -License: Eclipse Public License 1.0 +License: IBM PL Source0: http://prdownloads.sourceforge.net/sblim/sblim-gather-%{version}.tar.bz2 Patch1: sblim-gather-2.1.8_pointers.patch # see https://sourceforge.net/tracker/?func=detail&atid=712784&aid=1845491&group_… Patch2: gather-reposdump.patch Patch3: sblim-gather-2.2.0-redefinition.patch +Patch4: use-open_device_tree-in-sysfs-wrapper.patch Provides: sblim-gather-pluginz = %{version} -PreReq: sblim-sfcb -#!BuildIgnore: tog-pegasus +Requires(pre): cim-server +BuildRequires: -tog-pegasus %description The purpose of this package is to implement the DMTF CIM Metrics Model @@ -58,7 +74,7 @@ SBLIM Project %package provider -License: Eclipse Public License 1.0 +License: IBM PL Summary: SBLIM Gatherer Provider Group: System/Management Requires: %{name} = %{version} @@ -76,7 +92,7 @@ SBLIM Project %package devel -License: Eclipse Public License 1.0 +License: IBM PL Summary: SBLIM Gatherer Development Support Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -91,7 +107,7 @@ SBLIM Project %package test -License: Eclipse Public License 1.0 +License: IBM PL Summary: SBLIM Gatherer Testcase Files Group: System/Management Requires: %{name} = %{version} @@ -112,6 +128,7 @@ %patch1 %patch2 %patch3 +%patch4 -p1 %build autoreconf -fi @@ -120,21 +137,27 @@ %{__make} %install +%if 0%{?suse_version} %makeinstall docdir=%{_docdir}/%{name} +%else +make install DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-%{version} +%endif find %{buildroot} -type f -name \*.la -print0 -delete %clean %{__rm} -rf %{buildroot} +%define MOF Linux_IPProtocolEndpointMetric,Linux_LocalFileSystemMetric,Linux_Metric,Linux_NetworkPortMetric,Linux_OperatingSystemMetric,Linux_ProcessorMetric,Linux_UnixProcessMetric,Linux_XenMetric,Linux_zCECMetric,Linux_zCHMetric,Linux_zECKDMetric,Linux_zLPARMetric + %post provider # compile MOF d=%_datadir/%name -$d/provider-register.sh -t sfcb -r $d/*.registration -m $d/*.mof +$d/provider-register.sh -t sfcb -r $d/{%{MOF}}.registration -m $d/{%{MOF}}.mof %preun provider if [ "$1" = "0" ]; then d=%_datadir/%name - $d/provider-register.sh -t sfcb -d -r $d/*.registration -m $d/*.mof + $d/provider-register.sh -t sfcb -d -r $d/{%{MOF}}.registration -m $d/{%{MOF}}.mof fi %postun provider -p /sbin/ldconfig @@ -150,7 +173,11 @@ %{_localstatedir}/run/gather %{_bindir}/* %{_sbindir}/* +%if 0%{?suse_version} %doc %{_docdir}/%{name} +%else +%doc %{_docdir}/%{name}-%{version} +%endif %dir %{_libdir}/gather %dir %{_libdir}/gather/mplug %dir %{_libdir}/gather/rplug ++++++ use-open_device_tree-in-sysfs-wrapper.patch ++++++ diff -rupN sblim-gather-2.1.6/plugin/sysfswrapper.c sblim-gather-2.1.6-s390x/plugin/sysfswrapper.c --- sblim-gather-2.1.6/plugin/sysfswrapper.c 2007-02-15 16:24:25.000000000 +0000 +++ sblim-gather-2.1.6-s390x/plugin/sysfswrapper.c 2010-03-19 07:08:00.000000000 +0000 @@ -65,7 +65,7 @@ void sysfsw_closeDevice(sysfsw_Device* d } sysfsw_Device* sysfsw_openDeviceTree(const char* devicePath) { - return sysfs_open_device_path(devicePath); + return sysfs_open_device_tree(devicePath); } sysfsw_DeviceList* sysfsw_getDeviceList(sysfsw_Device* device) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libnih for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package libnih for openSUSE:Factory checked in at Tue Nov 2 16:13:58 CET 2010. -------- --- libnih/libnih.changes 2010-07-30 13:18:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/libnih/libnih.changes 2010-11-01 19:05:35.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 1 18:04:45 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- do not hide make output --disable-silent-rules + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnih.spec ++++++ --- /var/tmp/diff_new_pack.3EIAmP/_old 2010-11-02 16:12:34.000000000 +0100 +++ /var/tmp/diff_new_pack.3EIAmP/_new 2010-11-02 16:12:34.000000000 +0100 @@ -27,7 +27,7 @@ Group: Development/Libraries/C and C++ Summary: Library for sharing code Version: 1.0.1 -Release: 3 +Release: 4 Source: %{name}-%{version}.tar.bz2 Url: http://bazaar.launchpad.net/~scott/libnih/trunk/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,7 +52,7 @@ %setup -q %build -%configure --libdir=/%_lib --disable-static +%configure --libdir=/%_lib --disable-static --disable-silent-rules make %{?_smp_mflags} %install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase3 for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at Tue Nov 2 16:13:57 CET 2010. -------- --- KDE/kdebase3/kdebase3.changes 2010-08-10 08:30:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2010-09-23 00:18:14.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Sep 23 00:15:01 CEST 2010 - hpj(a)urpla.net + +- attempt to fix flashplayer dysfunction + +------------------------------------------------------------------- +Fri Aug 13 17:03:58 UTC 2010 - neptunia(a)mail.ru + +- removing dependencies on KDE4, restoring ksysguardd but without strict dependency + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nsplugin-init-gtk.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.ERepAY/_old 2010-11-02 16:12:45.000000000 +0100 +++ /var/tmp/diff_new_pack.ERepAY/_new 2010-11-02 16:12:45.000000000 +0100 @@ -58,8 +58,8 @@ # %if %suse_version < 1031 Requires: kdebase3-ksysguardd -%else -Requires: kdebase4-workspace-ksysguardd +#%else +#Requires: kdebase4-workspace-ksysguardd %endif Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) Requires: xorg-x11 misc-console-font @@ -82,7 +82,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.10.1 -Release: 10 +Release: 11 %define kde_version 3.5.10 Requires: kdebase3-runtime == %{version} Source0: kdebase-%{kde_version}.tar.bz2 @@ -250,6 +250,7 @@ Patch239: gcc44.diff Patch240: bnc584223.diff Patch241: openssl1.patch +Patch242: nsplugin-init-gtk.diff %description This package contains kdebase, one of the basic packages of the K @@ -304,6 +305,7 @@ Group: System/GUI/KDE Requires: kdebase3 == %{version} Provides: kdebase3:/opt/kde3/bin/kicker +Recommends: kdebase3-ksysguardd == %{version} %description workspace This package contains the wrkspace components of kdebase3 like @@ -430,13 +432,13 @@ -------- The KDE Team <kde(a)kde.org> -%if %suse_version < 1031 %package ksysguardd License: GPLv2+ PreReq: %insserv_prereq %fillup_prereq aaa_base Summary: KDE base package: ksysguard daemon Group: System/GUI/KDE +Provides: kdebase4-workspace-ksysguardd %description ksysguardd This package contains the ksysguard daemon. It is needed for ksysguard. @@ -450,7 +452,6 @@ -------- The KDE Team <kde(a)kde.org> -%endif %package session License: GPLv2+ @@ -508,7 +509,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 575 +Release: 576 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -702,6 +703,7 @@ %patch239 %patch240 -p1 %patch241 -p0 +%patch242 -p0 rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png cp %SOURCE17 l10n/tw/flag.png @@ -792,13 +794,13 @@ ln -fs /opt/kde3/bin/startkde $RPM_BUILD_ROOT/usr/X11R6/bin/kde %endif ln -sf rcxdm ${RPM_BUILD_ROOT}/usr/sbin/rckdm -%if %suse_version > 1020 -rm ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd -rm ${RPM_BUILD_ROOT}/etc/ksysguarddrc -%else +#%if %suse_version > 1020 +#rm ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd +#rm ${RPM_BUILD_ROOT}/etc/ksysguarddrc +#%else mv ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd ${RPM_BUILD_ROOT}/usr/bin/ksysguardd ln -sf /usr/bin/ksysguardd ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd -%endif +#%endif install -d ${RPM_BUILD_ROOT}/opt/kde3/env %if %suse_version < 1001 install -m 0755 %SOURCE3 ${RPM_BUILD_ROOT}/opt/kde3/env @@ -812,16 +814,16 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/etc/init.d/ install -m 0644 %SOURCE9 ${RPM_BUILD_ROOT}/opt/kde3/share/apps/kdewizard/pics/wizard_small.png -%if %suse_version < 1031 +#%if %suse_version < 1031 install -m 0744 %SOURCE6 $RPM_BUILD_ROOT/etc/init.d/ksysguardd -%endif +#%endif mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/ ln -s ../pics/users/root1.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/root.face.icon ln -s ../pics/users/default2.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/.default.face.icon -%if %suse_version < 1031 +#%if %suse_version < 1031 ln -sf /etc/init.d/ksysguardd $RPM_BUILD_ROOT/usr/sbin/rcksysguardd install -D -m 644 %SOURCE15 $RPM_BUILD_ROOT/etc/slp.reg.d/ksysguardd.reg -%endif +#%endif # even if we use smbro install -D -m 644 kioslave/smb/smb-network.desktop $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/dirtree/remote/smb-network.desktop # @@ -1549,24 +1551,23 @@ /opt/kde3/%_lib/libtaskmanager.la /opt/kde3/%_lib/libkasbar.so /opt/kde3/%_lib/libkasbar.la -%if %suse_version < 1031 %files ksysguardd %defattr(-,root,root) %dir /etc/slp.reg.d -%if %suse_version < 1020 +#%if %suse_version < 1020 /usr/bin/ksysguardd /opt/kde3/bin/ksysguardd %config(noreplace) /etc/ksysguarddrc -%endif -%if %suse_version > 1030 -/usr/bin/ksysguardd -%config(noreplace) /etc/ksysguarddrc -%endif +#%endif +#%if %suse_version > 1030 +#/usr/bin/ksysguardd +#%config(noreplace) /etc/ksysguarddrc +#%endif /etc/init.d/ksysguardd /usr/sbin/rcksysguardd %config(noreplace) /etc/slp.reg.d/* -%endif + %if %suse_version > 1010 %if %suse_version < 1140 ++++++ ksysguardd.init ++++++ --- /var/tmp/diff_new_pack.ERepAY/_old 2010-11-02 16:12:48.000000000 +0100 +++ /var/tmp/diff_new_pack.ERepAY/_new 2010-11-02 16:12:48.000000000 +0100 @@ -10,8 +10,8 @@ ### BEGIN INIT INFO # Provides: ksysguardd # Required-Start: $time $named -# X-UnitedLinux-Should-Start: $syslog slpd -# Required-Stop: +# Should-Start: $syslog slpd +# Required-Stop: $null # Default-Start: 3 5 # Default-Stop: 0 1 2 4 6 # Description: remote monitor daemon for ksysguard ++++++ nsplugin-init-gtk.diff ++++++ --- nsplugins/viewer/nsplugin.h~ 2008-02-13 10:40:38.000000000 +0100 +++ nsplugins/viewer/nsplugin.h 2010-09-22 23:31:58.721961990 +0200 @@ -315,6 +315,10 @@ private: QPtrList<NSPluginInstance> _trash; QCString _app; + + // If plugins use gtk, we call the gtk_init function for them --- + // but only do it once. + static bool s_initedGTK; }; --- nsplugins/viewer/nsplugin.cpp~ 2008-02-13 10:40:38.000000000 +0100 +++ nsplugins/viewer/nsplugin.cpp 2010-09-22 23:31:58.775909705 +0200 @@ -1330,6 +1330,9 @@ DCOPRef NSPluginViewer::newClass( QStrin /****************************************************************************/ +bool NSPluginClass::s_initedGTK = false; + +typedef void gtkInitFunc(int *argc, char ***argv); NSPluginClass::NSPluginClass( const QString &library, QObject *parent, const char *name ) @@ -1377,6 +1380,23 @@ NSPluginClass::NSPluginClass( const QStr // initialize plugin kdDebug(1431) << "Plugin library " << library << " loaded!" << endl; + + // see if it uses gtk + if (!s_initedGTK) { + gtkInitFunc* gtkInit = (gtkInitFunc*)_handle->symbol("gtk_init"); + if (gtkInit) { + kdDebug(1431) << "Calling gtk_init for the plugin" << endl; + // Prevent gtk_init() from replacing the X error handlers, since the Gtk + // handlers abort when they receive an X error, thus killing the viewer. + int (*old_error_handler)(Display*,XErrorEvent*) = XSetErrorHandler(0); + int (*old_io_error_handler)(Display*) = XSetIOErrorHandler(0); + gtkInit(0, 0); + XSetErrorHandler(old_error_handler); + XSetIOErrorHandler(old_io_error_handler); + s_initedGTK = true; + } + } + _constructed = true; _error = initialize()!=NPERR_NO_ERROR; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tomcat6 for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package tomcat6 for openSUSE:Factory checked in at Tue Nov 2 16:12:21 CET 2010. -------- --- tomcat6/tomcat6.changes 2010-10-25 14:49:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomcat6/tomcat6.changes 2010-11-02 11:20:31.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Nov 2 10:19:13 UTC 2010 - mvyskocil(a)suse.cz + +- Fix bnc#650130 - Update of tomcat6 not possible (cpio: Is a directory) + * workaround the rpm bug - it cannot update directory to symlink + * make /etc/tomcat6/Catalina/ as ghost file + * create link in %posttrans + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.2xtX0s/_old 2010-11-02 16:10:49.000000000 +0100 +++ /var/tmp/diff_new_pack.2xtX0s/_new 2010-11-02 16:10:49.000000000 +0100 @@ -29,7 +29,7 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 7 +Release: 8 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: Apache Software License .. ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.2xtX0s/_old 2010-11-02 16:10:49.000000000 +0100 +++ /var/tmp/diff_new_pack.2xtX0s/_new 2010-11-02 16:10:49.000000000 +0100 @@ -41,7 +41,7 @@ Name: tomcat6 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1 +Release: 2 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: Apache Software License .. @@ -372,9 +372,7 @@ commons-dbcp-tomcat5 commons-pool-tomcat5 ecj %if %defined suse_version # bnc#424675 -%{__ln_s} %{cachedir}/Catalina ${RPM_BUILD_ROOT}/%{confdir} -%{__rm} -rf %{buildroot}/%{confdir}/Catalina -%{__ln_s} %{cachedir}/Catalina ${RPM_BUILD_ROOT}/%{confdir}/ +touch %{buildroot}/%{confdir}/Catalina # bnc#418664 install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/ echo "tomcat6/catalina-ant" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/catalina-ant @@ -429,6 +427,14 @@ /sbin/chkconfig --add %{name} %endif +%posttrans +#bnc#650130 workaround, the f*kin rpm cannot convert directory to a symlink during update +if [ ! -L %{confdir}/Catalina ]; then + %{__rm} -f %{confdir}/Catalina/Catalina + %{__rm} -rf %{confdir}/Catalina + %{__ln_s} %{cachedir}/Catalina %{confdir}/ +fi + %post el-1_0-api %{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000 %{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000 @@ -518,7 +524,8 @@ %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %endif %dir %{confdir} -%dir %{confdir}/Catalina +# % dir %{confdir}/Catalina +%ghost %{confdir}/Catalina %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties @@ -530,7 +537,7 @@ %if %{defined suse_version} %dir /srv/%{name} %{_sbindir}/rc%{name} -%{confdir}/Catalina +# % {confdir}/Catalina %endif # tomcat group writtable dirs - bnc#625415 %defattr(0664,root,tomcat,0775) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at Tue Nov 2 16:12:17 CET 2010. -------- --- xen/xen.changes 2010-10-20 23:11:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2010-10-29 18:37:28.000000000 +0200 @@ -1,0 +2,32 @@ +Wed Oct 27 20:08:51 CEST 2010 - ohering(a)suse.de + +- fate#310510 - fix xenpaging + xenpaging.doc.patch +- add /var/lib/xen/xenpaging directory + +------------------------------------------------------------------- +Wed Oct 27 18:04:30 CEST 2010 - ohering(a)suse.de + +- fate#310510 - fix xenpaging + xenpaging.memory_op.patch, correct delay handling in retry loop + +------------------------------------------------------------------- +Wed Oct 27 08:50:17 MDT 2010 - ksrinivasan(a)novell.com + +- Some cleanup in the APIC handling code in the HyperV shim. + hv_apic.patch + +------------------------------------------------------------------- +Wed Oct 27 03:56:38 EDT 2010 - cyliu(a)novell.com + +- bnc#640370 - VM graphic console in VNC is corrupted + xenfb_32bpp.patch + +------------------------------------------------------------------- +Fri Oct 22 13:34:54 CEST 2010 - ohering(a)suse.de + +- fate#310510 - fix xenpaging + xenpaging.autostart_delay.patch + delay start of xenpaging 7 seconds for smooth BIOS startup + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- hv_apic.patch xenfb_32bpp.patch xenpaging.doc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.yu65q0/_old 2010-11-02 16:10:36.000000000 +0100 +++ /var/tmp/diff_new_pack.yu65q0/_new 2010-11-02 16:10:36.000000000 +0100 @@ -67,7 +67,7 @@ BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif Version: 4.0.1_01 -Release: 1 +Release: 2 License: GPLv2+ Group: System/Kernel AutoReqProv: on @@ -229,6 +229,7 @@ Patch434: check_device_status.patch Patch435: change_home_server.patch Patch436: altgr_2.patch +Patch437: xenfb_32bpp.patch # Jim's domain lock patch Patch450: xend-domain-lock.patch # Hypervisor and PV driver Patches @@ -252,12 +253,15 @@ Patch701: hv_xen_base.patch Patch702: hv_xen_extension.patch Patch703: hv_win7_eoi_bug.patch +Patch704: hv_apic.patch # Build patch Patch999: tmp_build.patch # FATE 310510 Patch10001: xenpaging.tools_xenpaging_cleanup.patch Patch10002: xenpaging.pageout_policy.patch Patch10003: xenpaging.xs_daemon_close.patch +Patch10004: xenpaging.get_paged_frame.patch +Patch10005: xenpaging.makefile.patch Patch10010: xenpaging.policy_linear.patch Patch10011: xenpaging.pagefile.patch Patch10012: xenpaging.xenpaging_init.patch @@ -267,11 +271,10 @@ Patch10017: xenpaging.autostart.patch Patch10018: xenpaging.signal_handling.patch Patch10019: xenpaging.MRU_SIZE.patch -Patch10020: xenpaging.get_paged_frame.patch Patch10021: xenpaging.mem_event_check_ring-free_requests.patch Patch10022: xenpaging.blacklist.patch Patch10023: xenpaging.autostart_delay.patch -Patch10024: xenpaging.makefile.patch +Patch10040: xenpaging.doc.patch Url: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/ BuildRoot: %{_tmppath}/%{name}-%{version}-build #%define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") @@ -726,6 +729,7 @@ %patch434 -p1 %patch435 -p1 %patch436 -p1 +%patch437 -p1 %patch450 -p1 %patch500 -p1 %patch501 -p1 @@ -746,10 +750,13 @@ %patch701 -p1 %patch702 -p1 %patch703 -p1 +%patch704 -p1 %patch999 -p1 %patch10001 -p1 %patch10002 -p1 %patch10003 -p1 +%patch10004 -p1 +%patch10005 -p1 %patch10010 -p1 %patch10011 -p1 %patch10012 -p1 @@ -759,11 +766,10 @@ %patch10017 -p1 %patch10018 -p1 %patch10019 -p1 -%patch10020 -p1 %patch10021 -p1 %patch10022 -p1 %patch10023 -p1 -%patch10024 -p1 +%patch10040 -p1 %build XEN_EXTRAVERSION=%version-%release @@ -859,7 +865,7 @@ install -m 644 $name $RPM_BUILD_ROOT/%{_defaultdocdir}/xen/ done mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/xen/misc -for name in vtpm.txt crashdb.txt sedf_scheduler_mini-HOWTO.txt; do +for name in vtpm.txt crashdb.txt sedf_scheduler_mini-HOWTO.txt xenpaging.txt; do install -m 644 docs/misc/$name $RPM_BUILD_ROOT/%{_defaultdocdir}/xen/misc/ done # init scripts @@ -902,6 +908,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xend-db/domain mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xend-db/migrate mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xend-db/vnet +mkdir -p $RPM_BUILD_ROOT/var/lib/xen/xenpaging mkdir -p $RPM_BUILD_ROOT/var/log/xen ln -s /var/lib/xen/images $RPM_BUILD_ROOT/etc/xen/images # Bootloader @@ -1017,6 +1024,7 @@ %dir %attr(700,root,root) /var/lib/xen/images %dir %attr(700,root,root) /var/lib/xen/save %dir %attr(700,root,root) /var/lib/xen/dump +%dir %attr(700,root,root) /var/lib/xen/xenpaging %dir /var/lib/xen/xend-db %dir /var/lib/xen/xend-db/domain %dir /var/lib/xen/xend-db/migrate ++++++ hv_apic.patch ++++++ Cleanup some APIC handling code in the HyperV shim. Signed-off-by: K. Y. Srinivasan <ksrinivasan(a)novell.com> Index: xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c =================================================================== --- xen-4.0.1-testing.orig/xen/arch/x86/hvm/hyperv/hv_intercept.c 2010-10-04 14:04:46.000000000 -0600 +++ xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c 2010-10-04 18:30:42.000000000 -0600 @@ -252,71 +252,6 @@ hv_get_max_vcpus_supported(void) static inline void -hv_read_icr(u64 *icr_content) -{ - unsigned long icr_low, icr_high; - - icr_low = vlapic_mmio_handler.read_handler(current, - (vlapic_base_address(vcpu_vlapic(current)) + APIC_ICR), 4, &icr_low); - icr_high = vlapic_mmio_handler.read_handler(current, - (vlapic_base_address(vcpu_vlapic(current)) + APIC_ICR2), 4, &icr_high); - *icr_content = (((u64)icr_high<< 32) | icr_low); - -} - -static inline void -hv_read_tpr(u64 *tpr_content) -{ - - vlapic_mmio_handler.read_handler(current, - (vlapic_base_address(vcpu_vlapic(current)) + APIC_TASKPRI), - 4, (unsigned long *)&tpr_content); -} - -static inline void -hv_write_eoi(u64 msr_content) -{ - u32 eoi = (u32)msr_content; - - vlapic_mmio_handler.write_handler(current, - (vlapic_base_address(vcpu_vlapic(current)) + APIC_EOI), 4, eoi); - -} - -static inline void -hv_write_icr(u64 msr_content) -{ - u32 icr_low, icr_high; - icr_low = (u32)msr_content; - icr_high = (u32)(msr_content >> 32); - - if (icr_high != 0) - { - vlapic_mmio_handler.write_handler(current, - (vlapic_base_address(vcpu_vlapic(current)) + APIC_ICR2), 4, - icr_high); - } - if (icr_low != 0) - { - vlapic_mmio_handler.write_handler(current, - (vlapic_base_address(vcpu_vlapic(current)) + APIC_ICR), 4, - icr_low); - } - -} - -static inline void -hv_write_tpr(u64 msr_content) -{ - u32 tpr = (u32)msr_content; - - - vlapic_mmio_handler.write_handler(current, - (vlapic_base_address(vcpu_vlapic(current)) + APIC_TASKPRI), 4, tpr); - -} - -static inline void hv_hypercall_page_initialize(void *hypercall_page) { char *p; @@ -810,21 +745,14 @@ hyperv_do_rd_msr(uint32_t idx, struct cp regs->edx = (u32)(0x0); break; case HV_MSR_ICR: - if (!hv_privilege_check(curp, HV_ACCESS_APIC_MSRS)) { - goto msr_read_error; - } - hv_read_icr(&msr_content); + regs->eax = vlapic_get_reg(vcpu_vlapic(current), APIC_ICR); + regs->edx = vlapic_get_reg(vcpu_vlapic(current), APIC_ICR2); #ifdef HV_STATS cur_vcpu->stats.num_icr_reads++; #endif - regs->eax = (u32)(msr_content & 0xFFFFFFFF); - regs->edx = (u32)(msr_content >> 32); break; case HV_MSR_TPR: - if (!hv_privilege_check(curp, HV_ACCESS_APIC_MSRS)) { - goto msr_read_error; - } - hv_read_tpr(&msr_content); + msr_content = vlapic_get_reg(vcpu_vlapic(current), APIC_TASKPRI); #ifdef HV_STATS cur_vcpu->stats.num_tpr_reads++; #endif @@ -922,28 +850,30 @@ hyperv_do_wr_msr(uint32_t idx, struct cp goto msr_write_error; case HV_MSR_EOI: - if (!hv_privilege_check(curp, HV_ACCESS_APIC_MSRS)) { - goto msr_write_error; - } - hv_write_eoi(msr_content); + vlapic_EOI_set(vcpu_vlapic(current)); #ifdef HV_STATS cur_vcpu->stats.num_eoi_writes++; #endif break; - case HV_MSR_ICR: - if (!hv_privilege_check(curp, HV_ACCESS_APIC_MSRS)) { - goto msr_write_error; - } - hv_write_icr(msr_content); + case HV_MSR_ICR: { + u32 eax = (u32)msr_content; + u32 edx = (u32)(msr_content >> 32); + struct vlapic *vlapic = vcpu_vlapic(current); + eax &= ~(1 << 12); + edx &= 0xff000000; + vlapic_set_reg(vlapic, APIC_ICR2, edx); + if ( vlapic_ipi(vlapic, eax, edx) == X86EMUL_OKAY ) + vlapic_set_reg(vlapic, APIC_ICR, eax); + break; + } + #ifdef HV_STATS cur_vcpu->stats.num_icr_writes++; #endif break; case HV_MSR_TPR: - if (!hv_privilege_check(curp, HV_ACCESS_APIC_MSRS)) { - goto msr_write_error; - } - hv_write_tpr(msr_content); + vlapic_set_reg(vcpu_vlapic(current), APIC_TASKPRI, + (uint8_t)msr_content); #ifdef HV_STATS cur_vcpu->stats.num_tpr_writes++; #endif ++++++ xenfb_32bpp.patch ++++++ Fix problem that press CTRL+ALT+2 and then CTRL+ALT+1 back to VM graphic console, screen cannot be restored. xenfb_guest_copy only handles xenfb->depth=8 and 24 cases, because it assumes in xenfb->depth=16 or 32 cases, buffer is shared, like in xenfb_update ==> qemu_create_displaysurface_from() does. But as the mentioned bug, it didn't enter the xenfb_update do_resize hunk, buffer is not shared. To solve that problem, either make it enter the xenfb_update do_resize hunk, or change xenfb_guest_copy(), let it handle all cases. This patch is to let xenfb_guest_copy handle xenfb->depth=32 case. diff -r e4f337bb97f7 tools/ioemu-qemu-xen/hw/xenfb.c --- a/tools/ioemu-qemu-xen/hw/xenfb.c Wed Oct 20 19:39:28 2010 +0800 +++ b/tools/ioemu-qemu-xen/hw/xenfb.c Wed Oct 20 21:42:37 2010 +0800 @@ -612,6 +612,12 @@ uint8_t *data = ds_get_data(xenfb->c.ds); if (!is_buffer_shared(xenfb->c.ds->surface)) { + if (xenfb->depth == bpp) { + for (line = y; line < (y+h); line++) { + memcpy (data + (line * linesize) + (x * bpp / 8), xenfb->pixels + xenfb->offset + (line * xenfb->row_stride) + (x * xenfb->depth / 8), w * xenfb->depth / 8); + } + } + else{ switch (xenfb->depth) { case 8: if (bpp == 16) { @@ -631,9 +637,17 @@ oops = 1; } break; + case 32: + if (bpp == 16) { + BLT(uint32_t, uint16_t, 8, 8, 8, 5, 6, 5); + } else { + oops = 1; + } + break; default: oops = 1; } + } } if (oops) /* should not happen */ xen_be_printf(&xenfb->c.xendev, 0, "%s: oops: convert %d -> %d bpp?\n", ++++++ xenpaging.autostart_delay.patch ++++++ --- /var/tmp/diff_new_pack.yu65q0/_old 2010-11-02 16:10:38.000000000 +0100 +++ /var/tmp/diff_new_pack.yu65q0/_new 2010-11-02 16:10:38.000000000 +0100 @@ -24,7 +24,7 @@ + if self.xenpaging_delay == None: + log.warn("XXX creating /local/domain/0/xenpaging/%s" % self.vm.info['name_label']) + xstransact.Mkdir("/local/domain/0/xenpaging/%s" % self.vm.info['name_label']) -+ xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay', '0.0')) ++ xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay', '7.0')) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_inc', '0.1')) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_use', '5')) + xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_used', '0')) ++++++ xenpaging.doc.patch ++++++ Subject: xenpaging: (sparse) documenation Write up some sparse documentation about xenpaging usage. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- docs/misc/xenpaging.txt | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) --- /dev/null +++ xen-4.0.1-testing/docs/misc/xenpaging.txt @@ -0,0 +1,48 @@ +Warning: + +The xenpaging code is new and not fully debugged. +Usage of xenpaging can crash Xen or cause severe data corruption in the +guest memory and its filesystems! + +Description: + +xenpaging writes memory pages of a given guest to a file and moves the +pages back to the pool of available memory. Once the guests wants to +access the paged-out memory, the page is read from disk and placed into +memory. This allows the sum of all running guests to use more memory +than physically available on the host. + +Usage: + +Once the guest is running, run xenpaging with the guest_id and the +number of pages to page-out: + + chdir /var/lib/xen/xenpaging + xenpaging <guest_id> <number_of_pages> + +To obtain the guest_id, run 'xm list'. +xenpaging will write the pagefile to the current directory. +Example with 128MB pagefile on guest 1: + + xenpaging 1 32768 + +Caution: stopping xenpaging manually will cause the guest to stall or +crash because the paged-out memory is not written back into the guest! + +After a reboot of a guest, its guest_id changes, the current xenpaging +binary has no target anymore. To automate restarting of xenpaging after +guest reboot, specify the number if pages in the guest configuration +file /etc/xen/vm/<guest_name>: + +xenpaging=32768 + +Redo the guest with 'xm create /etc/xen/vm/<guest_name>' to activate the +changes. + + +Todo: +- implement stopping of xenpaging +- implement/test live migration + + +# vim: tw=72 ++++++ xenpaging.get_paged_frame.patch ++++++ --- /var/tmp/diff_new_pack.yu65q0/_old 2010-11-02 16:10:38.000000000 +0100 +++ /var/tmp/diff_new_pack.yu65q0/_new 2010-11-02 16:10:38.000000000 +0100 @@ -5,6 +5,8 @@ to indicate a retry of the hypercall is required. This fixes granttable errors when xenpaging is enabled in the guest. +(xen-unstable changeset: 22209:50c1cc209f8f) + Signed-off-by: Olaf Hering <olaf(a)aepfle.de> Already-Acked-by: Patrick Colp <pjcolp(a)cs.ubc.ca> Already-Acked-by: Keir Fraser <keir.fraser(a)citrix.com> ++++++ xenpaging.makefile.patch ++++++ --- /var/tmp/diff_new_pack.yu65q0/_old 2010-11-02 16:10:38.000000000 +0100 +++ /var/tmp/diff_new_pack.yu65q0/_new 2010-11-02 16:10:38.000000000 +0100 @@ -1,5 +1,9 @@ -Index: xen-4.0.1-testing/tools/xenpaging/Makefile -=================================================================== +(xen-unstable changeset: 21972:d3de6f484610) + +--- + tools/xenpaging/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- xen-4.0.1-testing.orig/tools/xenpaging/Makefile +++ xen-4.0.1-testing/tools/xenpaging/Makefile @@ -27,7 +27,7 @@ IBINS = xenpaging ++++++ xenpaging.memory_op.patch ++++++ --- /var/tmp/diff_new_pack.yu65q0/_old 2010-11-02 16:10:38.000000000 +0100 +++ /var/tmp/diff_new_pack.yu65q0/_new 2010-11-02 16:10:38.000000000 +0100 @@ -42,12 +42,12 @@ tools/firmware/hvmloader/hvmloader.c | 9 +++- tools/firmware/hvmloader/util.c | 26 +++++++++++- tools/include/Makefile | 1 - tools/ioemu-qemu-xen/hw/vga.c | 5 +- - tools/libxc/xc_domain.c | 71 +++++++++++++++++++++-------------- + tools/ioemu-qemu-xen/hw/vga.c | 5 +- + tools/libxc/xc_domain.c | 73 ++++++++++++++++++++++------------- xen/arch/x86/mm.c | 26 ++++++++++-- xen/arch/x86/mm/p2m.c | 7 +++ - xen/common/memory.c | 25 +++++++++++- - 8 files changed, 131 insertions(+), 39 deletions(-) + xen/common/memory.c | 25 +++++++++++ + 8 files changed, 133 insertions(+), 39 deletions(-) --- xen-4.0.1-testing.orig/tools/firmware/hvmloader/hvmloader.c +++ xen-4.0.1-testing/tools/firmware/hvmloader/hvmloader.c @@ -182,7 +182,7 @@ } --- xen-4.0.1-testing.orig/tools/libxc/xc_domain.c +++ xen-4.0.1-testing/tools/libxc/xc_domain.c -@@ -536,6 +536,44 @@ int xc_domain_get_tsc_info(int xc_handle +@@ -536,6 +536,46 @@ int xc_domain_get_tsc_info(int xc_handle return rc; } @@ -208,18 +208,20 @@ + + if ( err > count || err < 0 || delay > 1000 * 1000) + { -+ fprintf(stderr, "%s: %d err %x count %lx start %lx delay %lu/%lu\n",__func__,cmd,err,count,start,delay,delay/666); ++ fprintf(stderr, "%s: %d err %x count %lx start %lx delay %lu/%lu\n",__func__,cmd,err,count,start,delay,delay/(1<<15)); + err = -1; + break; + } + + if ( err ) ++ { + delay = 0; ++ start += err; ++ count -= err; ++ } + -+ start += err; -+ count -= err; + usleep(delay); -+ delay += 666; /* 1500 iterations, 12 seconds */ ++ delay += 1 << 15; /* 31 iterations, 15 seconds */ + } + + return err; @@ -227,7 +229,7 @@ int xc_domain_memory_increase_reservation(int xc_handle, uint32_t domid, -@@ -546,26 +584,18 @@ int xc_domain_memory_increase_reservatio +@@ -546,26 +586,18 @@ int xc_domain_memory_increase_reservatio { int err; struct xen_memory_reservation reservation = { @@ -256,7 +258,7 @@ } return err; -@@ -579,14 +609,11 @@ int xc_domain_memory_decrease_reservatio +@@ -579,14 +611,11 @@ int xc_domain_memory_decrease_reservatio { int err; struct xen_memory_reservation reservation = { @@ -271,7 +273,7 @@ if ( extent_start == NULL ) { DPRINTF("decrease_reservation extent_start is NULL!\n"); -@@ -594,16 +621,12 @@ int xc_domain_memory_decrease_reservatio +@@ -594,16 +623,12 @@ int xc_domain_memory_decrease_reservatio return -1; } @@ -290,7 +292,7 @@ } return err; -@@ -618,23 +641,17 @@ int xc_domain_memory_populate_physmap(in +@@ -618,23 +643,17 @@ int xc_domain_memory_populate_physmap(in { int err; struct xen_memory_reservation reservation = { ++++++ xenpaging.pageout_policy.patch ++++++ --- /var/tmp/diff_new_pack.yu65q0/_old 2010-11-02 16:10:38.000000000 +0100 +++ /var/tmp/diff_new_pack.yu65q0/_new 2010-11-02 16:10:38.000000000 +0100 @@ -5,6 +5,7 @@ (xenpaging internal) reference bit, instead of setting it and marking the page as gone. +(xen-unstable changeset: 22064:1bd1ba6f1aa4) Signed-off-by: Olaf Hering <olaf(a)aepfle.de> Already-Acked-by: Patrick Colp <pjcolp(a)cs.ubc.ca> ++++++ xenpaging.tools_xenpaging_cleanup.patch ++++++ --- /var/tmp/diff_new_pack.yu65q0/_old 2010-11-02 16:10:38.000000000 +0100 +++ /var/tmp/diff_new_pack.yu65q0/_new 2010-11-02 16:10:38.000000000 +0100 @@ -3,6 +3,7 @@ This isn't directly related to EPT checking, but does some general fix-ups to the xenpaging code (adds some extra frees, etc.) +(xen-unstable changeset: 21890:3263d0ff9476) Already-Signed-off-by: Patrick Colp <pjcolp(a)cs.ubc.ca> Signed-off-by: Olaf Hering <olaf(a)aepfle.de> ++++++ xenpaging.xs_daemon_close.patch ++++++ --- /var/tmp/diff_new_pack.yu65q0/_old 2010-11-02 16:10:38.000000000 +0100 +++ /var/tmp/diff_new_pack.yu65q0/_new 2010-11-02 16:10:38.000000000 +0100 @@ -1,4 +1,4 @@ -Subject: xenpaging: fix fd leak in xenstore +Subject: xenpaging/xenstore: fix fd leak in xenstore Missing from commit 'libxl: Backported stuff from unstable' Without this change, xs_daemon_open/xs_daemon_close will leak filedescriptors. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xsp for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package xsp for openSUSE:Factory checked in at Tue Nov 2 16:10:21 CET 2010. -------- --- xsp/xsp.changes 2010-04-28 01:03:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/xsp/xsp.changes 2010-10-12 19:49:09.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 12 17:48:43 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.8 + * http://www.go-mono.com/archive/2.8 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xsp-2.6.4.tar.bz2 New: ---- xsp-2.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsp.spec ++++++ --- /var/tmp/diff_new_pack.sMUsja/_old 2010-11-02 16:10:15.000000000 +0100 +++ /var/tmp/diff_new_pack.sMUsja/_new 2010-11-02 16:10:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xsp (Version 2.6.4) +# spec file for package xsp (Version 2.8) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,30 +23,14 @@ License: MIT Group: Productivity/Networking/Web/Servers AutoReqProv: on -Version: 2.6.4 +Version: 2.8 Release: 1 Summary: Small Web Server Hosting ASP.NET Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: mono-data-oracle mono-devel mono-jscript mono-nunit mono-web pkgconfig sqlite - -##### suse #### -%if 0%{?suse_version} -PreReq: %insserv_prereq %fillup_prereq -%define old_suse_buildrequires mono-data mono-winforms +BuildRequires: mono-data-oracle mono-data-sqlite mono-devel mono-nunit mono-web monodoc-core pkgconfig sqlite %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services -%if %suse_version == 1000 -BuildRequires: %{old_suse_buildrequires} -%endif -%if %sles_version == 9 -BuildRequires: %{old_suse_buildrequires} -%endif -%endif -# Fedora options (Bug in fedora images where 'abuild' user is the same id as 'nobody') -%if 0%{?fedora_version} || 0%{?rhel_version} -%define env_options export MONO_SHARED_DIR=/tmp -%endif %define xspConfigsLocation %{_sysconfdir}/xsp/2.0 %define xspAvailableApps %{xspConfigsLocation}/applications-available %define xspEnabledApps %{xspConfigsLocation}/applications-enabled @@ -57,9 +41,10 @@ %prep %setup -q +#%patch0 %build -%{?env_options} +#autoreconf -f -i -Wnone # Cannot use the configure macro because noarch-redhat-linux is not recognized by the auto tools in the tarball ./configure --prefix=%{_prefix} \ --libexecdir=%{_prefix}/lib \ @@ -70,7 +55,6 @@ make %install -%{?env_options} make install DESTDIR=%{buildroot} rm -rf %{buildroot}%{_prefix}/lib/xsp/unittests mkdir -p %{buildroot}%{_datadir} @@ -94,6 +78,7 @@ %clean rm -rf %{buildroot} + %if 0%{?suse_version} %post @@ -111,24 +96,24 @@ %defattr(-,root,root) %{_bindir}/* %{_datadir}/pkgconfig/* -%{_prefix}/share/man/*/* -%{_prefix}/lib/xsp -%{_prefix}/lib/mono/gac/Mono.WebServer -%{_prefix}/lib/mono/1.0/Mono.WebServer.dll -%{_prefix}/lib/mono/gac/Mono.WebServer2 %{_prefix}/lib/mono/2.0/Mono.WebServer2.dll -%{_prefix}/lib/mono/gac/xsp -%{_prefix}/lib/mono/1.0/xsp.exe -%{_prefix}/lib/mono/gac/xsp2 -%{_prefix}/lib/mono/2.0/xsp2.exe -%{_prefix}/lib/mono/gac/mod-mono-server -%{_prefix}/lib/mono/1.0/mod-mono-server.exe -%{_prefix}/lib/mono/gac/mod-mono-server2 +%{_prefix}/lib/mono/2.0/fastcgi-mono-server2.exe %{_prefix}/lib/mono/2.0/mod-mono-server2.exe -%{_prefix}/lib/mono/gac/fastcgi-mono-server -%{_prefix}/lib/mono/1.0/fastcgi-mono-server.exe +%{_prefix}/lib/mono/2.0/xsp2.exe +%{_prefix}/lib/mono/4.0/Mono.WebServer2.dll +%{_prefix}/lib/mono/4.0/fastcgi-mono-server4.exe +%{_prefix}/lib/mono/4.0/mod-mono-server4.exe +%{_prefix}/lib/mono/4.0/xsp4.exe +%{_prefix}/lib/mono/gac/Mono.WebServer2 %{_prefix}/lib/mono/gac/fastcgi-mono-server2 -%{_prefix}/lib/mono/2.0/fastcgi-mono-server2.exe +%{_prefix}/lib/mono/gac/fastcgi-mono-server4 +%{_prefix}/lib/mono/gac/mod-mono-server2 +%{_prefix}/lib/mono/gac/mod-mono-server4 +%{_prefix}/lib/mono/gac/xsp2 +%{_prefix}/lib/mono/gac/xsp4 +%{_prefix}/lib/monodoc/sources/Mono.WebServer.* +%{_prefix}/lib/xsp +%{_prefix}/share/man/*/* %if 0%{?suse_version} %config %{_fwdefdir}/xsp2 %config /etc/init.d/xsp2 @@ -139,6 +124,7 @@ %{_sysconfdir}/%{name} %endif %doc NEWS README + %if 0%{?fedora_version} || 0%{?rhel_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 ++++++ xsp-2.6.4.tar.bz2 -> xsp-2.8.tar.bz2 ++++++ ++++ 16877 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit device-mapper for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package device-mapper for openSUSE:Factory checked in at Tue Nov 2 16:10:10 CET 2010. -------- --- device-mapper/device-mapper.changes 2010-10-12 19:47:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/device-mapper/device-mapper.changes 2010-10-31 19:03:11.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 31 12:37:02 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- lvm2-clvm.changes: same change lvm2.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.4UVnRP/_old 2010-11-02 16:08:42.000000000 +0100 +++ /var/tmp/diff_new_pack.4UVnRP/_new 2010-11-02 16:08:42.000000000 +0100 @@ -27,7 +27,7 @@ %endif # Version: 1.02.49 -Release: 9 +Release: 10 Summary: Device Mapper Tools Source: LVM2.2.02.67.tgz Source1: boot.device-mapper @@ -85,7 +85,7 @@ --enable-udev_sync --enable-udev_rules --enable-compat \ --enable-pkgconfig --enable-realtime export SUSE_ASNEEDED=0 -make -j1 # symlinks are generated in parallel! %{?jobs:-j %jobs} +make -j1 # symlinks are generated in parallel! %{?_smp_mflags} %install #%makeinstall ++++++ lvm2-clvm.spec ++++++ --- /var/tmp/diff_new_pack.4UVnRP/_old 2010-11-02 16:08:42.000000000 +0100 +++ /var/tmp/diff_new_pack.4UVnRP/_new 2010-11-02 16:08:42.000000000 +0100 @@ -24,7 +24,7 @@ License: GPLv2+ ; LGPLv2.1+ Group: System/Base Version: 2.02.67 -Release: 7 +Release: 8 Requires: device-mapper >= 1.02.25 lvm2 = %{version} openais Provides: clvm PreReq: %fillup_prereq %insserv_prereq ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.4UVnRP/_old 2010-11-02 16:08:42.000000000 +0100 +++ /var/tmp/diff_new_pack.4UVnRP/_new 2010-11-02 16:08:42.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 2.02.67 -Release: 9 +Release: 10 Summary: LVM2 Tools Source: LVM2.%{version}.tgz Source1: lvm.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yasm for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '10

02 Nov '10

Hello community, here is the log from the commit of package yasm for openSUSE:Factory checked in at Tue Nov 2 16:10:02 CET 2010. -------- --- yasm/yasm.changes 2010-08-30 22:00:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/yasm/yasm.changes 2010-10-24 00:08:51.000000000 +0200 @@ -1,0 +2,31 @@ +Sun Oct 24 00:02:36 CEST 2010 - ro(a)suse.de + +- update to 1.1.0 + * Fix a number of issues with Win32 SAFESEH support (#139). + * Fix several 32-bit Mach-O (macho32) bugs (#212 and others). + * Add Intel post-32nm instructions (section 7 of AVX spec). + * Add XSAVEOPT, INVEPT, INVVPID, and GETSEC instructions (#211). + * Remove AMD CVT16 instructions. + * Don't emit unnecessary REX.W for pinsrw instruction (#207). + * Update gettext to 0.17 (#206). +- update to 1.0.1 + * Fix ELF32 shared object relocations (#202). + * Ignore [warning] directive (#201). +- update to 1.0.0 + * Add GAS preprocessor (fixes #79). + * Add Visual Studio 2010 special frontend, vsyasm + * Add support for AMD XOP, FMA4, and CVT16 instructions + (replacing SSE5). + * Add support for %scope and %endscope NASM macros + * Add support for %{x:y} parameter list expansion + in NASM preprocessor + * Fix _GLOBAL_OFFSET_TABLE_ + * Add support for ELF64 PC-relative relocations and latest ELF32 + relocation types. + * Add support for ELF tlsdesc, tlscall, pltoff, gotplt, gotoff + special symbols. + * NASM preprocessor license has been changed to 2-clause BSD. + * Various bugfixes in TASM syntax support. + * Many other bugfixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yasm-0.8.0.tar.bz2 New: ---- yasm-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yasm.spec ++++++ --- /var/tmp/diff_new_pack.ELjWPK/_old 2010-11-02 16:08:50.000000000 +0100 +++ /var/tmp/diff_new_pack.ELjWPK/_new 2010-11-02 16:08:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yasm (Version 0.8.0) +# spec file for package yasm (Version 1.1.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ License: BSD3c Group: Development/Languages/Other AutoReqProv: on -Version: 0.8.0 -Release: 6 +Version: 1.1.0 +Release: 1 Summary: A complete rewrite of the NASM assembler Source: yasm-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yasm-0.8.0.tar.bz2 -> yasm-1.1.0.tar.bz2 ++++++ ++++ 68176 lines of diff (skipped) ++++++ yasm-no-build-date.patch ++++++ --- /var/tmp/diff_new_pack.ELjWPK/_old 2010-11-02 16:08:51.000000000 +0100 +++ /var/tmp/diff_new_pack.ELjWPK/_new 2010-11-02 16:08:51.000000000 +0100 @@ -1,24 +1,22 @@ Index: frontends/tasm/tasm.c -=================================================================== ---- frontends/tasm/tasm.c.orig 2009-04-10 02:06:54.000000000 -0400 -+++ frontends/tasm/tasm.c 2010-08-30 15:50:10.471990965 -0400 -@@ -225,7 +225,6 @@ static opt_option options[] = +================================================================================ +--- frontends/tasm/tasm.c ++++ frontends/tasm/tasm.c +@@ -225,7 +225,6 @@ /* version message */ /*@observer@*/ static const char *version_msg[] = { PACKAGE_NAME " " PACKAGE_INTVER "." PACKAGE_BUILD, - "Compiled on " __DATE__ ".", - "Copyright (c) 2001-2008 Peter Johnson and other Yasm developers.", + "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.", "Run yasm --license for licensing overview and summary." }; -Index: frontends/yasm/yasm.c -=================================================================== ---- frontends/yasm/yasm.c.orig 2009-04-10 02:06:55.000000000 -0400 -+++ frontends/yasm/yasm.c 2010-08-30 15:49:51.865829058 -0400 -@@ -214,7 +214,6 @@ static opt_option options[] = +--- frontends/yasm/yasm.c ++++ frontends/yasm/yasm.c +@@ -214,7 +214,6 @@ /* version message */ /*@observer@*/ static const char *version_msg[] = { PACKAGE_NAME " " PACKAGE_INTVER "." PACKAGE_BUILD, - "Compiled on " __DATE__ ".", - "Copyright (c) 2001-2008 Peter Johnson and other Yasm developers.", + "Copyright (c) 2001-2010 Peter Johnson and other Yasm developers.", "Run yasm --license for licensing overview and summary." }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0