openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2010
- 1 participants
- 1093 discussions
Hello community,
here is the log from the commit of package python-cups for openSUSE:Factory
checked in at Mon Mar 22 17:09:30 CET 2010.
--------
--- python-cups/python-cups.changes 2010-02-13 15:35:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/python-cups/python-cups.changes 2010-03-22 14:37:02.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 22 14:35:09 CET 2010 - vuntz(a)opensuse.org
+
+- Update to version 1.9.49:
+ + Fix rh#567386.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
pycups-1.9.48.tar.bz2
New:
----
pycups-1.9.49.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cups.spec ++++++
--- /var/tmp/diff_new_pack.f7PjFY/_old 2010-03-22 17:09:14.000000000 +0100
+++ /var/tmp/diff_new_pack.f7PjFY/_new 2010-03-22 17:09:14.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package python-cups (Version 1.9.48)
+# spec file for package python-cups (Version 1.9.49)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: python-cups
BuildRequires: cups-devel python-devel
-Version: 1.9.48
+Version: 1.9.49
Release: 1
Group: Development/Libraries/Python
License: GPLv2+
++++++ pycups-1.9.48.tar.bz2 -> pycups-1.9.49.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.48/ChangeLog new/pycups-1.9.49/ChangeLog
--- old/pycups-1.9.48/ChangeLog 2010-01-06 13:55:23.000000000 +0100
+++ new/pycups-1.9.49/ChangeLog 2010-02-23 17:30:02.000000000 +0100
@@ -1,3 +1,8 @@
+2010-02-23 Tim Waugh <twaugh(a)redhat.com>
+
+ * cupsconnection.c (Connection_dealloc): Be more cautious when
+ removing the Connection object from the list (bug #567386).
+
2010-01-06 Tim Waugh <twaugh(a)redhat.com>
* cupsipp.c (IPPRequest_getAttributes): Continue to next
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.48/Makefile new/pycups-1.9.49/Makefile
--- old/pycups-1.9.48/Makefile 2010-01-19 13:34:47.000000000 +0100
+++ new/pycups-1.9.49/Makefile 2010-03-10 10:45:10.000000000 +0100
@@ -1,5 +1,5 @@
NAME=pycups
-VERSION=1.9.48
+VERSION=1.9.49
SOURCES=cupsmodule.c cupsconnection.c cupsppd.c cupsipp.c setup.py \
cupsppd.h cupsipp.h cupsconnection.h cupsmodule.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pycups-1.9.48/cupsconnection.c new/pycups-1.9.49/cupsconnection.c
--- old/pycups-1.9.48/cupsconnection.c 2010-01-14 14:22:03.000000000 +0100
+++ new/pycups-1.9.49/cupsconnection.c 2010-02-24 16:07:28.000000000 +0100
@@ -231,37 +231,43 @@
{
int i, j;
- if (NumConnections > 1)
- {
- Connection **new_array = calloc (NumConnections - 1,
- sizeof (Connection *));
+ for (j = 0; j < NumConnections; j++)
+ if (Connections[j] == self)
+ break;
- for (i = 0, j = 0; i < NumConnections; i++)
+ if (j < NumConnections)
+ {
+ if (NumConnections > 1)
{
- if (Connections[i] == self)
+ Connection **new_array = calloc (NumConnections - 1,
+ sizeof (Connection *));
+
+ if (new_array)
{
- if (!new_array)
- Connections[i] = NULL;
+ int k;
+ for (i = 0, k = 0; i < NumConnections; i++)
+ {
+ if (i == j)
+ continue;
- continue;
- }
+ new_array[k++] = Connections[i];
+ }
- if (new_array)
- new_array[j++] = Connections[i];
+ free (Connections);
+ Connections = new_array;
+ NumConnections--;
+ } else
+ /* Failed to allocate memory. Just clear out the reference. */
+ Connections[j] = NULL;
}
-
- if (new_array) {
+ else
+ {
+ /* The only element is the one we no longer need. */
free (Connections);
- Connections = new_array;
- NumConnections--;
+ Connections = NULL;
+ NumConnections = 0;
}
}
- else
- {
- free (Connections);
- Connections = NULL;
- NumConnections = 0;
- }
if (self->http) {
debugprintf ("httpClose()\n");
@@ -3432,6 +3438,7 @@
if (UTF8_from_PyObj (&printer, printerobj) == NULL)
return NULL;
+ debugprintf ("-> Connection_getPPD()\n");
Connection_begin_allow_threads (self);
ppdfile = cupsGetPPD2 (self->http, printer);
Connection_end_allow_threads (self);
@@ -3443,10 +3450,12 @@
else
PyErr_SetString (PyExc_RuntimeError, "cupsGetPPD2 failed");
+ debugprintf ("<- Connection_getPPD() (error)\n");
return NULL;
}
ret = PyString_FromString (ppdfile);
+ debugprintf ("<- Connection_getPPD() = %s\n", ppdfile);
return ret;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package preload for openSUSE:Factory
checked in at Mon Mar 22 17:09:01 CET 2010.
--------
--- preload/preload.changes 2010-03-15 16:48:59.000000000 +0100
+++ /mounts/work_src_done/STABLE/preload/preload.changes 2010-03-22 12:38:46.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Mar 22 11:38:33 UTC 2010 - coolo(a)novell.com
+
+- disable preload if /usr is on an extra partition
+
+-------------------------------------------------------------------
+Mon Mar 22 11:25:27 UTC 2010 - coolo(a)novell.com
+
+- mls does not like the supplements and they are
+ not necessary (bnc#589431)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ preload.spec ++++++
--- /var/tmp/diff_new_pack.S9H2WX/_old 2010-03-22 17:08:41.000000000 +0100
+++ /var/tmp/diff_new_pack.S9H2WX/_new 2010-03-22 17:08:41.000000000 +0100
@@ -20,7 +20,7 @@
Name: preload
Version: 1.1
-Release: 11
+Release: 12
Summary: Preloads Files into System Cache for Faster Booting
License: GPLv2+
Group: System/Boot
@@ -39,7 +39,7 @@
BuildRequires: kernel-desktop kernel-desktop-base-debuginfo kernel-desktop-debuginfo kernel-desktop-devel-debuginfo
ExclusiveArch: %ix86 x86_64
Recommends: preload-kmp systemtap-runtime
-%suse_kernel_module_package -p %_sourcedir/preamble kdump um debug trace xen vim pae
+#%suse_kernel_module_package -p %_sourcedir/preamble kdump um debug trace xen vim pae
%description
Preload lists files to load into the system cache. This shortens system
++++++ fixfactory.diff ++++++
--- /var/tmp/diff_new_pack.S9H2WX/_old 2010-03-22 17:08:41.000000000 +0100
+++ /var/tmp/diff_new_pack.S9H2WX/_new 2010-03-22 17:08:41.000000000 +0100
@@ -1,7 +1,7 @@
Index: preload/stap/preloadtrace.stp
===================================================================
--- preload.orig/stap/preloadtrace.stp 2009-08-13 08:56:09.000000000 +0200
-+++ preload/stap/preloadtrace.stp 2010-03-15 16:45:27.000000000 +0100
++++ preload/stap/preloadtrace.stp 2010-03-22 12:36:08.000000000 +0100
@@ -99,11 +99,7 @@ probe syscall.fchdir.return {
println(process_indent() . sprintf("fchdir %d", $fd ))
}
@@ -15,3 +15,25 @@
# print(process_indent() . " mmap " . sprintf("%d", $fd) . "\n")
if ($fd >= 0 && $fd < 66000 && readfrom[pid(), $fd] == 1 && fdstoignore[pid(), $fd] != 1 ) {
println(process_indent() . sprintf("read %d", $fd))
+Index: preload/init.startpreload
+===================================================================
+--- preload.orig/init.startpreload 2009-05-06 13:41:33.000000000 +0200
++++ preload/init.startpreload 2010-03-22 12:38:20.000000000 +0100
+@@ -30,14 +30,14 @@ case "$1" in
+ ;;
+ esac
+ done
+- if test "$preload" = 1; then
+- cmd=staprun
++ if test "$preload" = 1 -a -e /usr/bin/staprun; then
++ cmd=/usr/bin/staprun
+ case "$preloadlog" in
+ /dev/null)
+ cmd=
+ ;;
+ /dev/tty*)
+- cmd="staprun -b 40"
++ cmd="/usr/bin/staprun -b 40"
+ ;;
+ esac
+ if test -n "$cmd"; then
++++++ preamble ++++++
--- /var/tmp/diff_new_pack.S9H2WX/_old 2010-03-22 17:08:42.000000000 +0100
+++ /var/tmp/diff_new_pack.S9H2WX/_new 2010-03-22 17:08:42.000000000 +0100
@@ -1,4 +1,3 @@
Enhances: kernel-%1
-Supplements: packageand(kernel-%1:preload)
Requires: kernel-%1 = %(echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' kernel-%1`)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package pcmanfm for openSUSE:Factory
checked in at Mon Mar 22 17:08:29 CET 2010.
--------
--- pcmanfm/pcmanfm.changes 2010-03-18 22:51:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/pcmanfm/pcmanfm.changes 2010-03-22 09:51:51.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 22 08:52:05 UTC 2010 - andrea(a)opensuse.org
+
+- added polkit-gnome as runtime dependencie to allow automount
+ to work properly
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcmanfm.spec ++++++
--- /var/tmp/diff_new_pack.RbpLwV/_old 2010-03-22 17:08:05.000000000 +0100
+++ /var/tmp/diff_new_pack.RbpLwV/_new 2010-03-22 17:08:05.000000000 +0100
@@ -21,7 +21,7 @@
Name: pcmanfm
Summary: The next generation LXDE file manager
Version: 0.9.3beta+git20100317
-Release: 1
+Release: 2
License: GPLv2
Group: Productivity/File utilities
Url: http://www.lxde.org/
@@ -34,9 +34,13 @@
BuildRequires: autoconf automake desktop-file-utils gcc gcc-c++
BuildRequires: fdupes gtk2-devel intltool make menu-cache-devel pkg-config
BuildRequires: libfm-devel update-desktop-files
-Requires: gvfs gvfs-backends
Requires: libfm
+# needed for trash
+Requires: gvfs gvfs-backends
+# needed to switch to root
Requires: xdg-utils
+# needed to mount devices
+Requires: polkit-gnome
Recommends: %name-lang
Conflicts: pcmanfm-legacy
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package pam_krb5 for openSUSE:Factory
checked in at Mon Mar 22 17:07:55 CET 2010.
--------
--- pam_krb5/pam_krb5.changes 2010-03-04 12:25:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/pam_krb5/pam_krb5.changes 2010-03-22 12:04:22.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Mar 22 12:03:20 CET 2010 - mc(a)suse.de
+
+- update to version 2.3.11
+ * create credentials before trying to look up the location of
+ the user's home directory via krb5_kuserok()
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
pam_krb5-2.3.10-3.tar.bz2
New:
----
pam_krb5-2.3.11-1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam_krb5.spec ++++++
--- /var/tmp/diff_new_pack.xnhKJR/_old 2010-03-22 17:07:48.000000000 +0100
+++ /var/tmp/diff_new_pack.xnhKJR/_new 2010-03-22 17:07:48.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package pam_krb5 (Version 2.3.10)
+# spec file for package pam_krb5 (Version 2.3.11)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Name: pam_krb5
BuildRequires: krb5-client krb5-devel krb5-server openssl-devel pam-devel
-%define PAM_RELEASE 3
+%define PAM_RELEASE 1
License: BSD3c(or similar) ; LGPLv2.0+
Group: Productivity/Networking/Security
Provides: pam_krb
@@ -30,7 +30,7 @@
Obsoletes: pam_krb5-64bit
%endif
#
-Version: 2.3.10
+Version: 2.3.11
Release: 1
Summary: PAM Module for Kerberos Authentication
Url: http://sourceforge.net/projects/pam-krb5/
++++++ pam_krb5-2.3.10-3.tar.bz2 -> pam_krb5-2.3.11-1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/ChangeLog new/pam_krb5-2.3.11-1/ChangeLog
--- old/pam_krb5-2.3.10-3/ChangeLog 2010-03-01 14:31:21.000000000 +0100
+++ new/pam_krb5-2.3.11-1/ChangeLog 2010-03-18 12:33:19.000000000 +0100
@@ -1,3 +1,6 @@
+2010-03-08
+ * krb5.spec,configure.ac: 2.3.11
+
2010-02-24
* src/v5.c,v5.h: add wrapper functions for reading a cred keyblock as
a keyblock (v5_creds_get_key) and a ticket's client
@@ -11,7 +14,7 @@
* src/kuserok.c(_pam_krb5_kuserok): also set up the user's ccache,
in case there's a process on the box that expects the user to have
creds before it can look up the location of the user's .k5login file
- or read from it (possible fix for #563442)
+ or read from it (#563442)
* src/harness.c: fix --debug
* src/kuserok.c,src/storetmp.c: don't close stdio on our helpers if
we don't need to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/NEWS new/pam_krb5-2.3.11-1/NEWS
--- old/pam_krb5-2.3.10-3/NEWS 2010-01-07 17:46:57.000000000 +0100
+++ new/pam_krb5-2.3.11-1/NEWS 2010-03-18 12:33:19.000000000 +0100
@@ -1,3 +1,5 @@
+- 2.3.11:* create credentials before trying to look up the location of the
+ user's home directory via krb5_kuserok()
- 2.3.10:* fine-tune the logic for selecting which key we use for validating
credentials
- 2.3.9: * add a "multiple_ccaches" option to allow forcing the previous
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/configure new/pam_krb5-2.3.11-1/configure
--- old/pam_krb5-2.3.10-3/configure 2010-03-04 12:19:00.000000000 +0100
+++ new/pam_krb5-2.3.11-1/configure 2010-03-22 12:00:32.000000000 +0100
@@ -2621,7 +2621,7 @@
# Define the identity of the package.
PACKAGE=pam_krb5
- VERSION=2.3.10
+ VERSION=2.3.11
cat >>confdefs.h <<_ACEOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/configure.ac new/pam_krb5-2.3.11-1/configure.ac
--- old/pam_krb5-2.3.10-3/configure.ac 2010-03-01 14:31:21.000000000 +0100
+++ new/pam_krb5-2.3.11-1/configure.ac 2010-03-18 12:33:19.000000000 +0100
@@ -1,6 +1,6 @@
AC_INIT(configure.ac)
AC_PREREQ(2.59)
-AM_INIT_AUTOMAKE(pam_krb5,2.3.10)
+AM_INIT_AUTOMAKE(pam_krb5,2.3.11)
AC_LANG_C
AC_PROG_CC
AC_DISABLE_STATIC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/pam_krb5.spec new/pam_krb5-2.3.11-1/pam_krb5.spec
--- old/pam_krb5-2.3.10-3/pam_krb5.spec 2010-01-21 09:49:08.000000000 +0100
+++ new/pam_krb5-2.3.11-1/pam_krb5.spec 2010-03-18 12:33:19.000000000 +0100
@@ -1,7 +1,7 @@
Summary: A Pluggable Authentication Module for Kerberos 5
Name: pam_krb5
-Version: 2.3.10
-Release: 3%{?dist}
+Version: 2.3.11
+Release: 1%{?dist}
Source0: https://fedorahosted.org/released/pam_krb5/pam_krb5-%{version}-1.tar.gz
License: BSD or LGPLv2+
Group: System Environment/Base
@@ -51,6 +51,11 @@
%doc README* COPYING* ChangeLog NEWS
%changelog
+* Mon Mar 8 2010 Nalin Dahyabhai <nalin(a)redhat.com> - 2.3.11-1
+- create creds before calling krb5_kuserok() so that they're available when
+ it goes to look up the target user's home directory (#563442)
+- collapse multiple levels of debugging into a single debug level (#157107)
+
* Mon Jan 18 2010 Nalin Dahyabhai <nalin(a)redhat.com> - 2.3.10-3
- tweak buildroot location (guidelines)
Files old/pam_krb5-2.3.10-3/po/ca.gmo and new/pam_krb5-2.3.11-1/po/ca.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/ca.po new/pam_krb5-2.3.11-1/po/ca.po
--- old/pam_krb5-2.3.10-3/po/ca.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/ca.po 2010-03-18 12:33:19.000000000 +0100
@@ -20,7 +20,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-10-18 12:12+0200\n"
"Last-Translator: Xavier Conde Rueda <xavi.conde(a)gmail.com>\n"
"Language-Team: Catalan <fedora(a)softcatala.net>\n"
Files old/pam_krb5-2.3.10-3/po/cs.gmo and new/pam_krb5-2.3.11-1/po/cs.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/cs.po new/pam_krb5-2.3.11-1/po/cs.po
--- old/pam_krb5-2.3.10-3/po/cs.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/cs.po 2010-03-18 12:33:19.000000000 +0100
@@ -9,7 +9,7 @@
"Project-Id-Version: system-config-firewall.master\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2009-09-12 13:21+0100\n"
"Last-Translator: Dusan Hokuv <dusan(a)mirc.cz>\n"
"Language-Team: Czech <fedora-cs-list(a)redhat.com>\n"
Files old/pam_krb5-2.3.10-3/po/de.gmo and new/pam_krb5-2.3.11-1/po/de.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/de.po new/pam_krb5-2.3.11-1/po/de.po
--- old/pam_krb5-2.3.10-3/po/de.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/de.po 2010-03-18 12:33:19.000000000 +0100
@@ -9,7 +9,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-03-13 16:08+0000\n"
"Last-Translator: Michael Calmer <mc(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
Files old/pam_krb5-2.3.10-3/po/el.gmo and new/pam_krb5-2.3.11-1/po/el.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/el.po new/pam_krb5-2.3.11-1/po/el.po
--- old/pam_krb5-2.3.10-3/po/el.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/el.po 2010-03-18 12:33:19.000000000 +0100
@@ -9,7 +9,7 @@
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-04-10 22:03+0300\n"
"Last-Translator: Dimitris Glezos <dimitris(a)glezos.com>\n"
"Language-Team: Greek Fedora team <fedora-trans-el(a)redhat.com>\n"
Files old/pam_krb5-2.3.10-3/po/es.gmo and new/pam_krb5-2.3.11-1/po/es.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/es.po new/pam_krb5-2.3.11-1/po/es.po
--- old/pam_krb5-2.3.10-3/po/es.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/es.po 2010-03-18 12:33:19.000000000 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-12-14 11:26-0200\n"
"Last-Translator: H. Daniel Cabrera <h.daniel.cabrera(a)gmail.com>\n"
"Language-Team: Spanish <es(a)li.org>\n"
Files old/pam_krb5-2.3.10-3/po/fa.gmo and new/pam_krb5-2.3.11-1/po/fa.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/fa.po new/pam_krb5-2.3.11-1/po/fa.po
--- old/pam_krb5-2.3.10-3/po/fa.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/fa.po 2010-03-18 12:33:19.000000000 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2009-03-15 22:59+0330\n"
"Last-Translator: Mohsen Saeedi <mohsen.saeedi(a)gmail.com>\n"
"Language-Team: Persian <mohsen.saeedi(a)gmail.com>\n"
Files old/pam_krb5-2.3.10-3/po/fr.gmo and new/pam_krb5-2.3.11-1/po/fr.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/fr.po new/pam_krb5-2.3.11-1/po/fr.po
--- old/pam_krb5-2.3.10-3/po/fr.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/fr.po 2010-03-18 12:33:19.000000000 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: pam_krb5 2.3.2\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2009-04-12 13:01+0200\n"
"Last-Translator: Pablo Martin-Gomez <pablo.mrtin-gomez(a)laposte.net>\n"
"Language-Team: Français <fedora-trans-fr(a)redhat.com>\n"
Files old/pam_krb5-2.3.10-3/po/hu.gmo and new/pam_krb5-2.3.11-1/po/hu.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/hu.po new/pam_krb5-2.3.11-1/po/hu.po
--- old/pam_krb5-2.3.10-3/po/hu.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/hu.po 2010-03-18 12:33:19.000000000 +0100
@@ -3,7 +3,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-04-30 07:23+0100\n"
"Last-Translator: Sulyok Péter <peti(a)sulyok.hu>\n"
"Language-Team: Hungarian <fedora-trans-hu(a)redhat.com>\n"
Files old/pam_krb5-2.3.10-3/po/it.gmo and new/pam_krb5-2.3.11-1/po/it.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/it.po new/pam_krb5-2.3.11-1/po/it.po
--- old/pam_krb5-2.3.10-3/po/it.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/it.po 2010-03-18 12:33:19.000000000 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-04-16 20:38+0200\n"
"Last-Translator: Francesco Tombolini <tombo(a)adamantio.net>\n"
"Language-Team: Italiano <fedora-trans-it(a)redhat.com>\n"
Files old/pam_krb5-2.3.10-3/po/ms.gmo and new/pam_krb5-2.3.11-1/po/ms.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/ms.po new/pam_krb5-2.3.11-1/po/ms.po
--- old/pam_krb5-2.3.10-3/po/ms.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/ms.po 2010-03-18 12:33:19.000000000 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-10-29 22:02+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman(a)myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms(a)lists.sourceforge.net>\n"
Files old/pam_krb5-2.3.10-3/po/nl.gmo and new/pam_krb5-2.3.11-1/po/nl.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/nl.po new/pam_krb5-2.3.11-1/po/nl.po
--- old/pam_krb5-2.3.10-3/po/nl.po 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/nl.po 2010-03-18 12:33:19.000000000 +0100
@@ -9,7 +9,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-09-04 23:14+0200\n"
"Last-Translator: Peter van Egdom <p.van.egdom(a)gmail.com>\n"
"Language-Team: Dutch <fedora-trans-list(a)redhat.com>\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/pam_krb5.pot new/pam_krb5-2.3.11-1/po/pam_krb5.pot
--- old/pam_krb5-2.3.10-3/po/pam_krb5.pot 2010-03-04 12:19:24.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/pam_krb5.pot 2010-03-18 12:33:19.000000000 +0100
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: pam_krb5 2.3.10\n"
+"Project-Id-Version: pam_krb5 2.3.11\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
Files old/pam_krb5-2.3.10-3/po/pl.gmo and new/pam_krb5-2.3.11-1/po/pl.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/pl.po new/pam_krb5-2.3.11-1/po/pl.po
--- old/pam_krb5-2.3.10-3/po/pl.po 2010-03-04 12:19:25.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/pl.po 2010-03-18 12:33:19.000000000 +0100
@@ -6,7 +6,7 @@
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2009-09-26 12:32+0200\n"
"Last-Translator: Piotr Drąg <piotrdrag(a)gmail.com>\n"
"Language-Team: Polish <fedora-trans-pl(a)redhat.com>\n"
Files old/pam_krb5-2.3.10-3/po/pt_BR.gmo and new/pam_krb5-2.3.11-1/po/pt_BR.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/pt_BR.po new/pam_krb5-2.3.11-1/po/pt_BR.po
--- old/pam_krb5-2.3.10-3/po/pt_BR.po 2010-03-04 12:19:25.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/pt_BR.po 2010-03-18 12:33:19.000000000 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-07-17 22:52-0300\n"
"Last-Translator: Taylon Silmer <taylonsilva(a)gmail.com>\n"
"Language-Team: Brazilian Portuguese <fedora-trans-pt_br(a)redhat.com>\n"
Files old/pam_krb5-2.3.10-3/po/ro.gmo and new/pam_krb5-2.3.11-1/po/ro.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/ro.po new/pam_krb5-2.3.11-1/po/ro.po
--- old/pam_krb5-2.3.10-3/po/ro.po 2010-03-04 12:19:25.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/ro.po 2010-03-18 12:33:19.000000000 +0100
@@ -9,7 +9,7 @@
"Project-Id-Version: Pam_krbr5 VERSION\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2009-02-22 22:41+0200\n"
"Last-Translator: Florin Dăscălache <floda61(a)yahoo.com>\n"
"Language-Team: Romanian <gnomero-list(a)lists.sourceforge.net>\n"
Files old/pam_krb5-2.3.10-3/po/sr.gmo and new/pam_krb5-2.3.11-1/po/sr.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/sr.po new/pam_krb5-2.3.11-1/po/sr.po
--- old/pam_krb5-2.3.10-3/po/sr.po 2010-03-04 12:19:25.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/sr.po 2010-03-18 12:33:19.000000000 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-04-12 19:23+0100\n"
"Last-Translator: Miloš Komarčević <kmilos(a)gmial.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr(a)redhat.com>\n"
Files old/pam_krb5-2.3.10-3/po/sr(a)latin.gmo and new/pam_krb5-2.3.11-1/po/sr(a)latin.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/sr(a)latin.po new/pam_krb5-2.3.11-1/po/sr(a)latin.po
--- old/pam_krb5-2.3.10-3/po/sr(a)latin.po 2010-03-04 12:19:25.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/sr(a)latin.po 2010-03-18 12:33:19.000000000 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-04-12 19:23+0100\n"
"Last-Translator: Miloš Komarčević <kmilos(a)gmial.com>\n"
"Language-Team: Serbian (sr) <fedora-trans-sr(a)redhat.com>\n"
Files old/pam_krb5-2.3.10-3/po/sv.gmo and new/pam_krb5-2.3.11-1/po/sv.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pam_krb5-2.3.10-3/po/sv.po new/pam_krb5-2.3.11-1/po/sv.po
--- old/pam_krb5-2.3.10-3/po/sv.po 2010-03-04 12:19:25.000000000 +0100
+++ new/pam_krb5-2.3.11-1/po/sv.po 2010-03-18 12:33:19.000000000 +0100
@@ -8,7 +8,7 @@
"Project-Id-Version: pam_krb5\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2010-03-04 12:19+0100\n"
+"POT-Creation-Date: 2010-03-08 16:08-0500\n"
"PO-Revision-Date: 2008-10-22 18:04+0100\n"
"Last-Translator: Daniel Nylander <po(a)danielnylander.se>\n"
"Language-Team: Swedish <tp-sv(a)listor.tp-sv.se>\n"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory
checked in at Mon Mar 22 17:06:02 CET 2010.
--------
--- libvirt/libvirt.changes 2010-02-22 19:06:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/libvirt/libvirt.changes 2010-03-22 05:12:05.000000000 +0100
@@ -1,0 +2,35 @@
+Sun Mar 21 21:20:17 MST 2010 - jfehlig(a)novell.com
+
+- Updated to version 0.7.7
+ - Introduce public API for domain async job handling
+ - macvtap support
+ - Add QEMU support for virtio channel
+ - Add persistence of PCI addresses to QEMU
+ - Functions for computing baseline CPU from a set of host CPUs
+ - Public API for virDomain{Attach,Detach}DeviceFlags
+ - lots of improvements and bug fixes
+
+-------------------------------------------------------------------
+Tue Mar 9 10:40:49 MST 2010 - jfehlig(a)novell.com
+
+- Ensure yast-created bridges are not manipulated by libvirt
+ bnc#584757
+ Modified suse-network.patch
+
+-------------------------------------------------------------------
+Wed Mar 3 19:03:03 MST 2010 - jfehlig(a)novell.com
+
+- Fix ordering of xen disks to preserve 'bootable' flag
+ bnc#474738
+ xend-disk-order.patch
+- Add support for blktap2 disks
+ xen-tap2-support.patch
+
+-------------------------------------------------------------------
+Mon Mar 1 15:48:51 MST 2010 - jfehlig(a)novell.com
+
+- Fix listing of yast-created bridges
+ bnc#583754
+ Modified suse-network.patch
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
devflag-01.patch
devflag-02.patch
devflag-03.patch
devflag-04.patch
devflag-05.patch
devflag-06.patch
devflag-07.patch
devflag-08.patch
devflag-09.patch
libvirt-0.7.6.tar.bz2
New:
----
libvirt-0.7.7.tar.bz2
lxc-cgroup.patch
xen-tap2-support.patch
xend-disk-order.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.5iM9Ap/_old 2010-03-22 17:05:40.000000000 +0100
+++ /var/tmp/diff_new_pack.5iM9Ap/_new 2010-03-22 17:05:40.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libvirt (Version 0.7.6)
+# spec file for package libvirt (Version 0.7.7)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -113,8 +113,8 @@
License: LGPLv2.1+
Group: Development/Libraries/C and C++
AutoReqProv: yes
-Version: 0.7.6
-Release: 2
+Version: 0.7.7
+Release: 1
Summary: A C toolkit to interract with the virtualization capabilities of Linux
# The client side, i.e. shared libs and virsh are in a subpackage
Requires: libvirt-client = %{version}-%{release}
@@ -138,21 +138,15 @@
Source0: %{name}-%{version}.tar.bz2
Source1: libvirtd.init
# Upstream patches
-Patch0: devflag-01.patch
-Patch1: devflag-02.patch
-Patch2: devflag-03.patch
-Patch3: devflag-04.patch
-Patch4: devflag-05.patch
-Patch5: devflag-06.patch
-Patch6: devflag-07.patch
-Patch7: devflag-08.patch
-Patch8: devflag-09.patch
-Patch9: xen-name-for-devid.patch
+Patch0: xen-name-for-devid.patch
+Patch1: lxc-cgroup.patch
# Need to go upstream
Patch100: socat.patch
Patch101: clone.patch
Patch102: xen-pv-cdrom.patch
Patch103: xen-domctl-ver7.patch
+Patch104: xen-tap2-support.patch
+Patch105: xend-disk-order.patch
# Our patches
Patch200: libvirtd-defaults.patch
Patch201: suse-network.patch
@@ -262,18 +256,12 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
%patch100 -p1
%patch101
%patch102 -p1
%patch103 -p1
+%patch104 -p1
+%patch105 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1
++++++ clone.patch ++++++
--- /var/tmp/diff_new_pack.5iM9Ap/_old 2010-03-22 17:05:40.000000000 +0100
+++ /var/tmp/diff_new_pack.5iM9Ap/_new 2010-03-22 17:05:40.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- src/lxc/lxc_container.c.orig
+++ src/lxc/lxc_container.c
-@@ -814,6 +814,9 @@ int lxcContainerStart(virDomainDefPtr de
+@@ -828,6 +828,9 @@ int lxcContainerStart(virDomainDefPtr de
lxc_child_argv_t args = { def, nveths, veths, control, ttyPath };
/* allocate a stack for the container */
@@ -10,11 +10,11 @@
+ stacksize *= 2;
+#endif
if (VIR_ALLOC_N(stack, stacksize) < 0) {
- virReportOOMError(NULL);
+ virReportOOMError();
return -1;
-@@ -828,7 +831,11 @@ int lxcContainerStart(virDomainDefPtr de
- if (def->nets != NULL)
+@@ -846,7 +849,11 @@ int lxcContainerStart(virDomainDefPtr de
flags |= CLONE_NEWNET;
+ }
+#ifdef __ia64__
+ pid = __clone2(lxcContainerChild, stack, stacksize, flags, &args);
@@ -22,9 +22,9 @@
pid = clone(lxcContainerChild, stacktop, flags, &args);
+#endif
VIR_FREE(stack);
- DEBUG("clone() returned, %d", pid);
+ DEBUG("clone() completed, new container PID is %d", pid);
-@@ -854,6 +861,7 @@ int lxcContainerAvailable(int features)
+@@ -872,6 +879,7 @@ int lxcContainerAvailable(int features)
char *childStack;
char *stack;
int childStatus;
@@ -32,7 +32,7 @@
if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER;
-@@ -861,14 +869,21 @@ int lxcContainerAvailable(int features)
+@@ -879,14 +887,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;
++++++ libvirt-0.7.6.tar.bz2 -> libvirt-0.7.7.tar.bz2 ++++++
libvirt/libvirt-0.7.6.tar.bz2 /mounts/work_src_done/STABLE/libvirt/libvirt-0.7.7.tar.bz2 differ: char 11, line 1
++++++ lxc-cgroup.patch ++++++
commit f034c0bfd7089ba3400b7a44b97540c4a8785e35
Author: Jim Fehlig <jfehlig(a)novell.com>
Date: Sun Mar 21 19:59:13 2010 -0600
Avoid libvirtd crash when cgroups is not configured on host
Invoking virDomainSetMemory() on lxc driver results in libvirtd
segfault when cgroups has not been configured on the host.
Ensure driver->cgroup is non-null before invoking
virCgroupForDomain(). To prevent similar segfaults in the future,
ensure driver parameter to virCgroupForDomain() is non-null before
dereferencing.
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index aeec593..ba13065 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -625,6 +625,12 @@ static int lxcDomainSetMemory(virDomainPtr dom, unsigned long newmem) {
}
if (virDomainObjIsActive(vm)) {
+ if (driver->cgroup == NULL) {
+ lxcError(VIR_ERR_NO_SUPPORT,
+ "%s", _("cgroups must be configured on the host"));
+ goto cleanup;
+ }
+
if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) != 0) {
lxcError(VIR_ERR_INTERNAL_ERROR,
_("Unable to get cgroup for %s\n"), vm->def->name);
diff --git a/src/util/cgroup.c b/src/util/cgroup.c
index 8777781..496d9d3 100644
--- a/src/util/cgroup.c
+++ b/src/util/cgroup.c
@@ -692,6 +692,9 @@ int virCgroupForDomain(virCgroupPtr driver,
int rc;
char *path;
+ if (driver == NULL)
+ return -EINVAL;
+
if (virAsprintf(&path, "%s/%s", driver->path, name) < 0)
return -ENOMEM;
++++++ snapshots.patch ++++++
--- /var/tmp/diff_new_pack.5iM9Ap/_old 2010-03-22 17:05:40.000000000 +0100
+++ /var/tmp/diff_new_pack.5iM9Ap/_new 2010-03-22 17:05:40.000000000 +0100
@@ -1,7 +1,7 @@
-Index: libvirt-0.7.6/include/libvirt/libvirt.h.in
+Index: libvirt-0.7.7/include/libvirt/libvirt.h.in
===================================================================
---- libvirt-0.7.6.orig/include/libvirt/libvirt.h.in
-+++ libvirt-0.7.6/include/libvirt/libvirt.h.in
+--- libvirt-0.7.7.orig/include/libvirt/libvirt.h.in
++++ libvirt-0.7.7/include/libvirt/libvirt.h.in
@@ -621,6 +621,21 @@ int virDomainRestore
const char *from);
@@ -24,10 +24,10 @@
* Domain core dump
*/
int virDomainCoreDump (virDomainPtr domain,
-Index: libvirt-0.7.6/src/libvirt.c
+Index: libvirt-0.7.7/src/libvirt.c
===================================================================
---- libvirt-0.7.6.orig/src/libvirt.c
-+++ libvirt-0.7.6/src/libvirt.c
+--- libvirt-0.7.7.orig/src/libvirt.c
++++ libvirt-0.7.7/src/libvirt.c
@@ -2379,6 +2379,166 @@ error:
}
@@ -195,10 +195,10 @@
* virDomainCoreDump:
* @domain: a domain object
* @to: path for the core file
-Index: libvirt-0.7.6/src/driver.h
+Index: libvirt-0.7.7/src/driver.h
===================================================================
---- libvirt-0.7.6.orig/src/driver.h
-+++ libvirt-0.7.6/src/driver.h
+--- libvirt-0.7.7.orig/src/driver.h
++++ libvirt-0.7.7/src/driver.h
@@ -136,6 +136,21 @@ typedef int
(*virDrvDomainRestore) (virConnectPtr conn,
const char *from);
@@ -221,10 +221,10 @@
(*virDrvDomainCoreDump) (virDomainPtr domain,
const char *to,
int flags);
-@@ -458,6 +473,11 @@ struct _virDriver {
- virDrvDomainIsActive domainIsActive;
- virDrvDomainIsPersistent domainIsPersistent;
- virDrvCPUCompare cpuCompare;
+@@ -473,6 +488,11 @@ struct _virDriver {
+ virDrvCPUBaseline cpuBaseline;
+ virDrvDomainGetJobInfo domainGetJobInfo;
+ virDrvDomainAbortJob domainAbortJob;
+ virDrvDomainSnapshotCreate domainSnapshotCreate;
+ virDrvDomainSnapshotApply domainSnapshotApply;
+ virDrvDomainSnapshotDelete domainSnapshotDelete;
@@ -233,10 +233,10 @@
};
typedef int
-Index: libvirt-0.7.6/src/xen/xen_driver.c
+Index: libvirt-0.7.7/src/xen/xen_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/xen/xen_driver.c
-+++ libvirt-0.7.6/src/xen/xen_driver.c
+--- libvirt-0.7.7.orig/src/xen/xen_driver.c
++++ libvirt-0.7.7/src/xen/xen_driver.c
@@ -1052,6 +1052,81 @@ xenUnifiedDomainRestore (virConnectPtr c
}
@@ -319,10 +319,10 @@
xenUnifiedDomainCoreDump (virDomainPtr dom, const char *to, int flags)
{
GET_PRIVATE(dom->conn);
-@@ -1904,6 +1979,11 @@ static virDriver xenUnifiedDriver = {
- xenUnifiedDomainIsActive,
- xenUnifiedDomainisPersistent,
- NULL, /* cpuCompare */
+@@ -1906,6 +1981,11 @@ static virDriver xenUnifiedDriver = {
+ NULL, /* cpuBaseline */
+ NULL, /* domainGetJobInfo */
+ NULL, /* domainAbortJob */
+ xenUnifiedDomainSnapshotCreate, /* domainSnapshotCreate */
+ xenUnifiedDomainSnapshotApply, /* domainSnapshotApply */
+ xenUnifiedDomainSnapshotDelete, /* domainSnapshotDelete */
@@ -331,10 +331,10 @@
};
/**
-Index: libvirt-0.7.6/src/xen/xen_driver.h
+Index: libvirt-0.7.7/src/xen/xen_driver.h
===================================================================
---- libvirt-0.7.6.orig/src/xen/xen_driver.h
-+++ libvirt-0.7.6/src/xen/xen_driver.h
+--- libvirt-0.7.7.orig/src/xen/xen_driver.h
++++ libvirt-0.7.7/src/xen/xen_driver.h
@@ -100,6 +100,11 @@ struct xenUnifiedDriver {
virDrvDomainGetSchedulerType domainGetSchedulerType;
virDrvDomainGetSchedulerParameters domainGetSchedulerParameters;
@@ -347,10 +347,10 @@
};
typedef struct xenXMConfCache *xenXMConfCachePtr;
-Index: libvirt-0.7.6/src/xen/xend_internal.c
+Index: libvirt-0.7.7/src/xen/xend_internal.c
===================================================================
---- libvirt-0.7.6.orig/src/xen/xend_internal.c
-+++ libvirt-0.7.6/src/xen/xend_internal.c
+--- libvirt-0.7.7.orig/src/xen/xend_internal.c
++++ libvirt-0.7.7/src/xen/xend_internal.c
@@ -53,6 +53,12 @@
#ifndef PROXY
@@ -364,7 +364,7 @@
/*
* The number of Xen scheduler parameters
*/
-@@ -3284,6 +3290,87 @@ xenDaemonDomainRestore(virConnectPtr con
+@@ -3297,6 +3303,87 @@ xenDaemonDomainRestore(virConnectPtr con
}
return xend_op(conn, "", "op", "restore", "file", filename, NULL);
}
@@ -452,7 +452,7 @@
#endif /* !PROXY */
/**
-@@ -5235,6 +5322,11 @@ struct xenUnifiedDriver xenDaemonDriver
+@@ -5245,6 +5332,11 @@ struct xenUnifiedDriver xenDaemonDriver
xenDaemonGetSchedulerType, /* domainGetSchedulerType */
xenDaemonGetSchedulerParameters, /* domainGetSchedulerParameters */
xenDaemonSetSchedulerParameters, /* domainSetSchedulerParameters */
@@ -464,10 +464,10 @@
};
/************************************************************************
-Index: libvirt-0.7.6/src/xen/proxy_internal.c
+Index: libvirt-0.7.7/src/xen/proxy_internal.c
===================================================================
---- libvirt-0.7.6.orig/src/xen/proxy_internal.c
-+++ libvirt-0.7.6/src/xen/proxy_internal.c
+--- libvirt-0.7.7.orig/src/xen/proxy_internal.c
++++ libvirt-0.7.7/src/xen/proxy_internal.c
@@ -83,6 +83,11 @@ struct xenUnifiedDriver xenProxyDriver =
NULL, /* domainGetSchedulerType */
NULL, /* domainGetSchedulerParameters */
@@ -480,10 +480,10 @@
};
-Index: libvirt-0.7.6/src/xen/xen_hypervisor.c
+Index: libvirt-0.7.7/src/xen/xen_hypervisor.c
===================================================================
---- libvirt-0.7.6.orig/src/xen/xen_hypervisor.c
-+++ libvirt-0.7.6/src/xen/xen_hypervisor.c
+--- libvirt-0.7.7.orig/src/xen/xen_hypervisor.c
++++ libvirt-0.7.7/src/xen/xen_hypervisor.c
@@ -850,6 +850,11 @@ struct xenUnifiedDriver xenHypervisorDri
xenHypervisorGetSchedulerType, /* domainGetSchedulerType */
xenHypervisorGetSchedulerParameters, /* domainGetSchedulerParameters */
@@ -496,10 +496,10 @@
};
#endif /* !PROXY */
-Index: libvirt-0.7.6/src/xen/xm_internal.c
+Index: libvirt-0.7.7/src/xen/xm_internal.c
===================================================================
---- libvirt-0.7.6.orig/src/xen/xm_internal.c
-+++ libvirt-0.7.6/src/xen/xm_internal.c
+--- libvirt-0.7.7.orig/src/xen/xm_internal.c
++++ libvirt-0.7.7/src/xen/xm_internal.c
@@ -118,6 +118,11 @@ struct xenUnifiedDriver xenXMDriver = {
NULL, /* domainGetSchedulerType */
NULL, /* domainGetSchedulerParameters */
@@ -512,10 +512,10 @@
};
#define xenXMError(conn, code, fmt...) \
-Index: libvirt-0.7.6/src/xen/xs_internal.c
+Index: libvirt-0.7.7/src/xen/xs_internal.c
===================================================================
---- libvirt-0.7.6.orig/src/xen/xs_internal.c
-+++ libvirt-0.7.6/src/xen/xs_internal.c
+--- libvirt-0.7.7.orig/src/xen/xs_internal.c
++++ libvirt-0.7.7/src/xen/xs_internal.c
@@ -83,6 +83,11 @@ struct xenUnifiedDriver xenStoreDriver =
NULL, /* domainGetSchedulerType */
NULL, /* domainGetSchedulerParameters */
@@ -528,11 +528,11 @@
};
#endif /* ! PROXY */
-Index: libvirt-0.7.6/tools/virsh.c
+Index: libvirt-0.7.7/tools/virsh.c
===================================================================
---- libvirt-0.7.6.orig/tools/virsh.c
-+++ libvirt-0.7.6/tools/virsh.c
-@@ -1237,6 +1237,188 @@ cmdSave(vshControl *ctl, const vshCmd *c
+--- libvirt-0.7.7.orig/tools/virsh.c
++++ libvirt-0.7.7/tools/virsh.c
+@@ -1268,6 +1268,188 @@ cmdSave(vshControl *ctl, const vshCmd *c
}
/*
@@ -721,7 +721,7 @@
* "schedinfo" command
*/
static const vshCmdInfo info_schedinfo[] = {
-@@ -7502,6 +7684,12 @@ static const vshCmdDef commands[] = {
+@@ -7753,6 +7935,12 @@ static const vshCmdDef commands[] = {
{"undefine", cmdUndefine, opts_undefine, info_undefine},
{"uri", cmdURI, NULL, info_uri},
@@ -734,14 +734,14 @@
{"vol-create", cmdVolCreate, opts_vol_create, info_vol_create},
{"vol-create-from", cmdVolCreateFrom, opts_vol_create_from, info_vol_create_from},
{"vol-create-as", cmdVolCreateAs, opts_vol_create_as, info_vol_create_as},
-Index: libvirt-0.7.6/src/lxc/lxc_driver.c
+Index: libvirt-0.7.7/src/lxc/lxc_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/lxc/lxc_driver.c
-+++ libvirt-0.7.6/src/lxc/lxc_driver.c
-@@ -2458,6 +2458,11 @@ static virDriver lxcDriver = {
- lxcDomainIsActive,
- lxcDomainIsPersistent,
- NULL, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/lxc/lxc_driver.c
++++ libvirt-0.7.7/src/lxc/lxc_driver.c
+@@ -2459,6 +2459,11 @@ static virDriver lxcDriver = {
+ NULL, /* cpuBaseline */
+ NULL, /* domainGetJobInfo */
+ NULL, /* domainAbortJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -750,14 +750,14 @@
};
static virStateDriver lxcStateDriver = {
-Index: libvirt-0.7.6/src/openvz/openvz_driver.c
+Index: libvirt-0.7.7/src/openvz/openvz_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/openvz/openvz_driver.c
-+++ libvirt-0.7.6/src/openvz/openvz_driver.c
-@@ -1537,6 +1537,11 @@ static virDriver openvzDriver = {
- openvzDomainIsActive,
- openvzDomainIsPersistent,
- NULL, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/openvz/openvz_driver.c
++++ libvirt-0.7.7/src/openvz/openvz_driver.c
+@@ -1540,6 +1540,11 @@ static virDriver openvzDriver = {
+ NULL, /* cpuBaseline */
+ NULL, /* domainGetJobInfo */
+ NULL, /* domainAbortJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -766,14 +766,14 @@
};
int openvzRegister(void) {
-Index: libvirt-0.7.6/src/qemu/qemu_driver.c
+Index: libvirt-0.7.7/src/qemu/qemu_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/qemu/qemu_driver.c
-+++ libvirt-0.7.6/src/qemu/qemu_driver.c
-@@ -8632,6 +8632,11 @@ static virDriver qemuDriver = {
- qemuDomainIsActive,
- qemuDomainIsPersistent,
- qemuCPUCompare, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/qemu/qemu_driver.c
++++ libvirt-0.7.7/src/qemu/qemu_driver.c
+@@ -9535,6 +9535,11 @@ static virDriver qemuDriver = {
+ qemuCPUBaseline, /* cpuBaseline */
+ qemuDomainGetJobInfo, /* domainGetJobInfo */
+ qemuDomainAbortJob, /* domainAbortJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -782,14 +782,14 @@
};
-Index: libvirt-0.7.6/src/esx/esx_driver.c
+Index: libvirt-0.7.7/src/esx/esx_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/esx/esx_driver.c
-+++ libvirt-0.7.6/src/esx/esx_driver.c
-@@ -3403,6 +3403,11 @@ static virDriver esxDriver = {
- esxDomainIsActive, /* domainIsActive */
- esxDomainIsPersistent, /* domainIsPersistent */
- NULL, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/esx/esx_driver.c
++++ libvirt-0.7.7/src/esx/esx_driver.c
+@@ -3410,6 +3410,11 @@ static virDriver esxDriver = {
+ NULL, /* cpuBaseline */
+ NULL, /* domainGetJobInfo */
+ NULL, /* domainAbortJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -798,14 +798,14 @@
};
-Index: libvirt-0.7.6/src/test/test_driver.c
+Index: libvirt-0.7.7/src/test/test_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/test/test_driver.c
-+++ libvirt-0.7.6/src/test/test_driver.c
-@@ -5240,6 +5240,11 @@ static virDriver testDriver = {
- testDomainIsActive, /* domainIsActive */
- testDomainIsPersistent, /* domainIsPersistent */
- NULL, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/test/test_driver.c
++++ libvirt-0.7.7/src/test/test_driver.c
+@@ -5245,6 +5245,11 @@ static virDriver testDriver = {
+ NULL, /* cpuBaseline */
+ NULL, /* domainGetJobInfo */
+ NULL, /* domainAbortJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -814,14 +814,14 @@
};
static virNetworkDriver testNetworkDriver = {
-Index: libvirt-0.7.6/src/uml/uml_driver.c
+Index: libvirt-0.7.7/src/uml/uml_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/uml/uml_driver.c
-+++ libvirt-0.7.6/src/uml/uml_driver.c
-@@ -1926,6 +1926,11 @@ static virDriver umlDriver = {
- umlDomainIsActive,
- umlDomainIsPersistent,
- NULL, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/uml/uml_driver.c
++++ libvirt-0.7.7/src/uml/uml_driver.c
+@@ -1932,6 +1932,11 @@ static virDriver umlDriver = {
+ NULL, /* cpuBaseline */
+ NULL, /* domainGetJobInfo */
+ NULL, /* domainAbortJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -830,14 +830,14 @@
};
-Index: libvirt-0.7.6/src/vbox/vbox_tmpl.c
+Index: libvirt-0.7.7/src/vbox/vbox_tmpl.c
===================================================================
---- libvirt-0.7.6.orig/src/vbox/vbox_tmpl.c
-+++ libvirt-0.7.6/src/vbox/vbox_tmpl.c
-@@ -7059,6 +7059,11 @@ virDriver NAME(Driver) = {
- vboxDomainIsActive,
- vboxDomainIsPersistent,
- NULL, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/vbox/vbox_tmpl.c
++++ libvirt-0.7.7/src/vbox/vbox_tmpl.c
+@@ -7065,6 +7065,11 @@ virDriver NAME(Driver) = {
+ NULL, /* cpuBaseline */
+ NULL, /* domainGetJobInfo */
+ NULL, /* domainAbortJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -846,14 +846,14 @@
};
virNetworkDriver NAME(NetworkDriver) = {
-Index: libvirt-0.7.6/src/opennebula/one_driver.c
+Index: libvirt-0.7.7/src/opennebula/one_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/opennebula/one_driver.c
-+++ libvirt-0.7.6/src/opennebula/one_driver.c
-@@ -785,6 +785,11 @@ static virDriver oneDriver = {
- NULL, /* domainIsActive */
- NULL, /* domainIsPersistent */
- NULL, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/opennebula/one_driver.c
++++ libvirt-0.7.7/src/opennebula/one_driver.c
+@@ -788,6 +788,11 @@ static virDriver oneDriver = {
+ NULL, /* cpuBaseline */
+ NULL, /* domainGetJobInfo */
+ NULL, /* domainAbortJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -862,14 +862,14 @@
};
static virStateDriver oneStateDriver = {
-Index: libvirt-0.7.6/src/phyp/phyp_driver.c
+Index: libvirt-0.7.7/src/phyp/phyp_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/phyp/phyp_driver.c
-+++ libvirt-0.7.6/src/phyp/phyp_driver.c
-@@ -1653,6 +1653,11 @@ virDriver phypDriver = {
- NULL, /* domainIsActive */
- NULL, /* domainIsPersistent */
- NULL, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/phyp/phyp_driver.c
++++ libvirt-0.7.7/src/phyp/phyp_driver.c
+@@ -1656,6 +1656,11 @@ virDriver phypDriver = {
+ NULL, /* cpuBaseline */
+ NULL, /* domainGetJobInfo */
+ NULL, /* domainAbortJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -878,14 +878,14 @@
};
int
-Index: libvirt-0.7.6/src/remote/remote_driver.c
+Index: libvirt-0.7.7/src/remote/remote_driver.c
===================================================================
---- libvirt-0.7.6.orig/src/remote/remote_driver.c
-+++ libvirt-0.7.6/src/remote/remote_driver.c
-@@ -8994,6 +8994,11 @@ static virDriver remote_driver = {
- remoteDomainIsActive, /* domainIsActive */
- remoteDomainIsPersistent, /* domainIsPersistent */
- remoteCPUCompare, /* cpuCompare */
+--- libvirt-0.7.7.orig/src/remote/remote_driver.c
++++ libvirt-0.7.7/src/remote/remote_driver.c
+@@ -9143,6 +9143,11 @@ static virDriver remote_driver = {
+ remoteCPUBaseline, /* cpuBaseline */
+ remoteDomainGetJobInfo, /* domainGetJobInfo */
+ remoteDomainAbortJob, /* domainFinishJob */
+ NULL, /* domainSnapshotCreate */
+ NULL, /* domainSnapshotApply */
+ NULL, /* domainSnapshotDelete */
@@ -894,11 +894,11 @@
};
static virNetworkDriver network_driver = {
-Index: libvirt-0.7.6/docs/libvirt-api.xml
+Index: libvirt-0.7.7/docs/libvirt-api.xml
===================================================================
---- libvirt-0.7.6.orig/docs/libvirt-api.xml
-+++ libvirt-0.7.6/docs/libvirt-api.xml
-@@ -293,6 +293,11 @@
+--- libvirt-0.7.7.orig/docs/libvirt-api.xml
++++ libvirt-0.7.7/docs/libvirt-api.xml
+@@ -300,6 +300,11 @@
<exports symbol='virDomainSetVcpus' type='function'/>
<exports symbol='virDomainShutdown' type='function'/>
<exports symbol='virDomainSuspend' type='function'/>
@@ -910,7 +910,7 @@
<exports symbol='virDomainUndefine' type='function'/>
<exports symbol='virEventAddHandleFunc' type='function'/>
<exports symbol='virEventAddTimeoutFunc' type='function'/>
-@@ -1972,6 +1977,36 @@ This function may requires privileged ac
+@@ -2040,6 +2045,36 @@ This function may requires privileged ac
<return type='int' info='0 in case of success and -1 in case of failure.'/>
<arg name='domain' type='virDomainPtr' info='a domain object'/>
</function>
@@ -947,10 +947,10 @@
<function name='virDomainUndefine' file='libvirt' module='libvirt'>
<info><![CDATA[Undefine a domain but does not stop it if it is running]]></info>
<return type='int' info='0 in case of success, -1 in case of error'/>
-Index: libvirt-0.7.6/src/libvirt_public.syms
+Index: libvirt-0.7.7/src/libvirt_public.syms
===================================================================
---- libvirt-0.7.6.orig/src/libvirt_public.syms
-+++ libvirt-0.7.6/src/libvirt_public.syms
+--- libvirt-0.7.7.orig/src/libvirt_public.syms
++++ libvirt-0.7.7/src/libvirt_public.syms
@@ -215,6 +215,11 @@ LIBVIRT_0.4.2 {
LIBVIRT_0.4.5 {
global:
@@ -963,11 +963,11 @@
} LIBVIRT_0.4.2;
LIBVIRT_0.5.0 {
-Index: libvirt-0.7.6/python/generator.py
+Index: libvirt-0.7.7/python/generator.py
===================================================================
---- libvirt-0.7.6.orig/python/generator.py
-+++ libvirt-0.7.6/python/generator.py
-@@ -289,6 +289,7 @@ skip_impl = (
+--- libvirt-0.7.7.orig/python/generator.py
++++ libvirt-0.7.7/python/generator.py
+@@ -290,6 +290,7 @@ skip_impl = (
'virDomainSetSchedulerParameters',
'virDomainGetVcpus',
'virDomainPinVcpu',
@@ -975,10 +975,10 @@
'virSecretGetValue',
'virSecretSetValue',
'virSecretGetUUID',
-Index: libvirt-0.7.6/python/libvirt-override.c
+Index: libvirt-0.7.7/python/libvirt-override.c
===================================================================
---- libvirt-0.7.6.orig/python/libvirt-override.c
-+++ libvirt-0.7.6/python/libvirt-override.c
+--- libvirt-0.7.7.orig/python/libvirt-override.c
++++ libvirt-0.7.7/python/libvirt-override.c
@@ -1542,6 +1542,34 @@ libvirt_virStoragePoolGetInfo(PyObject *
return(py_retval);
}
@@ -1014,7 +1014,7 @@
static PyObject *
libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) {
-@@ -2717,6 +2745,7 @@ static PyMethodDef libvirtMethods[] = {
+@@ -2805,6 +2833,7 @@ static PyMethodDef libvirtMethods[] = {
{(char *) "virStoragePoolGetAutostart", libvirt_virStoragePoolGetAutostart, METH_VARARGS, NULL},
{(char *) "virStoragePoolListVolumes", libvirt_virStoragePoolListVolumes, METH_VARARGS, NULL},
{(char *) "virStoragePoolGetInfo", libvirt_virStoragePoolGetInfo, METH_VARARGS, NULL},
@@ -1022,11 +1022,11 @@
{(char *) "virStorageVolGetInfo", libvirt_virStorageVolGetInfo, METH_VARARGS, NULL},
{(char *) "virStoragePoolGetUUID", libvirt_virStoragePoolGetUUID, METH_VARARGS, NULL},
{(char *) "virStoragePoolGetUUIDString", libvirt_virStoragePoolGetUUIDString, METH_VARARGS, NULL},
-Index: libvirt-0.7.6/python/libvirt-override-api.xml
+Index: libvirt-0.7.7/python/libvirt-override-api.xml
===================================================================
---- libvirt-0.7.6.orig/python/libvirt-override-api.xml
-+++ libvirt-0.7.6/python/libvirt-override-api.xml
-@@ -150,6 +150,11 @@
+--- libvirt-0.7.7.orig/python/libvirt-override-api.xml
++++ libvirt-0.7.7/python/libvirt-override-api.xml
+@@ -155,6 +155,11 @@
<arg name='domain' type='virDomainPtr' info='pointer to domain object'/>
<arg name='params' type='virSchedParameterPtr' info='pointer to scheduler parameter objects'/>
</function>
@@ -1038,10 +1038,10 @@
<function name='virConnectListStoragePools' file='python'>
<info>list the storage pools, stores the pointers to the names in @names</info>
<arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
-Index: libvirt-0.7.6/src/xen/xen_inotify.c
+Index: libvirt-0.7.7/src/xen/xen_inotify.c
===================================================================
---- libvirt-0.7.6.orig/src/xen/xen_inotify.c
-+++ libvirt-0.7.6/src/xen/xen_inotify.c
+--- libvirt-0.7.7.orig/src/xen/xen_inotify.c
++++ libvirt-0.7.7/src/xen/xen_inotify.c
@@ -86,6 +86,11 @@ struct xenUnifiedDriver xenInotifyDriver
NULL, /* domainGetSchedulerType */
NULL, /* domainGetSchedulerParameters */
++++++ socat.patch ++++++
--- /var/tmp/diff_new_pack.5iM9Ap/_old 2010-03-22 17:05:40.000000000 +0100
+++ /var/tmp/diff_new_pack.5iM9Ap/_new 2010-03-22 17:05:40.000000000 +0100
@@ -1,8 +1,8 @@
-Index: libvirt-0.7.4/src/remote/remote_driver.c
+Index: libvirt-0.7.7/src/remote/remote_driver.c
===================================================================
---- libvirt-0.7.4.orig/src/remote/remote_driver.c
-+++ libvirt-0.7.4/src/remote/remote_driver.c
-@@ -763,12 +763,29 @@ doRemoteOpen (virConnectPtr conn,
+--- libvirt-0.7.7.orig/src/remote/remote_driver.c
++++ libvirt-0.7.7/src/remote/remote_driver.c
+@@ -766,12 +766,29 @@ doRemoteOpen (virConnectPtr conn,
cmd_argv[j++] = strdup ("none");
}
cmd_argv[j++] = strdup (priv->hostname);
++++++ suse-network.patch ++++++
--- /var/tmp/diff_new_pack.5iM9Ap/_old 2010-03-22 17:05:40.000000000 +0100
+++ /var/tmp/diff_new_pack.5iM9Ap/_new 2010-03-22 17:05:40.000000000 +0100
@@ -1,58 +1,56 @@
-Index: libvirt-0.7.5/src/conf/network_conf.c
+Index: libvirt-0.7.7/src/conf/network_conf.c
===================================================================
---- libvirt-0.7.5.orig/src/conf/network_conf.c
-+++ libvirt-0.7.5/src/conf/network_conf.c
-@@ -863,6 +863,137 @@ error:
+--- libvirt-0.7.7.orig/src/conf/network_conf.c
++++ libvirt-0.7.7/src/conf/network_conf.c
+@@ -845,6 +845,135 @@ error:
return NULL;
}
-+static int virNetworkIsBridge(const char *name)
++int virNetworkIsBridge(const char *name)
+{
+ char *path = NULL;
+ int ret = 0;
+ struct stat s;
+
+ if (asprintf(&path, "/sys/class/net/%s/bridge", name) < 0)
-+ goto out;
++ goto out;
+
+ if (stat(path, &s) != 0)
-+ goto out;
++ goto out;
+
+ if (S_ISDIR(s.st_mode))
-+ ret = 1;
++ ret = 1;
+
-+ out:
++out:
+ free(path);
+ return ret;
-+}
++ }
+
+static unsigned long virNetworkDefSuseGetValue(const char *netName, const char *valName)
+{
-+ unsigned long ret = 0;
-+ char *path = NULL;
-+ FILE *f;
-+
-+ if (asprintf(&path, "/sys/class/net/%s/bridge/%s", netName, valName) < 0)
-+ return ret;
-+
-+ if ((f = fopen(path, "r")) == NULL)
-+ goto out;
-+
-+ if (fscanf(f, "%lu", &ret) != 1) {
-+ ret = 0;
-+ goto out;
-+ }
-+
-+
-+ out:
-+ if (f != NULL)
-+ fclose(f);
-+ free(path);
-+ return ret;
++ unsigned long ret = 0;
++ char *path = NULL;
++ FILE *f;
++
++ if (asprintf(&path, "/sys/class/net/%s/bridge/%s", netName, valName) < 0)
++ return ret;
++
++ if ((f = fopen(path, "r")) == NULL)
++ goto out;
++
++ if (fscanf(f, "%lu", &ret) != 1) {
++ ret = 0;
++ goto out;
++ }
++
++ out:
++ if (f != NULL)
++ fclose(f);
++ free(path);
++ return ret;
+}
+
-+static virNetworkObjPtr virNetworkLoadSuseNet(virConnectPtr conn,
-+ virNetworkObjListPtr nets,
++static virNetworkObjPtr virNetworkLoadSuseNet(virNetworkObjListPtr nets,
+ const char *name)
+{
+ virNetworkDefPtr def;
@@ -60,21 +58,22 @@
+ int err;
+
+ if ((network = virNetworkFindByName(nets, name))) {
-+ return network;
++ virNetworkObjUnlock(network);
++ return network;
+ }
+
+ if (VIR_ALLOC(network) < 0) {
-+ virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL);
-+ return NULL;
++ virNetworkReportError(VIR_ERR_NO_MEMORY, NULL);
++ return NULL;
+ }
+
+ network->autostart = 1;
+ network->active = 1;
-+ network->readonly = 1;
++ network->suse = 1;
+
+ if (VIR_ALLOC(def) < 0) {
-+ virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL);
-+ goto error;
++ virNetworkReportError(VIR_ERR_NO_MEMORY, NULL);
++ goto error;
+ }
+
+ network->def = def;
@@ -82,29 +81,29 @@
+ /* name */
+ def->name = strdup(name);
+ if (def->name == NULL) {
-+ virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL);
-+ goto error;
++ virNetworkReportError(VIR_ERR_NO_MEMORY, NULL);
++ goto error;
+ }
+
+ /* uuid */
+ if ((err = virUUIDGenerate(def->uuid))) {
-+ virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR,
-+ _("Failed to generate UUID: %s"), strerror(err));
-+ goto error;
++ virNetworkReportError(VIR_ERR_INTERNAL_ERROR,
++ _("Failed to generate UUID: %s"), strerror(err));
++ goto error;
+ }
+
+ /* bridge information */
+ def->bridge = strdup(name);
+ if (def->bridge == NULL) {
-+ virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL);
-+ goto error;
++ virNetworkReportError(VIR_ERR_NO_MEMORY, NULL);
++ goto error;
+ }
+ def->stp = (int)virNetworkDefSuseGetValue(name, "stp_state");
+ def->delay = virNetworkDefSuseGetValue(name, "forward_delay");
+
+ /* Add network to the list */
+ if (VIR_REALLOC_N(nets->objs, nets->count + 1) < 0) {
-+ virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL);
++ virNetworkReportError(VIR_ERR_NO_MEMORY, NULL);
+ VIR_FREE(network);
+ return NULL;
+ }
@@ -114,78 +113,144 @@
+
+ return network;
+
-+ error:
++error:
+ virNetworkObjFree(network);
+ return NULL;
+}
+
-+static void virNetworkLoadSuseNetworks(virConnectPtr conn,
-+ virNetworkObjListPtr nets)
++void virNetworkLoadSuseNetworks(virNetworkObjListPtr nets)
+{
+ DIR *dir = NULL;
+ struct dirent *de;
+
+ dir = opendir("/sys/class/net");
+ if (dir == NULL)
-+ return;
++ return;
+
+ while ((de = readdir(dir))) {
-+ if (virNetworkIsBridge(de->d_name)) {
-+ virNetworkLoadSuseNet(conn, nets, de->d_name);
-+ }
++ if (virNetworkIsBridge(de->d_name)) {
++ virNetworkLoadSuseNet(nets, de->d_name);
++ }
+ }
+ closedir(dir);
+}
+
- int virNetworkLoadAllConfigs(virConnectPtr conn,
- virNetworkObjListPtr nets,
+ int virNetworkLoadAllConfigs(virNetworkObjListPtr nets,
const char *configDir,
-@@ -902,6 +1033,7 @@ int virNetworkLoadAllConfigs(virConnectP
+ const char *autostartDir)
+@@ -882,6 +1011,7 @@ int virNetworkLoadAllConfigs(virNetworkO
closedir(dir);
-+ virNetworkLoadSuseNetworks(conn, nets);
++ virNetworkLoadSuseNetworks(nets);
return 0;
}
-Index: libvirt-0.7.5/src/conf/network_conf.h
+Index: libvirt-0.7.7/src/conf/network_conf.h
===================================================================
---- libvirt-0.7.5.orig/src/conf/network_conf.h
-+++ libvirt-0.7.5/src/conf/network_conf.h
+--- libvirt-0.7.7.orig/src/conf/network_conf.h
++++ libvirt-0.7.7/src/conf/network_conf.h
@@ -94,6 +94,7 @@ struct _virNetworkObj {
unsigned int active : 1;
unsigned int autostart : 1;
unsigned int persistent : 1;
-+ unsigned int readonly : 1;
++ unsigned int suse : 1;
virNetworkDefPtr def; /* The current definition */
virNetworkDefPtr newDef; /* New definition to activate at shutdown */
-Index: libvirt-0.7.5/src/network/bridge_driver.c
+@@ -172,4 +173,7 @@ int virNetworkSetBridgeName(const virNet
+ void virNetworkObjLock(virNetworkObjPtr obj);
+ void virNetworkObjUnlock(virNetworkObjPtr obj);
+
++int virNetworkIsBridge(const char *name);
++void virNetworkLoadSuseNetworks(virNetworkObjListPtr nets);
++
+ #endif /* __NETWORK_CONF_H__ */
+Index: libvirt-0.7.7/src/network/bridge_driver.c
===================================================================
---- libvirt-0.7.5.orig/src/network/bridge_driver.c
-+++ libvirt-0.7.5/src/network/bridge_driver.c
-@@ -1010,6 +1010,11 @@ static int networkShutdownNetworkDaemon(
+--- libvirt-0.7.7.orig/src/network/bridge_driver.c
++++ libvirt-0.7.7/src/network/bridge_driver.c
+@@ -811,7 +811,8 @@ networkReloadIptablesRules(struct networ
+ for (i = 0 ; i < driver->networks.count ; i++) {
+ virNetworkObjLock(driver->networks.objs[i]);
+
+- if (virNetworkObjIsActive(driver->networks.objs[i])) {
++ if (virNetworkObjIsActive(driver->networks.objs[i]) &&
++ !(driver->networks.objs[i]->suse)) {
+ networkRemoveIptablesRules(driver, driver->networks.objs[i]);
+ if (!networkAddIptablesRules(driver, driver->networks.objs[i])) {
+ /* failed to add but already logged */
+@@ -1003,6 +1004,12 @@ static int networkShutdownNetworkDaemon(
unlink(stateFile);
VIR_FREE(stateFile);
-+ if (network->readonly) {
-+ VIR_WARN("Network '%s' is readonly\n", network->def->name);
++ if (network->suse) {
++ VIR_WARN("Network '%s' is not under libvirt control and will not be "
++ "shutdown\n", network->def->name);
+ return -1;
+ }
+
if (network->dnsmasqPid > 0)
kill(network->dnsmasqPid, SIGTERM);
-@@ -1510,6 +1515,12 @@ static int networkSetAutostart(virNetwor
+@@ -1098,11 +1105,25 @@ static int networkCloseNetwork(virConnec
+ return 0;
+ }
+
++static void networkDriverSuseRefresh(struct network_driver *driver) {
++ int i = 0;
++ virNetworkObjPtr netObj;
++
++ virNetworkLoadSuseNetworks(&driver->networks);
++ while (i < driver->networks.count) {
++ netObj = driver->networks.objs[i];
++ if (netObj->suse && !virNetworkIsBridge(netObj->def->name))
++ virNetworkRemoveInactive(&driver->networks, netObj);
++ i++;
++ }
++}
++
+ static int networkNumNetworks(virConnectPtr conn) {
+ int nactive = 0, i;
+ struct network_driver *driver = conn->networkPrivateData;
+
+ networkDriverLock(driver);
++ networkDriverSuseRefresh(driver);
+ for (i = 0 ; i < driver->networks.count ; i++) {
+ virNetworkObjLock(driver->networks.objs[i]);
+ if (virNetworkObjIsActive(driver->networks.objs[i]))
+@@ -1119,6 +1140,7 @@ static int networkListNetworks(virConnec
+ int got = 0, i;
+
+ networkDriverLock(driver);
++ networkDriverSuseRefresh(driver);
+ for (i = 0 ; i < driver->networks.count && got < nnames ; i++) {
+ virNetworkObjLock(driver->networks.objs[i]);
+ if (virNetworkObjIsActive(driver->networks.objs[i])) {
+@@ -1499,6 +1521,13 @@ static int networkSetAutostart(virNetwor
goto cleanup;
}
-+ if (network->readonly) {
-+ networkReportError(net->conn, NULL, net, VIR_ERR_INTERNAL_ERROR,
-+ ": Network '%s' is readonly", network->def->name);
++ if (network->suse) {
++ networkReportError(VIR_ERR_INTERNAL_ERROR,
++ ": Network '%s' is not under libvirt control",
++ network->def->name);
+ return -1;
+ }
+
autostart = (autostart != 0);
if (network->autostart != autostart) {
+Index: libvirt-0.7.7/src/libvirt_private.syms
+===================================================================
+--- libvirt-0.7.7.orig/src/libvirt_private.syms
++++ libvirt-0.7.7/src/libvirt_private.syms
+@@ -411,6 +411,8 @@ virNetworkSaveConfig;
+ virNetworkSetBridgeName;
+ virNetworkObjLock;
+ virNetworkObjUnlock;
++virNetworkLoadSuseNetworks;
++virNetworkIsBridge;
+
+
+ # nodeinfo.h
++++++ xen-name-for-devid.patch ++++++
--- /var/tmp/diff_new_pack.5iM9Ap/_old 2010-03-22 17:05:40.000000000 +0100
+++ /var/tmp/diff_new_pack.5iM9Ap/_new 2010-03-22 17:05:40.000000000 +0100
@@ -13,10 +13,10 @@
This approach allows removing a disk when domain is inactive. We
obviously can't search xenstore when the domain is inactive.
-Index: libvirt-0.7.6/src/xen/xend_internal.c
+Index: libvirt-0.7.7/src/xen/xend_internal.c
===================================================================
---- libvirt-0.7.6.orig/src/xen/xend_internal.c
-+++ libvirt-0.7.6/src/xen/xend_internal.c
+--- libvirt-0.7.7.orig/src/xen/xend_internal.c
++++ libvirt-0.7.7/src/xen/xend_internal.c
@@ -93,6 +93,7 @@ xenDaemonFormatSxprOnePCI(virConnectPtr
static int
@@ -25,7 +25,7 @@
virDomainDeviceDefPtr dev,
char *class,
char *ref,
-@@ -4215,7 +4216,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
+@@ -4212,7 +4213,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr
sexpr = virBufferContentAndReset(&buf);
@@ -34,7 +34,7 @@
/* device doesn't exist, define it */
ret = xend_op(domain->conn, domain->name, "op", "device_create",
"config", sexpr, NULL);
-@@ -4310,7 +4311,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
+@@ -4306,7 +4307,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr
def, xml, VIR_DOMAIN_XML_INACTIVE)))
goto cleanup;
@@ -43,7 +43,7 @@
goto cleanup;
if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
-@@ -6052,6 +6053,7 @@ error:
+@@ -6060,6 +6061,7 @@ error:
*/
static int
virDomainXMLDevID(virDomainPtr domain,
@@ -51,7 +51,7 @@
virDomainDeviceDefPtr dev,
char *class,
char *ref,
-@@ -6060,27 +6062,33 @@ virDomainXMLDevID(virDomainPtr domain,
+@@ -6068,27 +6070,33 @@ virDomainXMLDevID(virDomainPtr domain,
xenUnifiedPrivatePtr priv = domain->conn->privateData;
char *xref;
char *tmp;
++++++ xen-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.5iM9Ap/_old 2010-03-22 17:05:40.000000000 +0100
+++ /var/tmp/diff_new_pack.5iM9Ap/_new 2010-03-22 17:05:40.000000000 +0100
@@ -1,8 +1,8 @@
-Index: libvirt-0.7.6/src/xen/xend_internal.c
+Index: libvirt-0.7.7/src/xen/xend_internal.c
===================================================================
---- libvirt-0.7.6.orig/src/xen/xend_internal.c
-+++ libvirt-0.7.6/src/xen/xend_internal.c
-@@ -5479,7 +5479,10 @@ xenDaemonFormatSxprDisk(virConnectPtr co
+--- libvirt-0.7.7.orig/src/xen/xend_internal.c
++++ libvirt-0.7.7/src/xen/xend_internal.c
+@@ -5475,7 +5475,10 @@ xenDaemonFormatSxprDisk(virConnectPtr co
} else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
virBufferVSprintf(buf, "(dev '%s:cdrom')", def->dst);
} else {
++++++ xen-tap2-support.patch ++++++
Index: libvirt-0.7.6/src/xen/xend_internal.c
===================================================================
--- libvirt-0.7.6.orig/src/xen/xend_internal.c
+++ libvirt-0.7.6/src/xen/xend_internal.c
@@ -1606,7 +1606,8 @@ xenDaemonParseSxprDisks(virConnectPtr co
but blktap disks ended up in a differently named
(device (tap ....)) block.... */
if (sexpr_lookup(node, "device/vbd") ||
- sexpr_lookup(node, "device/tap")) {
+ sexpr_lookup(node, "device/tap") ||
+ sexpr_lookup(node, "device/tap2")) {
char *offset;
const char *src = NULL;
const char *dst = NULL;
@@ -1617,10 +1618,14 @@ xenDaemonParseSxprDisks(virConnectPtr co
src = sexpr_node(node, "device/vbd/uname");
dst = sexpr_node(node, "device/vbd/dev");
mode = sexpr_node(node, "device/vbd/mode");
- } else {
+ } else if (sexpr_lookup(node, "device/tap")) {
src = sexpr_node(node, "device/tap/uname");
dst = sexpr_node(node, "device/tap/dev");
mode = sexpr_node(node, "device/tap/mode");
+ } else {
+ src = sexpr_node(node, "device/tap2/uname");
+ dst = sexpr_node(node, "device/tap2/dev");
+ mode = sexpr_node(node, "device/tap2/mode");
}
if (VIR_ALLOC(disk) < 0)
++++++ xend-disk-order.patch ++++++
Index: libvirt-0.7.6/src/xen/xend_internal.c
===================================================================
--- libvirt-0.7.6.orig/src/xen/xend_internal.c
+++ libvirt-0.7.6/src/xen/xend_internal.c
@@ -1612,20 +1612,24 @@ xenDaemonParseSxprDisks(virConnectPtr co
const char *src = NULL;
const char *dst = NULL;
const char *mode = NULL;
+ int bootable;
/* Again dealing with (vbd...) vs (tap ...) differences */
if (sexpr_lookup(node, "device/vbd")) {
src = sexpr_node(node, "device/vbd/uname");
dst = sexpr_node(node, "device/vbd/dev");
mode = sexpr_node(node, "device/vbd/mode");
+ bootable = sexpr_int(node, "device/vbd/bootable");
} else if (sexpr_lookup(node, "device/tap")) {
src = sexpr_node(node, "device/tap/uname");
dst = sexpr_node(node, "device/tap/dev");
mode = sexpr_node(node, "device/tap/mode");
+ bootable = sexpr_int(node, "device/tap/bootable");
} else {
src = sexpr_node(node, "device/tap2/uname");
dst = sexpr_node(node, "device/tap2/dev");
mode = sexpr_node(node, "device/tap2/mode");
+ bootable = sexpr_int(node, "device/tap2/bootable");
}
if (VIR_ALLOC(disk) < 0)
@@ -1749,8 +1753,13 @@ xenDaemonParseSxprDisks(virConnectPtr co
if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0)
goto no_memory;
-
- def->disks[def->ndisks++] = disk;
+
+ if (bootable == 1 && def->ndisks > 0) {
+ memmove(def->disks + 1, def->disks, sizeof(def->disks) * def->ndisks);
+ def->disks[0] = disk;
+ def->ndisks++;
+ } else
+ def->disks[def->ndisks++] = disk;
disk = NULL;
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package kaffeine for openSUSE:Factory
checked in at Mon Mar 22 17:05:22 CET 2010.
--------
--- KDE/kaffeine/kaffeine.changes 2010-03-11 17:18:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/kaffeine/kaffeine.changes 2010-03-21 22:15:01.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Mar 21 22:08:25 CET 2010 - jslaby(a)suse.de
+
+- add libqt4-sql-sqlite to Requires
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kaffeine.spec ++++++
--- /var/tmp/diff_new_pack.Pq3HW8/_old 2010-03-22 17:05:03.000000000 +0100
+++ /var/tmp/diff_new_pack.Pq3HW8/_new 2010-03-22 17:05:03.000000000 +0100
@@ -26,7 +26,7 @@
Group: Productivity/Multimedia/Video/Players
Summary: Xine-Based Multimedia Player
Version: 0.9+1.0pre3
-Release: 1
+Release: 2
%define rversion 1.0-pre3
# http://kaffeine.kde.org/?q=node/22
Source0: kaffeine-%rversion.tar.gz
@@ -34,6 +34,7 @@
Patch1: fix_plasma_startup_error.diff
Patch2: kaffeine-1.0-pre3-include_mkfifo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: libqt4-sql-sqlite
%kde4_runtime_requires
%description
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package installation-images for openSUSE:Factory
checked in at Mon Mar 22 17:04:51 CET 2010.
--------
--- installation-images/installation-images.changes 2010-03-22 11:39:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2010-03-22 12:47:47.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 22 12:47:35 CET 2010 - snwint(a)suse.de
+
+- fix rescue system reboot (bnc #555825)
+- create VERSION and changelog from git repo
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
installation-images-12.41.tar.bz2
needed_space_in_mb
new.diff
New:
----
installation-images-12.42.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.BTbDV4/_old 2010-03-22 17:04:05.000000000 +0100
+++ /var/tmp/diff_new_pack.BTbDV4/_new 2010-03-22 17:04:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package installation-images (Version 12.41)
+# spec file for package installation-images (Version 12.42)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -103,10 +103,9 @@
Obsoletes: y2image
AutoReqProv: off
Summary: Installation Image Files
-Version: 12.41
-Release: 2
-Source: installation-images-12.41.tar.bz2
-Patch0: new.diff
+Version: 12.42
+Release: 1
+Source: installation-images-12.42.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@@ -176,7 +175,6 @@
%prep
%setup
-%patch0 -p1
rm -f /usr/lib/build/checks/04-check-filelist
%build
++++++ installation-images-12.41.tar.bz2 -> installation-images-12.42.tar.bz2 ++++++
++++ 5576 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
Hello community,
here is the log from the commit of package guile for openSUSE:Factory
checked in at Mon Mar 22 17:03:48 CET 2010.
--------
--- guile/guile.changes 2010-01-26 19:44:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/guile/guile.changes 2010-03-22 12:45:56.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar 22 12:39:55 CET 2010 - pgajdos(a)suse.cz
+
+- fixed build with new gcc
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
guile-gcc.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ guile.spec ++++++
--- /var/tmp/diff_new_pack.5KWwbS/_old 2010-03-22 17:03:29.000000000 +0100
+++ /var/tmp/diff_new_pack.5KWwbS/_new 2010-03-22 17:03:29.000000000 +0100
@@ -23,7 +23,7 @@
Group: Development/Languages/Scheme
AutoReqProv: on
Version: 1.8.7
-Release: 2
+Release: 3
Summary: GNU's Ubiquitous Intelligent Language for Extension
Url: http://www.gnu.org/software/guile/
Source0: %{name}-%{version}.tar.bz2
@@ -31,6 +31,7 @@
Patch2: %{name}-1.6.10-mktemp.patch
Patch3: %{name}-popen-test.patch
Patch4: %{name}-testsuite-build.patch
+Patch5: %{name}-gcc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: fileutils sh-utils
PreReq: %install_info_prereq
@@ -90,6 +91,7 @@
%patch2
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# guile-1.8.1: The code is not so good for -Werror (unused results of write()).
sed -i s/-Werror// configure.in configure
# force rebuild with non-broken makeinfo
++++++ guile-gcc.patch ++++++
Index: guile-1.8.7/libguile/guile-snarf-docs.in
===================================================================
--- guile-1.8.7.orig/libguile/guile-snarf-docs.in
+++ guile-1.8.7/libguile/guile-snarf-docs.in
@@ -23,4 +23,4 @@ bindir=`dirname $0`
## Let the user override the preprocessor autoconf found.
test -n "${CPP+set}" || CPP="@CPP@"
-${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
+${CPP} -P -DSCM_MAGIC_SNARF_DOCS "$@"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package dicts for openSUSE:Factory
checked in at Mon Mar 22 16:55:10 CET 2010.
--------
--- dicts/dicts.changes 2010-01-10 20:19:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/dicts/dicts.changes 2010-03-16 18:37:45.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Mar 16 18:36:59 CET 2010 - werner(a)suse.de
+
+- Remove igerman98 as we have now an own package (bnc#547549)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
igerman98-20091006.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dicts.spec ++++++
--- /var/tmp/diff_new_pack.28tdiK/_old 2010-03-22 16:54:58.000000000 +0100
+++ /var/tmp/diff_new_pack.28tdiK/_new 2010-03-22 16:54:58.000000000 +0100
@@ -24,7 +24,7 @@
Group: Productivity/Text/Spell
AutoReqProv: on
Version: 1.5
-Release: 390
+Release: 391
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Ispell Dictionary Files
#
@@ -50,7 +50,6 @@
Source14: rus-ispell.tar.bz2
Source15: eo-spell.tar.bz2
Source16: slovensko.tar.bz2
-Source17: igerman98-20091006.tar.bz2
Source18: br.ispell-2.4.tar.bz2
Source19: finnish.tar.bz2
Source20: estonian.tar.bz2
@@ -62,12 +61,6 @@
for German (already compiled for ispell in package ispell-german)
-for New German (already compiled for ispell in package ispell-ngerman)
-
-for New Swiss (already compiled for ispell in package ispell-nswiss)
-
-for New Austrian (already compiled for ispell in package ispell-naustrian)
-
for Danish (already compiled for ispell in package ispell-danish)
for Spanish (already compiled for ispell in package
@@ -132,54 +125,6 @@
--------
Heinz Knutzen <hk(a)informatik.uni-kiel.d400.de>
-%package -n ispell-nswiss
-License: GPLv2+
-Summary: New Swiss ispell dictionary
-Group: Productivity/Text/Spell
-Provides: ispell_dictionary inswiss locale(ispell:de_CH)
-Obsoletes: inswiss
-AutoReqProv: on
-
-%description -n ispell-nswiss
-This packages includes a ready swiss dictionary for ispell according
-the new spelling rules. The name of the dictonary is swiss to be able
-to distinguish it from those of the german packages. A short usage
-description is given in /usr/share/doc/packages/ispell/README of the
-packages ispell. The sources for this dictionary are included in the
-package dicts.
-
-%package -n ispell-naustrian
-License: GPLv2+
-Summary: New Austrian ispell dictionary
-Group: Productivity/Text/Spell
-Provides: ispell_dictionary inaustrian locale(ispell:de_AT)
-Obsoletes: inswiss
-AutoReqProv: on
-
-%description -n ispell-naustrian
-This packages includes a ready austrian dictionary for ispell according
-the new spelling rules. The name of the dictonary is swiss to be able
-to distinguish it from those of the german packages. A short usage
-description is given in /usr/share/doc/packages/ispell/README of the
-packages ispell. The sources for this dictionary are included in the
-package dicts.
-
-%package -n ispell-ngerman
-License: BSD3c(or similar) ; GPLv2+
-Summary: New German ispell dictionary
-Group: Productivity/Text/Spell
-Provides: ispell_dictionary ingerman locale(ispell:de;de_DE)
-Obsoletes: ingerman
-AutoReqProv: on
-
-%description -n ispell-ngerman
-This packages includes a ready german dictionary for ispell according
-the new spelling rules. The name of the dictonary is german to be able
-to distinguish it from those of the package igerman. A short usage
-description is given in /usr/share/doc/packages/ispell/README of the
-packages ispell. The sources for this dictionary are included in the
-package dicts.
-
%package -n ispell-danish
License: GPLv2+
Summary: Danish ispell dictionary
@@ -463,29 +408,6 @@
/usr/lib/ispell/deutschmed.hash
%doc /usr/share/doc/packages/ispell-german/
-%files -n ispell-ngerman
-%defattr(-, root, root)
-/usr/bin/rmligs
-%doc %{_mandir}/man1/rmligs.1.gz
-/usr/lib/ispell/emacs/german.el
-/usr/lib/ispell/german.aff
-/usr/lib/ispell/german.hash
-%doc /usr/share/doc/packages/ispell-ngerman/
-
-%files -n ispell-nswiss
-%defattr(-, root, root)
-/usr/lib/ispell/emacs/swiss.el
-/usr/lib/ispell/swiss.aff
-/usr/lib/ispell/swiss.hash
-%doc /usr/share/doc/packages/ispell-nswiss/
-
-%files -n ispell-naustrian
-%defattr(-, root, root)
-/usr/lib/ispell/emacs/austrian.el
-/usr/lib/ispell/austrian.aff
-/usr/lib/ispell/austrian.hash
-%doc /usr/share/doc/packages/ispell-naustrian/
-
%files -n ispell-danish
%defattr(-, root, root)
/usr/lib/ispell/emacs/dansk.el
++++++ prepare-dicts.dif ++++++
--- /var/tmp/diff_new_pack.28tdiK/_old 2010-03-22 16:54:59.000000000 +0100
+++ /var/tmp/diff_new_pack.28tdiK/_new 2010-03-22 16:54:59.000000000 +0100
@@ -1,6 +1,6 @@
--- Makefile.Linux
+++ Makefile.Linux 2006-04-12 17:34:50.000000000 +0200
-@@ -0,0 +1,249 @@
+@@ -0,0 +1,241 @@
+#
+#
+#
@@ -15,7 +15,6 @@
+
+DICTDIR = /usr/src/dicts
+DEUTSCH = hk2-deutsch
-+GERMAN = igerman98-20091006
+FRANCAIS = francais-IREQ-1.4
+DANSK = idanish-1.2.1
+ESPANOL = espa~nol-1.5
@@ -43,7 +42,6 @@
+# to avoid trouble with a changed MASKBITS size.
+#
+extract: $(DEUTSCH)/.touch \
-+ $(GERMAN)/.touch \
+ $(FRANCAIS)/.touch \
+ $(DANSK)/.touch \
+ $(ESPANOL)/.touch \
@@ -81,12 +79,6 @@
+ cd $(DEUTSCH)/ && touch Makefile
+ @touch $@
+
-+$(GERMAN)/.touch: ../$(GERMAN).tar.bz2
-+ tar xjf $< -C ./
-+ cd $(GERMAN)/ && mv ispell/de_DE.aff.in ispell/de_DE.aff.in-bj
-+ cd $(GERMAN)/ && touch Makefile
-+ @touch $@
-+
+$(FRANCAIS)/.touch: ../$(FRANCAIS).tar.bz2
+ mkdir -p $(FRANCAIS)
+ tar xjf $< -C ./$(FRANCAIS)/
@@ -252,7 +244,7 @@
+dummy:
--- README.dicts
+++ README.dicts 2006-04-12 17:34:50.000000000 +0200
-@@ -0,0 +1,58 @@
+@@ -0,0 +1,56 @@
+
+ Readme for dicts
+ ================
@@ -266,7 +258,6 @@
+ espa~nol-1.5
+ francais-IREQ-1.4
+ hk2-deutsch
-+ igerman98-20091006
+ ispell-czech-20020628
+ idanish-1.2.1
+ ispell-norsk-2.0
@@ -296,7 +287,6 @@
+ espa~nol-1.5
+ francais-IREQ-1.4
+ hk2-deutsch
-+ igerman98-20091006
+ ispell-czech-20020628
+ idanish-1.2.1
+ ispell-norsk-2.0
@@ -1478,179 +1468,6 @@
suffixes
---- igerman98-20091006/LC_CTYPE
-+++ igerman98-20091006/LC_CTYPE 2006-04-12 17:34:50.000000000 +0200
-@@ -0,0 +1 @@
-+de_DE.ISO-8859-1
---- igerman98-20091006/Makefile
-+++ igerman98-20091006/Makefile 2009-10-19 14:47:53.275429305 +0200
-@@ -4,6 +4,22 @@
- #
- # Copyright: GNU GPLv2 and GPLv3
-
-+##
-+## SuSE stuff
-+##
-+
-+MAKE_SORTTMP = -T /var/tmp
-+SORT = sort -u -t/ -k 1f,1 -k 1 $(MAKE_SORTTMP)
-+FIX8BIT = ../fix8bit
-+PACKNAME = ispell-ngerman
-+SPACKNAME = ispell-nswiss
-+APACKNAME = ispell-naustrian
-+DOCDIR = /usr/share/doc/packages/$(PACKNAME)
-+SDOCDIR = /usr/share/doc/packages/$(SPACKNAME)
-+ADOCDIR = /usr/share/doc/packages/$(APACKNAME)
-+MANDIR = /usr/share/man/man1
-+LIBDIR = $(shell ispell -vv|grep LIBDIR|sed "s/.*\=//;s/^ //g" |tr -d \")
-+
- LANGS=de_DE de_AT de_CH
- LANGS2=$(LANGS) de_all
- DATE=`date +%Y%m%d`
-@@ -11,16 +25,8 @@ VERSION=`cat VERSION`
- VERSION_EXTRA=$(shell find . -name "VERSION.*" -print | while read i ; do echo -n "+"; head -1 "$$i" | tr -d "\n" ; done)
- VERSION_STRING=$(VERSION)$(VERSION_EXTRA) (build $(DATE))
-
--all:
-- @echo "A default make target doesn't exist. You might want to use one of those:"
-- @echo " make hunspell/de_DE.dic hunspell/de_DE.aff (or de_AT or de_CH)"
-- @echo " make myspell/de_DE.dic myspell/de_DE.aff (or de_AT or de_CH)"
-- @echo " make ispell/de_DE.aff ispell/de_DE.hash (or de_AT, de_CH ...)"
-- @echo " make aspell/de_DE.rws (or de_AT, de_CH ...)"
-- @echo " make ligature/rmligs"
-- @echo " make isowordlist-de_DE (or de_AT, de_CH ...)"
-- @echo "Did I forget an important one ?-)"
--
-+all: ispell/de_DE.aff ispell/de_DE.hash ispell/de_AT.aff ispell/de_AT.hash ispell/de_CH.aff ispell/de_CH.hash ligature/rmligs
-+install: german-install swiss-install austrian-install rmligs-install
-
-
- #MYLANG = $(shell echo -n $@ | sed "s/^.*_\(de_.*$$\)/\1/")
-@@ -49,13 +54,52 @@ WORDS_BLACKLISTS_$(1) = $$(shell $$(FIND
- endef
- $(foreach langcode,$(LANGS2),$(eval $(call WORDS_define_template,$(langcode))))
-
--ISPELLIBDIR = $$($(ISPELL) -vv |grep "LIBDIR" |$(SED) "s/.*\=//" |tr -d \")
-+ISPELLIBDIR = $$($(ISPELL) -vv |grep "LIBDIR" |$(SED) "s/.*\=//;s/^ //g" |tr -d \")
- DESTDIR =
-+
-+german-install: ispell/de_DE.aff ispell/de_DE.hash
-+ mkdir -p $(DESTDIR)$(ISPELLIBDIR)
-+ cp ispell/de_DE.aff $(DESTDIR)$(ISPELLIBDIR)/german.aff
-+ cp ispell/de_DE.hash $(DESTDIR)$(ISPELLIBDIR)/german.hash
-+ mkdir -p $(DESTDIR)$(DOCDIR)
-+ cp Documentation/README $(DESTDIR)$(DOCDIR)/
-+ cp Documentation/Copyright $(DESTDIR)$(DOCDIR)/
-+ cp Documentation/GPL2 $(DESTDIR)$(DOCDIR)/
-+ cp Documentation/Changes $(DESTDIR)$(DOCDIR)/
-+
-+swiss-install: ispell/de_CH.aff ispell/de_CH.hash
-+ mkdir -p $(DESTDIR)$(ISPELLIBDIR)
-+ mkdir -p $(DESTDIR)$(SDOCDIR)
-+ cp ispell/de_CH.aff $(DESTDIR)$(ISPELLIBDIR)/swiss.aff
-+ cp ispell/de_CH.hash $(DESTDIR)$(ISPELLIBDIR)/swiss.hash
-+ cp Documentation/README.swiss $(DESTDIR)$(SDOCDIR)/README
-+ cp Documentation/Copyright $(DESTDIR)$(SDOCDIR)/
-+ cp Documentation/GPL2 $(DESTDIR)$(SDOCDIR)/
-+ cp Documentation/Changes $(DESTDIR)$(SDOCDIR)/
-+
-+austrian-install: ispell/de_AT.aff ispell/de_AT.hash
-+ mkdir -p $(DESTDIR)$(ISPELLIBDIR)
-+ cp ispell/de_AT.aff $(DESTDIR)$(ISPELLIBDIR)/austrian.aff
-+ cp ispell/de_AT.hash $(DESTDIR)$(ISPELLIBDIR)/austrian.hash
-+ mkdir -p $(DESTDIR)$(ADOCDIR)
-+ cp Documentation/README $(DESTDIR)$(ADOCDIR)/
-+ cp Documentation/Copyright $(DESTDIR)$(ADOCDIR)/
-+ cp Documentation/GPL2 $(DESTDIR)$(ADOCDIR)/
-+ cp Documentation/Changes $(DESTDIR)$(ADOCDIR)/
-+
-+rmligs-install: ligature/rmligs
-+ mkdir -p $(DESTDIR)/usr/bin
-+ install -m 0755 ligature/rmligs $(DESTDIR)/usr/bin/
-+ mkdir -p $(DESTDIR)$(DOCDIR)
-+ cp Documentation/README.ligatures $(DESTDIR)$(DOCDIR)/
-+ mkdir -p $(DESTDIR)$(MANDIR)
-+ cp ligature/rmligs.1 $(DESTDIR)$(MANDIR)/
-+
- # make might have to be GNU make,
- # please report problems with other make versions to me.
- MAKE = make
- FIND = find
--SORT = sort
-+#SORT = sort
- TAR = tar
- SED = sed
- NL = nl
-@@ -129,6 +165,9 @@ LC_COLLATE=C
- ## Ispell stuff:
- ###
-
-+ispell/de_DE.aff.in: ispell/de_DE.aff.in-bj $(FIX8BIT)
-+ $(FIX8BIT) -8 < ispell/de_DE.aff.in-bj > ispell/de_DE.aff.in
-+
- ispell/de_AT.aff ispell/de_DE.aff: ispell/de_DE.aff.in
- $(CP) ispell/de_DE.aff.in $@
-
-@@ -142,9 +181,10 @@ ispell/$(1).hash: ispell/$(1).aff all.wo
- $(BUILDHASH) all.words.munch.$(1).tmp ./ispell/$(1).aff $$@
-
- all.words.$(1).tmp: $$(WORDS_$(1)) $$(WORDS_de_all) dicts/abkuerzpunkt.txt
-+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \
- $(SED) "s/qq//g;s/\.//;s/\-.*//" dicts/abkuerzpunkt.txt $$(WORDS_$(1)) $$(WORDS_de_all) \
- | (test -e ./bin/conv_dict_$(1) && ./bin/conv_dict_$(1) || cat) \
-- | grep -v "\/.*d" | grep -v "##" | $(SED) "s/#.*//" | ./bin/myspellfixprefix.pl | $(SORT) -u > $$@
-+ | grep -v "\/.*d" | grep -v "##" | $(SED) "s/#.*//" | ./bin/myspellfixprefix.pl | $(SORT) > $$@
-
- all.words.munch.$(1).tmp: all.words.$(1).tmp ispell/$(1).aff
- @# the munched way to overcome "Hash table overflowed by xxxx words" error:
-@@ -157,7 +197,8 @@ ispell/$(1)_null.hash: ispell/$(1)_null.
- $(BUILDHASH) all.words.placebo.tmp ispell/$(1)_null.aff $$@
-
- isowordlist-$(1): $(AFFIX_EXPAND_PREREQ) all.words.$(MUNCH_PFX)$(1).tmp
-- $(AFFIX_EXPAND_COMMAND) < all.words.$(MUNCH_PFX)$(1).tmp |tr ' ' '\n' |$(SED) -f ./bin/dic2iso | $(SORT) -u > $$@
-+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \
-+ $(AFFIX_EXPAND_COMMAND) < all.words.$(MUNCH_PFX)$(1).tmp |tr ' ' '\n' |$(SED) -f ./bin/dic2iso | $(SORT) > $$@
-
- endef
- $(foreach langcode,$(LANGS),$(eval $(call LANG_ispell_dict_template,$(langcode))))
-@@ -395,23 +436,25 @@ ispell/liglist_null.hash: ispell/liglist
- $(BUILDHASH) all.words.placebo.tmp ispell/$(1)_null.aff $$@
-
- all.words.liglist.tmp: $(foreach langcode,$(LANGS2),$(WORDS_$(langcode)))
-+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \
- $(SED) "s/\.//" $(foreach langcode,$(LANGS2),$(WORDS_$(langcode))) | \
- grep -v "\/.*d" | grep -v "##" | $(SED) "s/#.*//" | \
-- $(SORT) -u > $$@
-+ $(SORT) > $$@
-
-
- liglist.tmp: $(AFFIX_EXPAND_PREREQ) all.words.liglist.tmp
-+ LC_CTYPE=de_DE.ISO-8859-1 ; export LC_CTYPE ; \
- cat ligature/oldspell.liglist all.words.liglist.tmp \
- | $(AFFIX_EXPAND_COMMAND) \
- | tr \ '\n' \
- | grep qq \
-- | $(SORT) -u \
-+ | $(SORT) \
- | $(SED) 's/fqqf/f\|f/g;s/fqql/f\|l/g;s/fqqi/f\|i/g' \
- | grep \| \
- | $(SED) s/qq//g \
- | $(SED) -f ./bin/dic2iso \
- | tr A-Z a-z \
-- | $(SORT) -u \
-+ | $(SORT) \
- > $$@
-
- ligature/rmligs: liglist.tmp ligature/rmligs.skel
-@@ -442,7 +485,7 @@ clean:
- sort:
- @if grep [�������] dicts/*.txt ;then echo "!!! illegal ISO-8859-1 characters in dictionary files !!!";exit 1;fi
- @if LC_ALL=de_DE.UTF-8 grep [`echo -n "�������"|iconv -f iso8859-1 -t utf-8`] dicts/*.txt ;then echo "!!! illegal UTF-8 characters in dictionary files !!!";exit 1;fi
-- $(FIND) ./dicts/ -name "*.txt" -print -o -name "blacklist*" -print | while read i; do $(SORT) -u -o "$$i" "$$i"; done
-+ $(FIND) ./dicts/ -name "*.txt" -print -o -name "blacklist*" -print | while read i; do $(SORT) -o "$$i" "$$i"; done
-
- pack: sort
- exit 1
--- ispell-czech/LC_CTYPE
+++ ispell-czech/LC_CTYPE 2006-04-12 17:34:50.000000000 +0200
@@ -0,0 +1 @@
@@ -2877,29 +2694,6 @@
# Plain LaTeX files
#
altstringtype "latex" "tex" ".tex" ".bib"
---- suse/emacs/austrian.el
-+++ suse/emacs/austrian.el 2007-11-28 13:53:04.789147533 +0100
-@@ -0,0 +1,20 @@
-+;; Used by ispell-emacs-menu.el
-+;; Do *not* byte-compile this file because its loaded by both emacs and xemacs
-+
-+(append-ispell-dict-alist "austrian.hash"
-+ '("austrian-babel"
-+ "[a-zA-Z\"]"
-+ "[^a-zA-Z\"]" "[']" t ("-C" "-d" "austrian") "~tex" nil))
-+
-+(append-ispell-dict-alist "austrian.hash"
-+ '("austrian"
-+ "[a-zA-Z\304\326\334\344\366\337\374]"
-+ "[^a-zA-Z\304\326\334\344\366\337\374]"
-+ "[']" t ("-C" "-d" "austrian") "~latin1" iso-latin-1))
-+
-+(append-ispell-dict-alist "austrian.hash"
-+ '("austrian-utf8"
-+ "[a-zA-Z\303\204\303\226\303\234\303\244\303\266\303\237\303\274]"
-+ "[^a-zA-Z\303\204\303\226\303\234\303\244\303\266\303\237\303\274]"
-+ "[']" t ("-C" "-d" "austrian") "~utf8" utf-8))
-+
--- suse/emacs/brazilian.el
+++ suse/emacs/brazilian.el 2007-11-28 13:54:24.391250588 +0100
@@ -0,0 +1,21 @@
@@ -3148,29 +2942,6 @@
+ "[^[:alpha:]]"
+ "[---']" t ("-d" "francais") "~utf8" utf-8))
+
---- suse/emacs/german.el
-+++ suse/emacs/german.el 2007-11-28 13:53:04.789147533 +0100
-@@ -0,0 +1,20 @@
-+;; Used by ispell-emacs-menu.el
-+;; Do *not* byte-compile this file because its loaded by both emacs and xemacs
-+
-+(append-ispell-dict-alist "german.hash"
-+ '("german-babel"
-+ "[a-zA-Z\"]"
-+ "[^a-zA-Z\"]" "[']" t ("-C" "-d" "german") "~tex" nil))
-+
-+(append-ispell-dict-alist "german.hash"
-+ '("german"
-+ "[a-zA-Z\304\326\334\344\366\337\374]"
-+ "[^a-zA-Z\304\326\334\344\366\337\374]"
-+ "[']" t ("-C" "-d" "german") "~latin1" iso-latin-1))
-+
-+(append-ispell-dict-alist "german.hash"
-+ '("german-utf8"
-+ "[a-zA-Z\303\204\303\226\303\234\303\244\303\266\303\237\303\274]"
-+ "[^a-zA-Z\303\204\303\226\303\234\303\244\303\266\303\237\303\274]"
-+ "[']" t ("-C" "-d" "german") "~utf8" utf-8))
-+
--- suse/emacs/italian.el
+++ suse/emacs/italian.el 2007-11-28 14:14:57.943847723 +0100
@@ -0,0 +1,21 @@
@@ -3362,29 +3133,6 @@
+ "[^[:alpha:]]"
+ "[']" nil ("-C" "-d" "svenska") "~utf8" utf-8))
+
---- suse/emacs/swiss.el
-+++ suse/emacs/swiss.el 2007-11-28 14:25:30.772209590 +0100
-@@ -0,0 +1,20 @@
-+;; Used by ispell-emacs-menu.el
-+;; Do *not* byte-compile this file because its loaded by both emacs and xemacs
-+
-+(append-ispell-dict-alist "swiss.hash"
-+ '("swiss-babel"
-+ "[a-zA-Z\"]"
-+ "[^a-zA-Z\"]" "[']" t ("-C" "-d" "swiss") "~tex" nil))
-+
-+(append-ispell-dict-alist "swiss.hash"
-+ '("swiss"
-+ "[a-zA-Z\304\326\334\344\366\337\374]"
-+ "[^a-zA-Z\304\326\334\344\366\337\374]"
-+ "[']" t ("-C" "-d" "swiss") "~latin1" iso-latin-1))
-+
-+(append-ispell-dict-alist "swiss.hash"
-+ '("swiss-utf8"
-+ "[a-zA-Z\303\204\303\226\303\234\303\244\303\266\303\237\303\274]"
-+ "[^a-zA-Z\303\204\303\226\303\234\303\244\303\266\303\237\303\274]"
-+ "[']" t ("-C" "-d" "swiss") "~utf8" utf-8))
-+
--- suse/emacs/template.el
+++ suse/emacs/template.el 2007-11-28 14:47:56.791132993 +0100
@@ -8,8 +8,14 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
Hello community,
here is the log from the commit of package compiz for openSUSE:Factory
checked in at Mon Mar 22 16:54:03 CET 2010.
--------
--- compiz/compiz.changes 2010-02-15 13:27:57.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes 2010-03-22 14:21:42.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar 22 13:03:55 UTC 2010 - dimstar(a)opensuse.org
+
+- Add compiz-gtk2.19.7.patch to fix build with newer gtk.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
compiz-gtk2.19.7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.o74OhR/_old 2010-03-22 16:53:42.000000000 +0100
+++ /var/tmp/diff_new_pack.o74OhR/_new 2010-03-22 16:53:42.000000000 +0100
@@ -75,7 +75,7 @@
Enhances: xgl >= git_070104
%endif
Version: 0.8.4
-Release: 3
+Release: 4
Summary: OpenGL window and compositing manager
# To be nuked: MesaLib, patch60 $mesagl
Source: compiz-%version.tar.bz2
@@ -94,6 +94,8 @@
Patch4: kde-auto-comp.diff
# PATCH-FIX-UPSTREAM compiz-kde44.patch dimstar(a)opensuse.org -- Taken from upstream git commit 04c6a4.
Patch5: compiz-kde44.patch
+# PATCH-FIx-UPSTREAM compiz-gtk2.19.7.patch dimstar(a)opensuse.org -- Fix build with newer gtk. Taken from upstream git.
+Patch6: compiz-gtk2.19.7.patch
Requires: compiz-branding = %{version}
Requires: compiz-decorator = %{version}
Provides: windowmanager
@@ -261,6 +263,7 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
./autogen.sh
++++++ compiz-gtk2.19.7.patch ++++++
>From c717c27311c8cab8e5a8b4a59b1488a484951cce Mon Sep 17 00:00:00 2001
From: Colin Guthrie <git(a)colin.guthr.ie>
Date: Fri, 12 Mar 2010 23:28:53 +0000
Subject: gtk-decorator: Replace deprecated GTK_WIDGET_VISIBLE symbol
---
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index 61e60f7..18b907e 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -4233,7 +4233,7 @@ show_tooltip (const char *text)
static void
hide_tooltip (void)
{
- if (GTK_WIDGET_VISIBLE (tip_window))
+ if (gtk_widget_get_visible (tip_window))
g_get_current_time (&tooltip_last_popdown);
gtk_widget_hide (tip_window);
--
cgit v0.8.3.1-30-gff3a
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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