September 2010 - openSUSE Commits - openSUSE Mailing Lists

commit wodim for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package wodim for openSUSE:Factory checked in at Tue Sep 28 22:55:08 CEST 2010. -------- --- wodim/wodim.changes 2010-02-22 23:00:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/wodim/wodim.changes 2010-09-28 12:36:53.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Sep 28 10:32:53 UTC 2010 - reddwarf(a)opensuse.org + +- updated to 1.1.10: + * genisoimage: add support for sha256 and sha512 checksum generation + when making jigdo files. + * genisoimage: checksumming with lots of algorithms can be very + time-consuming, so split it out into multiple threads if possible. + * genisoimage: allow user to specify which checksum algorithms to run + on the command line. + * Fix FTBFS with missing xconfig.h. Thanks to Matt Kraai for the patch. + * genisoimage: fix string overflow breakage when using the -root + option (https://bugzilla.redhat.com/show_bug.cgi?id=508449) + * librols: remove or rename several functions that clash with POSIX. + Fix up callers. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cdrkit-1.1.9-glibc-2.10.patch cdrkit-1.1.9.tar.bz2 New: ---- _service _service:download_url:cdrkit-1.1.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wodim.spec ++++++ --- /var/tmp/diff_new_pack.D4TcjK/_old 2010-09-28 22:53:33.000000000 +0200 +++ /var/tmp/diff_new_pack.D4TcjK/_new 2010-09-28 22:53:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wodim (Version 1.1.9) +# spec file for package wodim (Version 1.1.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,19 +20,18 @@ Name: wodim BuildRequires: cmake file-devel gcc-c++ libcap-devel zlib-devel -License: GPLv2 ; GPLv2+ +License: GPLv2+ Group: Productivity/Multimedia/CD/Record PreReq: permissions /bin/cp AutoReqProv: on -Version: 1.1.9 -Release: 4 -Source: cdrkit-%{version}.tar.bz2 +Version: 1.1.10 +Release: 1 +Source: cdrkit-%{version}.tar.gz Source1: scan_scsi.linux Source2: cdinfo.c Source5: README.SUSE -Patch1: cdrkit-%{version}-cmake.patch +Patch1: cdrkit-1.1.9-cmake.patch Patch2: genisoimage-multi-extent.patch -Patch3: cdrkit-%{version}-glibc-2.10.patch Patch4: cdrkit-1.1.9-zlib-check.patch Patch5: cdrkit-1.1.9-fix-buffer-overflows.patch Url: http://cdrkit.org/ @@ -141,7 +140,6 @@ %setup -q -n cdrkit-%{version} %patch1 %patch2 -%patch3 -p1 %patch4 %patch5 -p1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine-gecko for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package wine-gecko for openSUSE:Factory checked in at Tue Sep 28 22:53:17 CEST 2010. -------- --- wine-gecko/wine-gecko.changes 2009-11-13 16:00:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/wine-gecko/wine-gecko.changes 2010-09-25 10:04:23.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 25 08:01:41 UTC 2010 - meissner(a)novell.com + +- updated to 1.1.0 version for Wine 1.3.2 and later + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wine_gecko-1.0.0-x86.cab New: ---- wine_gecko-1.1.0-x86.cab ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine-gecko.spec ++++++ --- /var/tmp/diff_new_pack.Ggs2NW/_old 2010-09-28 22:53:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Ggs2NW/_new 2010-09-28 22:53:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wine-gecko (Version 1.0.0) +# spec file for package wine-gecko (Version 1.1.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ License: MPL 1.1 or later Group: Development/Tools/Other AutoReqProv: on -Summary: A Friendly Greeting Program -Version: 1.0.0 +Summary: The Wine specific Gecko HTML rendering engine +Version: 1.1.0 Release: 1 Source0: http://downloads.sourceforge.net/wine/wine_gecko-%{version}-x86.cab # Source of this CAB is at: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at Tue Sep 28 22:52:51 CEST 2010. -------- --- wine/wine.changes 2010-09-15 15:25:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/wine/wine.changes 2010-09-27 14:43:38.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Sep 20 13:11:42 CEST 2010 - meissner(a)suse.de + +- Updated to 1.3.3 development snapshot + - Improved support for right-to-left text. + - Support for CMYK JPEG images. + - Beginnings of a Game Explorer implementation. + - Improved 64-bit support in MSI. + - Stub inetcpl control panel applet. + - A number of fixes to crypto support. + - Translation updates. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- @@ -4,0 +19,38 @@ + +------------------------------------------------------------------- +Mon Sep 6 12:55:46 CEST 2010 - meissner(a)suse.de + +- Updated to 1.3.2 development snapshot + - Update of the Gecko engine, now including a 64-bit version. + - New implementation of console support on Unix terminals. + - Many new functions in the C runtime dlls. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- +Sun Aug 22 12:51:50 CEST 2010 - meissner(a)suse.de + +- Updated to 1.3.1 development snapshot + - Support for drag & drop between X11 and OLE. + - New ipconfig.exe builtin tool. + - Support for favorites in builtin Internet Explorer. + - Beginnings of a shell Explorer control. + - A number of DirectDraw code cleanups. + - Improvements to the calendar control. + - Various bug fixes. + +------------------------------------------------------------------- +Sun Aug 1 16:31:57 CEST 2010 - meissner(a)suse.de + +- Updated to 1.3.0 development snapshot + - Beginnings of a user interface for the builtin Internet Explorer. + - Support for cross-process OLE drag & drop. + - New builtin wscript.exe (Windows Script Host) program. + - Open/save dialogs remember the last used directory. + - Translation updates. + - Various bug fixes. +- updated winetricks + - various new loaders + - bugfixes +- updated wisotool + - lots of fixes calling whatdependson for head-i586 Old: ---- wine-1.2.tar.bz2 New: ---- susepatches.patch wine-1.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.TViZdH/_old 2010-09-28 22:51:46.000000000 +0200 +++ /var/tmp/diff_new_pack.TViZdH/_new 2010-09-28 22:51:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 1.2) +# spec file for package wine (Version 1.3.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,16 +27,19 @@ License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.2 -Release: 2 +Version: 1.3.3 +Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com +# vanilla Wine release Source0: wine-%version.tar.bz2 Source1: http://kegel.com/wine/winetricks Source2: http://kegel.com/wine/wisotool Source3: README.SuSE Source4: wine.desktop Source5: ubuntuwine.tar.bz2 +# SUSE specific patches +Patch0: susepatches.patch Recommends: wine-gecko wine-mp3 Requires: wine-32bit = %version # for winetricks: @@ -91,6 +94,7 @@ %prep %setup -q +%patch0 -p1 # cp %{S:3} . # ++++++ susepatches.patch ++++++ diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 914ccaa..6d0fb5b 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -190,6 +190,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, static const char crlfSep[] = "\r\n"; static const char plusSep[] = " + "; static const char spaceSep[] = " "; + static const char quoteSep[] = "\""; DWORD ret = 0, bytes = 0; BOOL bRet; CERT_NAME_INFO *info; @@ -204,7 +205,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, if (bRet) { DWORD i, j, sepLen, rdnSepLen; - LPCSTR sep, rdnSep; + LPCSTR sep, rdnSep, quote; BOOL reverse = dwStrType & CERT_NAME_STR_REVERSE_FLAG; const CERT_RDN *rdn = info->rgRDN; @@ -222,11 +223,16 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, else rdnSep = plusSep; rdnSepLen = strlen(rdnSep); + if (dwStrType & CERT_NAME_STR_NO_QUOTING_FLAG) + quote = NULL; + else + quote = quoteSep; for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) { for (j = 0; (!psz || ret < csz) && j < rdn->cRDNAttr; j++) { DWORD chars; + int needquote = 0; char prefixBuf[10]; /* big enough for GivenName */ LPCSTR prefix = NULL; @@ -255,13 +261,44 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; } - /* FIXME: handle quoting */ + /* FIXME: quoting still misses " (which is replaced by "") */ chars = CertRDNValueToStrA( rdn->rgRDNAttr[j].dwValueType, &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, psz ? csz - ret : 0); - if (chars) + + /* poor mans memmem(), for , seperation */ + if (psz && quote && chars) { + int xx; + for (xx=0;xx<chars-1;xx++) { + if ((psz[ret+xx] == ',') || + (psz[ret+xx] == ';')) + { + needquote = 1; + break; + } + } + } + if (psz && quote && chars && needquote) { + /* - 1 is needed to account for the null terminator. */ + if (psz && ret < csz - strlen(quote) - 1) + memcpy (psz + ret, quote, strlen(quote)); + ret += strlen(quote); + + chars = CertRDNValueToStrA( + rdn->rgRDNAttr[j].dwValueType, + &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, + psz ? csz - ret : 0); ret += chars - 1; + if (psz && ret < csz - strlen(quote) - 1) + memcpy (psz + ret, quote, strlen(quote)); + ret += strlen(quote); + } else { + if (chars) + ret += chars - 1; + } + + /* FIXME: handle quoting */ if (j < rdn->cRDNAttr - 1) { if (psz && ret < csz - rdnSepLen - 1) @@ -353,6 +390,7 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, static const WCHAR crlfSep[] = { '\r','\n',0 }; static const WCHAR plusSep[] = { ' ','+',' ',0 }; static const WCHAR spaceSep[] = { ' ',0 }; + static const WCHAR quoteSep[] = { '"',0 }; DWORD ret = 0, bytes = 0; BOOL bRet; CERT_NAME_INFO *info; @@ -365,7 +403,7 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, if (bRet) { DWORD i, j, sepLen, rdnSepLen; - LPCWSTR sep, rdnSep; + LPCWSTR sep, rdnSep, quote; BOOL reverse = dwStrType & CERT_NAME_STR_REVERSE_FLAG; const CERT_RDN *rdn = info->rgRDN; @@ -383,11 +421,16 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, else rdnSep = plusSep; rdnSepLen = lstrlenW(rdnSep); + if (dwStrType & CERT_NAME_STR_NO_QUOTING_FLAG) + quote = NULL; + else + quote = quoteSep; for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) { for (j = 0; (!psz || ret < csz) && j < rdn->cRDNAttr; j++) { DWORD chars; + int needquote = 0; LPCSTR prefixA = NULL; LPCWSTR prefixW = NULL; @@ -435,13 +478,43 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; } - /* FIXME: handle quoting */ + /* FIXME: quoting still misses " (which is replaced by "") */ chars = CertRDNValueToStrW( rdn->rgRDNAttr[j].dwValueType, &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, psz ? csz - ret : 0); - if (chars) + + /* poor mans memmem(), for , seperation */ + if (psz && quote && chars) { + int xx; + for (xx=0;xx<chars-1;xx++) { + if ((psz[ret+xx] == ',') || + (psz[ret+xx] == ';')) + { + needquote = 1; + break; + } + } + } + if (psz && quote && chars && needquote) { + /* - 1 is needed to account for the NULL terminator. */ + if (psz && ret < csz - lstrlenW(quote) - 1) + memcpy (psz + ret, quote, lstrlenW(quote) * sizeof(WCHAR)); + ret += lstrlenW(quote); + + chars = CertRDNValueToStrW( + rdn->rgRDNAttr[j].dwValueType, + &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, + psz ? csz - ret : 0); ret += chars - 1; + if (psz && ret < csz - lstrlenW(quote) - 1) + memcpy (psz + ret, quote, lstrlenW(quote) * sizeof(WCHAR)); + ret += lstrlenW(quote); + } else { + if (chars) + ret += chars - 1; + } + if (j < rdn->cRDNAttr - 1) { if (psz && ret < csz - rdnSepLen - 1) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index ebc3342..2549bcc 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -67,12 +67,12 @@ static const BYTE cert[] = 0x73,0x6f,0x74,0x61,0x31,0x14,0x30,0x12,0x6,0x3,0x55,0x4,0x7,0x13,0xb,0x4d, 0x69,0x6e,0x6e,0x65,0x61,0x70,0x6f,0x6c,0x69,0x73,0x31,0x14,0x30,0x12,0x6,0x3, 0x55,0x4,0xa,0x13,0xb,0x43,0x6f,0x64,0x65,0x57,0x65,0x61,0x76,0x65,0x72,0x73, - 0x31,0x19,0x30,0x17,0x6,0x3,0x55,0x4,0xb,0x13,0x10,0x57,0x69,0x6e,0x65,0x20, + 0x31,0x19,0x30,0x17,0x6,0x3,0x55,0x4,0xb,0x13,0x10,0x57,0x69,0x6e,0x65,0x2c, 0x44,0x65,0x76,0x65,0x6c,0x6f,0x70,0x6d,0x65,0x6e,0x74,0x31,0x12,0x30,0x10, 0x6,0x3,0x55,0x4,0x3,0x13,0x9,0x6c,0x6f,0x63,0x61,0x6c,0x68,0x6f,0x73,0x74, 0x31,0x23,0x30,0x21,0x6,0x9,0x2a,0x86,0x48,0x86,0xf7,0xd,0x1,0x9,0x1,0x16, 0x14,0x61,0x72,0x69,0x63,0x40,0x63,0x6f,0x64,0x65,0x77,0x65,0x61,0x76,0x65, - 0x72,0x73,0x2e,0x63,0x6f,0x6d,0x30,0x1e,0x17,0xd,0x30,0x36,0x30,0x31,0x32, + 0x72,0x73,0x3b,0x63,0x6f,0x6d,0x30,0x1e,0x17,0xd,0x30,0x36,0x30,0x31,0x32, 0x35,0x31,0x33,0x35,0x37,0x32,0x34,0x5a,0x17,0xd,0x30,0x36,0x30,0x32,0x32, 0x34,0x31,0x33,0x35,0x37,0x32,0x34,0x5a,0x30,0x81,0xa1,0x31,0xb,0x30,0x9,0x6, 0x3,0x55,0x4,0x6,0x13,0x2,0x55,0x53,0x31,0x12,0x30,0x10,0x6,0x3,0x55,0x4,0x8, @@ -80,11 +80,11 @@ static const BYTE cert[] = 0x3,0x55,0x4,0x7,0x13,0xb,0x4d,0x69,0x6e,0x6e,0x65,0x61,0x70,0x6f,0x6c,0x69, 0x73,0x31,0x14,0x30,0x12,0x6,0x3,0x55,0x4,0xa,0x13,0xb,0x43,0x6f,0x64,0x65, 0x57,0x65,0x61,0x76,0x65,0x72,0x73,0x31,0x19,0x30,0x17,0x6,0x3,0x55,0x4,0xb, - 0x13,0x10,0x57,0x69,0x6e,0x65,0x20,0x44,0x65,0x76,0x65,0x6c,0x6f,0x70,0x6d, + 0x13,0x10,0x57,0x69,0x6e,0x65,0x2c,0x44,0x65,0x76,0x65,0x6c,0x6f,0x70,0x6d, 0x65,0x6e,0x74,0x31,0x12,0x30,0x10,0x6,0x3,0x55,0x4,0x3,0x13,0x9,0x6c,0x6f, 0x63,0x61,0x6c,0x68,0x6f,0x73,0x74,0x31,0x23,0x30,0x21,0x6,0x9,0x2a,0x86,0x48, 0x86,0xf7,0xd,0x1,0x9,0x1,0x16,0x14,0x61,0x72,0x69,0x63,0x40,0x63,0x6f,0x64, - 0x65,0x77,0x65,0x61,0x76,0x65,0x72,0x73,0x2e,0x63,0x6f,0x6d,0x30,0x81,0x9f, + 0x65,0x77,0x65,0x61,0x76,0x65,0x72,0x73,0x3b,0x63,0x6f,0x6d,0x30,0x81,0x9f, 0x30,0xd,0x6,0x9,0x2a,0x86,0x48,0x86,0xf7,0xd,0x1,0x1,0x1,0x5,0x0,0x3,0x81, 0x8d,0x0,0x30,0x81,0x89,0x2,0x81,0x81,0x0,0x9b,0xb5,0x8f,0xaf,0xfb,0x9a,0xaf, 0xdc,0xa2,0x4d,0xb1,0xc8,0x72,0x44,0xef,0x79,0x7f,0x28,0xb6,0xfe,0x50,0xdc, @@ -107,71 +107,71 @@ static const BYTE cert[] = 0x91,0x8a,0xf8,0x5,0xef,0x5b,0x3b,0x49,0xbf,0x5f,0x2b}; static char issuerStr[] = - "US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com"; + "US, Minnesota, Minneapolis, CodeWeavers, \"Wine,Development\", localhost, \"aric@codeweavers;com\""; static char issuerStrSemicolon[] = - "US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com"; + "US; Minnesota; Minneapolis; CodeWeavers; \"Wine,Development\"; localhost; \"aric@codeweavers;com\""; static char issuerStrCRLF[] = - "US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com"; + "US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\n\"Wine,Development\"\r\nlocalhost\r\n\"aric@codeweavers;com\""; static char subjectStr[] = - "2.5.4.6=US, 2.5.4.8=Minnesota, 2.5.4.7=Minneapolis, 2.5.4.10=CodeWeavers, 2.5.4.11=Wine Development, 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com"; + "2.5.4.6=US, 2.5.4.8=Minnesota, 2.5.4.7=Minneapolis, 2.5.4.10=CodeWeavers, 2.5.4.11=\"Wine,Development\", 2.5.4.3=localhost, 1.2.840.113549.1.9.1=\"aric@codeweavers;com\""; static char subjectStrSemicolon[] = - "2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=Wine Development; 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com"; + "2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=\"Wine,Development\"; 2.5.4.3=localhost; 1.2.840.113549.1.9.1=\"aric@codeweavers;com\""; static char subjectStrCRLF[] = - "2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com"; -static char x500SubjectStr[] = "C=US, S=Minnesota, L=Minneapolis, O=CodeWeavers, OU=Wine Development, CN=localhost, E=aric(a)codeweavers.com"; -static char x500SubjectStrSemicolonReverse[] = "E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; C=US"; + "2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=\"Wine,Development\"\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=\"aric@codeweavers;com\""; +static char x500SubjectStr[] = "C=US, S=Minnesota, L=Minneapolis, O=CodeWeavers, OU=\"Wine,Development\", CN=localhost, E=\"aric@codeweavers;com\""; +static char x500SubjectStrSemicolonReverse[] = "E=\"aric@codeweavers;com\"; CN=localhost; OU=\"Wine,Development\"; O=CodeWeavers; L=Minneapolis; S=Minnesota; C=US"; static WCHAR issuerStrW[] = { 'U','S',',',' ','M','i','n','n','e','s','o','t','a',',',' ','M','i','n','n', 'e','a','p','o','l','i','s',',',' ','C','o','d','e','W','e','a','v','e','r', - 's',',',' ','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t', - ',',' ','l','o','c','a','l','h','o','s','t',',',' ','a','r','i','c','@','c', - 'o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; + 's',',',' ','"','W','i','n','e',',','D','e','v','e','l','o','p','m','e','n','t','"', + ',',' ','l','o','c','a','l','h','o','s','t',',',' ','"','a','r','i','c','@','c', + 'o','d','e','w','e','a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR issuerStrSemicolonW[] = { 'U','S',';',' ','M','i','n','n','e','s','o','t','a',';',' ','M','i','n','n', 'e','a','p','o','l','i','s',';',' ','C','o','d','e','W','e','a','v','e','r', - 's',';',' ','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t', - ';',' ','l','o','c','a','l','h','o','s','t',';',' ','a','r','i','c','@','c', - 'o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; + 's',';',' ','"','W','i','n','e',',','D','e','v','e','l','o','p','m','e','n','t','"', + ';',' ','l','o','c','a','l','h','o','s','t',';',' ','"','a','r','i','c','@','c', + 'o','d','e','w','e','a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR issuerStrCRLFW[] = { 'U','S','\r','\n','M','i','n','n','e','s','o','t','a','\r','\n','M','i','n', 'n','e','a','p','o','l','i','s','\r','\n','C','o','d','e','W','e','a','v','e', - 'r','s','\r','\n','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n', - 't','\r','\n','l','o','c','a','l','h','o','s','t','\r','\n','a','r','i','c', - '@','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; + 'r','s','\r','\n','"','W','i','n','e',',','D','e','v','e','l','o','p','m','e','n', + 't','"','\r','\n','l','o','c','a','l','h','o','s','t','\r','\n','"','a','r','i','c', + '@','c','o','d','e','w','e','a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR subjectStrW[] = { '2','.','5','.','4','.','6','=','U','S',',',' ','2','.','5','.','4','.','8', '=','M','i','n','n','e','s','o','t','a',',',' ','2','.','5','.','4','.','7', '=','M','i','n','n','e','a','p','o','l','i','s',',',' ','2','.','5','.','4', '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s',',',' ','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t',',',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', + '5','.','4','.','1','1','=','"','W','i','n','e',',','D','e','v','e','l','o','p', + 'm','e','n','t','"',',',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', 'h','o','s','t',',',' ','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; + '9','.','1','.','9','.','1','=','"','a','r','i','c','@','c','o','d','e','w','e', + 'a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR subjectStrSemicolonW[] = { '2','.','5','.','4','.','6','=','U','S',';',' ','2','.','5','.','4','.','8', '=','M','i','n','n','e','s','o','t','a',';',' ','2','.','5','.','4','.','7', '=','M','i','n','n','e','a','p','o','l','i','s',';',' ','2','.','5','.','4', '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s',';',' ','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t',';',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', + '5','.','4','.','1','1','=','"','W','i','n','e',',','D','e','v','e','l','o','p', + 'm','e','n','t','"',';',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', 'h','o','s','t',';',' ','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; + '9','.','1','.','9','.','1','=','"','a','r','i','c','@','c','o','d','e','w','e', + 'a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR subjectStrCRLFW[] = { '2','.','5','.','4','.','6','=','U','S','\r','\n','2','.','5','.','4','.','8', '=','M','i','n','n','e','s','o','t','a','\r','\n','2','.','5','.','4','.','7', '=','M','i','n','n','e','a','p','o','l','i','s','\r','\n','2','.','5','.','4', '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s','\r','\n','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t','\r','\n','2','.','5','.','4','.','3','=','l','o','c','a','l', + '5','.','4','.','1','1','=','"','W','i','n','e',',','D','e','v','e','l','o','p', + 'm','e','n','t','"','\r','\n','2','.','5','.','4','.','3','=','l','o','c','a','l', 'h','o','s','t','\r','\n','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; + '9','.','1','.','9','.','1','=','"','a','r','i','c','@','c','o','d','e','w','e', + 'a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR x500SubjectStrSemicolonReverseW[] = { - 'E','=','a','r','i','c','@','c','o','d','e','w','e','a','v','e','r','s','.','c', - 'o','m',';',' ','C','N','=','l','o','c','a','l','h','o','s','t',';',' ','O','U', - '=','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t',';',' ','O', + 'E','=','"','a','r','i','c','@','c','o','d','e','w','e','a','v','e','r','s',';','c', + 'o','m','"',';',' ','C','N','=','l','o','c','a','l','h','o','s','t',';',' ','O','U', + '=','"','W','i','n','e',',','D','e','v','e','l','o','p','m','e','n','t','"',';',' ','O', '=','C','o','d','e','W','e','a','v','e','r','s',';',' ','L','=','M','i','n','n', 'e','a','p','o','l','i','s',';',' ','S','=','M','i','n','n','e','s','o','t','a', ';',' ','C','=','U','S',0 }; @@ -399,11 +399,8 @@ static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, sizeof(buffer) / sizeof(buffer[0])); ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %d\n", lstrlenW(expected) + 1, i); - ok(!lstrcmpW(buffer, expected), "Unexpected value\n"); -#ifdef DUMP_STRINGS - trace("Expected %s, got %s\n", + ok(!lstrcmpW(buffer, expected), "Expected %s, got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); -#endif } static void test_CertNameToStrW(void) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 1c9cf22..054683c 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1753,13 +1753,13 @@ LPITEMIDLIST _ILCreateEntireNetwork(void) TRACE("\n"); - pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[sizeof("Entire Network")])); + pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[strlen("Entire Network")+1])); if (pidlOut) { LPPIDLDATA pData = _ILGetDataPointer(pidlOut); pData->u.network.dummy = 0; - strcpy(pData->u.network.szNames, "Entire Network"); + memcpy(pData->u.network.szNames, "Entire Network", strlen("Entire Network")+1); } return pidlOut; } ++++++ wine-1.2.tar.bz2 -> wine-1.3.3.tar.bz2 ++++++ wine/wine-1.2.tar.bz2 /mounts/work_src_done/STABLE/wine/wine-1.3.3.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ ++++ 1231 lines (skipped) ++++ between wine/winetricks ++++ and /mounts/work_src_done/STABLE/wine/winetricks ++++++ wisotool ++++++ ++++ 3458 lines (skipped) ++++ between wine/wisotool ++++ and /mounts/work_src_done/STABLE/wine/wisotool ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smartmontools for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package smartmontools for openSUSE:Factory checked in at Tue Sep 28 22:50:02 CEST 2010. -------- --- smartmontools/smartmontools.changes 2010-06-28 08:51:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/smartmontools/smartmontools.changes 2010-09-28 18:56:23.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Sep 28 17:20:37 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Fix patch to remove build Dates +- Update to a newer version of 5.39.1 branch in order + to support libcap-ng so smartd can drop privileges + +------------------------------------------------------------------- +Sun Aug 29 18:56:43 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Do not include build enviroment infon in the binaries + including date and time of compilation, makes build-compare + happier. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- smartmontools-5.39.1.tar.bz2 New: ---- smartmontools-5.39.1-nobuild-date.patch smartmontools-5.39.1_git201009281647.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smartmontools.spec ++++++ --- /var/tmp/diff_new_pack.Gc0Hsr/_old 2010-09-28 22:48:35.000000000 +0200 +++ /var/tmp/diff_new_pack.Gc0Hsr/_new 2010-09-28 22:48:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package smartmontools (Version 5.39.1) +# spec file for package smartmontools (Version 5.39.1_git201009281647) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: smartmontools License: GPLv2+ Group: Hardware/Other -Version: 5.39.1 -Release: 6 +Version: 5.39.1_git201009281647 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: README.SATA Source2: smartmontools.sysconfig @@ -33,6 +33,7 @@ Patch5: smartmontools-init-update.patch Patch6: smartmontools-sysconfig.patch Patch7: smartmontools-strict-aliasing.patch +Patch8: smartmontools-5.39.1-nobuild-date.patch PreReq: %insserv_prereq %fillup_prereq coreutils %if %suse_version <= 1100 Requires: powersave @@ -43,10 +44,13 @@ %endif Url: http://smartmontools.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ libstdc++-devel +BuildRequires: gcc-c++ %if %suse_version >= 1110 BuildRequires: libselinux-devel %endif +%if %suse_version >= 1130 +BuildRequires: libcap-ng-devel +%endif Summary: Monitor for S.M.A.R.T. Disks and Devices Obsoletes: smartctl smartd ucsc-smartsuite smartsuite @@ -85,6 +89,7 @@ %patch5 %patch6 %patch7 +%patch8 %build AUTOMAKE=/usr/bin/automake-1.11 ./autogen.sh ++++++ smartmontools-5.39.1-nobuild-date.patch ++++++ --- utility.cpp.orig 2010-07-13 12:51:30.000000000 +0200 +++ utility.cpp 2010-09-28 18:48:37.773996000 +0200 @@ -88,11 +88,7 @@ unsigned char debugmode = 0; std::string format_version_info(const char * prog_name, bool full /*= false*/) { std::string info = strprintf( - "%s "PACKAGE_VERSION" "SMARTMONTOOLS_SVN_DATE" r"SMARTMONTOOLS_SVN_REV - " [%s] "BUILD_INFO"\n" - "Copyright (C) 2002-10 by Bruce Allen, http://smartmontools.sourceforge.net\n", - prog_name, smi()->get_os_version_str().c_str() - ); + "Copyright (C) 2002-10 by Bruce Allen, http://smartmontools.sourceforge.net\n"); if (!full) return info; @@ -105,19 +101,6 @@ std::string format_version_info(const ch "\n", prog_name ); - info += strprintf( - "smartmontools release "PACKAGE_VERSION - " dated "SMARTMONTOOLS_RELEASE_DATE" at "SMARTMONTOOLS_RELEASE_TIME"\n" - "smartmontools SVN rev "SMARTMONTOOLS_SVN_REV - " dated "SMARTMONTOOLS_SVN_DATE" at "SMARTMONTOOLS_SVN_TIME"\n" - "smartmontools build host: "SMARTMONTOOLS_BUILD_HOST"\n" - "smartmontools build configured: "SMARTMONTOOLS_CONFIGURE_DATE "\n" - "%s compile dated "__DATE__" at "__TIME__"\n" - "smartmontools configure arguments: ", - prog_name - ); - info += (sizeof(SMARTMONTOOLS_CONFIGURE_ARGS) > 1 ? - SMARTMONTOOLS_CONFIGURE_ARGS : "[no arguments given]"); info += '\n'; return info; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rfc for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Tue Sep 28 22:48:17 CEST 2010. -------- --- AUTO/all/rfc/rfc.changes 2010-09-27 13:43:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2010-09-28 11:42:59.000000000 +0200 @@ -2 +2 @@ -Mon Sep 27 13:43:16 CEST 2010 - autobuild(a)suse.de +Tue Sep 28 11:42:59 CEST 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-09-27 +- automated update on 2010-09-28 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.uy90xM/_old 2010-09-28 22:48:05.000000000 +0200 +++ /var/tmp/diff_new_pack.uy90xM/_new 2010-09-28 22:48:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rfc (Version 2010.9.27) +# spec file for package rfc (Version 2010.9.28) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2010.9.27 +Version: 2010.9.28 Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, line 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

commit rakudo for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package rakudo for openSUSE:Factory checked in at Tue Sep 28 22:47:54 CEST 2010. -------- --- rakudo/rakudo.changes 2010-08-27 15:17:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/rakudo/rakudo.changes 2010-09-27 15:26:14.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Sep 27 15:23:07 CEST 2010 - mls(a)suse.de + +- update to 2010.09 version + * the specification for temporal objects is now completely implemented + * several performance improvements were implemented + * the series operator has been refactored + * enumeration objects now conform much closer to the current spec + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rakudo-2010.08.tar.bz2 New: ---- rakudo-2010.09.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rakudo.spec ++++++ --- /var/tmp/diff_new_pack.q1mtD8/_old 2010-09-28 22:47:48.000000000 +0200 +++ /var/tmp/diff_new_pack.q1mtD8/_new 2010-09-28 22:47:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rakudo (Version 2010.08) +# spec file for package rakudo (Version 2010.09) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: rakudo -Version: 2010.08 +Version: 2010.09 Release: 1 Summary: Perl 6 implemenation that runs on Parrot License: Artistic 2.0 ++++++ rakudo-2010.08.tar.bz2 -> rakudo-2010.09.tar.bz2 ++++++ ++++ 7444 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit parrot for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package parrot for openSUSE:Factory checked in at Tue Sep 28 22:47:13 CEST 2010. -------- --- parrot/parrot.changes 2010-09-06 16:17:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/parrot/parrot.changes 2010-09-27 15:25:59.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 21 13:51:10 CEST 2010 - mls(a)suse.de + +- update to parrot-2.8.0 + * improved charset and string encoding + * inlined hashing and comparison functions + * implemented Exception clone vtable function + * command line argument "--gc-threshold" added + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- parrot-2.7.0.tar.bz2 New: ---- parrot-2.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parrot.spec ++++++ --- /var/tmp/diff_new_pack.602nIt/_old 2010-09-28 22:45:35.000000000 +0200 +++ /var/tmp/diff_new_pack.602nIt/_new 2010-09-28 22:45:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package parrot (Version 2.7.0) +# spec file for package parrot (Version 2.8.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,9 +18,9 @@ Name: parrot -Version: 2.7.0 -Release: 2 -%define pversion 2_7_0 +Version: 2.8.0 +Release: 1 +%define pversion 2_8_0 Summary: Parrot Virtual Machine License: Artistic 2.0 Group: Development/Libraries ++++++ parrot-2.7.0.tar.bz2 -> parrot-2.8.0.tar.bz2 ++++++ ++++ 124392 lines of diff (skipped) ++++++ parrot.diff ++++++ --- /var/tmp/diff_new_pack.602nIt/_old 2010-09-28 22:45:37.000000000 +0200 +++ /var/tmp/diff_new_pack.602nIt/_new 2010-09-28 22:45:37.000000000 +0200 @@ -20,27 +20,3 @@ (size_t)current_regstore_top); #else /* !__ia64__ */ ---- ./tools/dev/pbc_to_exe.pir.orig 2010-08-06 11:23:31.000000000 +0000 -+++ ./tools/dev/pbc_to_exe.pir 2010-09-06 14:14:59.000000000 +0000 -@@ -521,10 +521,11 @@ END_OF_FUNCTION - .param int install :optional - - $P0 = '_config'() -- .local string cc, ccflags, cc_o_out, osname, build_dir, slash -+ .local string cc, ccflags, optimize, cc_o_out, osname, build_dir, slash - .local string installed, includepath, versiondir - cc = $P0['cc'] - ccflags = $P0['ccflags'] -+ optimize = $P0['optimize'] - cc_o_out = $P0['cc_o_out'] - osname = $P0['osname'] - build_dir = $P0['build_dir'] -@@ -558,6 +559,8 @@ END_OF_FUNCTION - compile .= pathquote - compile .= ' ' - compile .= ccflags -+ compile .= ' ' -+ compile .= optimize - compile .= ' -c ' - compile .= cfile - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fuse for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package fuse for openSUSE:Factory checked in at Tue Sep 28 22:38:34 CEST 2010. -------- --- fuse/fuse.changes 2010-05-07 11:59:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/fuse/fuse.changes 2010-09-28 11:56:13.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 28 11:52:41 CEST 2010 - mszeredi(a)suse.cz + +- update to 2.8.5 + * fix option escaping for fusermount [bnc#641480] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fuse-2.8.4.tar.bz2 New: ---- fuse-2.8.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse.spec ++++++ --- /var/tmp/diff_new_pack.U4siG4/_old 2010-09-28 22:38:06.000000000 +0200 +++ /var/tmp/diff_new_pack.U4siG4/_new 2010-09-28 22:38:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package fuse (Version 2.8.4) +# spec file for package fuse (Version 2.8.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: fuse Summary: User space File System -Version: 2.8.4 -Release: 2 +Version: 2.8.5 +Release: 1 License: GPLv2+ ; LGPLv2.1+ Group: System/Filesystems # http://prdownloads.sourceforge.net/fuse/fuse-2.X/%{version}/fuse-%{version}… ++++++ fuse-2.8.4.tar.bz2 -> fuse-2.8.5.tar.bz2 ++++++ ++++ 2107 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.8.4/ChangeLog new/fuse-2.8.5/ChangeLog --- old/fuse-2.8.4/ChangeLog 2010-04-26 14:27:29.000000000 +0200 +++ new/fuse-2.8.5/ChangeLog 2010-09-28 10:24:13.000000000 +0200 @@ -1,3 +1,19 @@ +2010-09-28 Miklos Szeredi <miklos(a)szeredi.hu> + + * Released 2.8.5 + +2010-09-28 Miklos Szeredi <miklos(a)szeredi.hu> + + * Fix option escaping for fusermount. If the "fsname=" option + contained a comma then the option parser in fusermount was + confused (Novell bugzilla #641480). Fix by escaping commas when + passing them over to fusermount. Reported by Jan Engelhardt + +2010-05-10 Miklos Szeredi <miklos(a)szeredi.hu> + + * Remove "chmod root" from install of fusermount. Reported by + Lucas C. Villa Real + 2010-04-26 Miklos Szeredi <miklos(a)szeredi.hu> * Released 2.8.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.8.4/INSTALL new/fuse-2.8.5/INSTALL --- old/fuse-2.8.4/INSTALL 2010-04-26 14:23:31.000000000 +0200 +++ new/fuse-2.8.5/INSTALL 2010-09-28 11:23:54.000000000 +0200 @@ -4,8 +4,10 @@ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -288,7 +351,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.8.4/compile new/fuse-2.8.5/compile --- old/fuse-2.8.4/compile 2010-04-26 14:23:30.000000000 +0200 +++ new/fuse-2.8.5/compile 2010-09-28 11:23:53.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2009-04-28.21; # UTC +scriptversion=2009-10-06.20; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software # Foundation, Inc. @@ -124,9 +124,9 @@ ret=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.8.4/config.rpath new/fuse-2.8.5/config.rpath --- old/fuse-2.8.4/config.rpath 2010-04-26 14:23:19.000000000 +0200 +++ new/fuse-2.8.5/config.rpath 2010-09-28 11:23:42.000000000 +0200 @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2007 Free Software Foundation, Inc. +# Copyright 1996-2010 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996 # @@ -47,7 +47,7 @@ done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -64,7 +64,7 @@ ;; esac ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -76,7 +76,13 @@ ;; linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) + wl='-Wl,' + ;; + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) wl='-Wl,' ;; pgcc | pgf77 | pgf90) @@ -124,7 +130,7 @@ esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -132,7 +138,7 @@ hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -158,7 +164,7 @@ # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -182,7 +188,7 @@ ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -254,7 +260,7 @@ hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -264,7 +270,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -326,7 +332,7 @@ ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -494,7 +500,7 @@ fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. # Unlike libtool.m4, here we don't care about _all_ names of the library, but # only about the one the linker finds when passed -lNAME. This is the last # element of library_names_spec in libtool.m4, or possibly two of them if the @@ -505,7 +511,7 @@ aix3*) library_names_spec='$libname.a' ;; - aix4* | aix5*) + aix[4-9]*) library_names_spec='$libname$shrext' ;; amigaos*) @@ -517,7 +523,7 @@ bsdi[45]*) library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.8.4/configure.in new/fuse-2.8.5/configure.in --- old/fuse-2.8.4/configure.in 2010-04-26 14:20:20.000000000 +0200 +++ new/fuse-2.8.5/configure.in 2010-09-28 11:23:20.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(fuse, 2.8.4) +AC_INIT(fuse, 2.8.5) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.8.4/lib/Makefile.am new/fuse-2.8.5/lib/Makefile.am --- old/fuse-2.8.4/lib/Makefile.am 2010-04-26 14:21:18.000000000 +0200 +++ new/fuse-2.8.5/lib/Makefile.am 2010-09-28 11:23:33.000000000 +0200 @@ -35,7 +35,7 @@ $(iconv_source) \ $(mount_source) -libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:4 \ +libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:5 \ -Wl,--version-script,$(srcdir)/fuse_versionscript libulockmgr_la_SOURCES = ulockmgr.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.8.4/lib/mount.c new/fuse-2.8.5/lib/mount.c --- old/fuse-2.8.4/lib/mount.c 2010-04-26 14:11:30.000000000 +0200 +++ new/fuse-2.8.5/lib/mount.c 2010-09-28 10:04:13.000000000 +0200 @@ -200,7 +200,7 @@ return fuse_opt_add_opt(&mo->kernel_opts, arg); case KEY_FUSERMOUNT_OPT: - return fuse_opt_add_opt(&mo->fusermount_opts, arg); + return fuse_opt_add_opt_escaped(&mo->fusermount_opts, arg); case KEY_SUBTYPE_OPT: return fuse_opt_add_opt(&mo->subtype_opt, arg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.8.4/util/Makefile.am new/fuse-2.8.5/util/Makefile.am --- old/fuse-2.8.4/util/Makefile.am 2009-05-08 14:01:59.000000000 +0200 +++ new/fuse-2.8.5/util/Makefile.am 2010-09-28 10:03:09.000000000 +0200 @@ -14,7 +14,6 @@ ulockmgr_server_LDFLAGS = -pthread install-exec-hook: - -chown root $(DESTDIR)$(bindir)/fusermount -chmod u+s $(DESTDIR)$(bindir)/fusermount @if test ! -e $(DESTDIR)/dev/fuse; then \ $(mkdir_p) $(DESTDIR)/dev; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fuse-2.8.4/util/fusermount.c new/fuse-2.8.5/util/fusermount.c --- old/fuse-2.8.4/util/fusermount.c 2010-04-26 14:15:36.000000000 +0200 +++ new/fuse-2.8.5/util/fusermount.c 2010-09-28 10:04:13.000000000 +0200 @@ -649,7 +649,9 @@ static int get_string_opt(const char *s, unsigned len, const char *opt, char **val) { + int i; unsigned opt_len = strlen(opt); + char *d; if (*val) free(*val); @@ -659,8 +661,15 @@ return 0; } - memcpy(*val, s + opt_len, len - opt_len); - (*val)[len - opt_len] = '\0'; + d = *val; + s += opt_len; + len -= opt_len; + for (i = 0; i < len; i++) { + if (s[i] == '\\' && i + 1 < len) + i++; + *d++ = s[i]; + } + *d = '\0'; return 1; } @@ -691,7 +700,12 @@ unsigned len; const char *fsname_str = "fsname="; const char *subtype_str = "subtype="; - for (len = 0; s[len] && s[len] != ','; len++); + for (len = 0; s[len]; len++) { + if (s[len] == '\\' && s[len + 1]) + len++; + else if (s[len] == ',') + break; + } if (begins_with(s, fsname_str)) { if (!get_string_opt(s, len, fsname_str, &fsname)) goto err; ++++++ fuse-install-fix.diff ++++++ --- /var/tmp/diff_new_pack.U4siG4/_old 2010-09-28 22:38:06.000000000 +0200 +++ /var/tmp/diff_new_pack.U4siG4/_new 2010-09-28 22:38:06.000000000 +0200 @@ -1,10 +1,9 @@ ---- util/Makefile.in.orig 2009-09-07 00:26:57.000000000 +0200 -+++ util/Makefile.in 2009-09-07 00:27:50.000000000 +0200 -@@ -541,27 +541,14 @@ +--- util/Makefile.in.orig 2010-09-28 11:23:54.000000000 +0200 ++++ util/Makefile.in 2010-09-28 11:59:48.000000000 +0200 +@@ -583,26 +583,14 @@ uninstall-am: uninstall-binPROGRAMS unin install-exec-hook: -- -chown root $(DESTDIR)$(bindir)/fusermount - -chmod u+s $(DESTDIR)$(bindir)/fusermount - @if test ! -e $(DESTDIR)/dev/fuse; then \ - $(mkdir_p) $(DESTDIR)/dev; \ @@ -28,14 +27,13 @@ uninstall-local: rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse ---- util/Makefile.am.orig 2009-09-07 00:26:13.000000000 +0200 -+++ util/Makefile.am 2009-09-07 00:27:36.000000000 +0200 -@@ -13,15 +13,6 @@ +--- util/Makefile.am.orig 2010-09-28 10:03:09.000000000 +0200 ++++ util/Makefile.am 2010-09-28 11:59:48.000000000 +0200 +@@ -13,14 +13,6 @@ ulockmgr_server_SOURCES = ulockmgr_serve ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT ulockmgr_server_LDFLAGS = -pthread -install-exec-hook: -- -chown root $(DESTDIR)$(bindir)/fusermount - -chmod u+s $(DESTDIR)$(bindir)/fusermount - @if test ! -e $(DESTDIR)/dev/fuse; then \ - $(mkdir_p) $(DESTDIR)/dev; \ @@ -46,7 +44,7 @@ EXTRA_DIST = udev.rules init_script MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@ -@@ -33,14 +24,8 @@ +@@ -32,14 +24,8 @@ install-exec-local: $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse $(mkdir_p) $(DESTDIR)$(INIT_D_PATH) $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bundle-lang-common for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at Tue Sep 28 22:37:36 CEST 2010. -------- --- bundle-lang-common/bundle-lang-common.changes 2010-09-07 10:09:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-common.changes 2010-09-28 11:01:26.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 28 09:00:54 UTC 2010 - coolo(a)novell.com + +- update package list after factory updates + +------------------------------------------------------------------- bundle-lang-gnome-extras.changes: same change bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:12.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:12.000000000 +0200 @@ -20,13 +20,13 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-common -BuildRequires: PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang polkit-gnome-lang tar-lang upower-lang util-linux-lang +BuildRequires: PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib-networking-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang polkit-gnome-lang tar-lang upower-lang util-linux-lang wdiff-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input License: MIT License (or similar) Group: System/Localization Version: 11.3 -Release: 16 +Release: 17 Summary: Translations for a Group of Programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -63,6 +63,8 @@ Provides: locale(gdk-pixbuf:en) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:en) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:en) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:en) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -95,6 +97,8 @@ Provides: locale(upower:en) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:en) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:en) %description en This package groups translations for a dozen of programs which are both @@ -121,6 +125,8 @@ Provides: locale(gdk-pixbuf:de) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:de) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:de) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:de) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -153,6 +159,8 @@ Provides: locale(upower:de) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:de) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:de) %description de This package groups translations for a dozen of programs which are both @@ -179,6 +187,8 @@ Provides: locale(gdk-pixbuf:es) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:es) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:es) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:es) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -211,6 +221,8 @@ Provides: locale(upower:es) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:es) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:es) %description es This package groups translations for a dozen of programs which are both @@ -237,6 +249,8 @@ Provides: locale(gdk-pixbuf:it) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:it) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:it) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:it) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -269,6 +283,8 @@ Provides: locale(upower:it) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:it) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:it) %description it This package groups translations for a dozen of programs which are both @@ -295,6 +311,8 @@ Provides: locale(gdk-pixbuf:fr) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:fr) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:fr) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:fr) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -327,6 +345,8 @@ Provides: locale(upower:fr) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:fr) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:fr) %description fr This package groups translations for a dozen of programs which are both @@ -353,6 +373,8 @@ Provides: locale(gdk-pixbuf:ja) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ja) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ja) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ja) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -385,6 +407,8 @@ Provides: locale(upower:ja) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ja) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ja) %description ja This package groups translations for a dozen of programs which are both @@ -411,6 +435,8 @@ Provides: locale(gdk-pixbuf:zh) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:zh) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:zh) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:zh) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -443,6 +469,8 @@ Provides: locale(upower:zh) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:zh) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:zh) %description zh This package groups translations for a dozen of programs which are both @@ -469,6 +497,8 @@ Provides: locale(gdk-pixbuf:nl) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:nl) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:nl) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:nl) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -501,6 +531,8 @@ Provides: locale(upower:nl) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:nl) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:nl) %description nl This package groups translations for a dozen of programs which are both @@ -527,6 +559,8 @@ Provides: locale(gdk-pixbuf:cs) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:cs) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:cs) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:cs) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -559,6 +593,8 @@ Provides: locale(upower:cs) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:cs) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:cs) %description cs This package groups translations for a dozen of programs which are both @@ -593,6 +629,9 @@ Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:pt) Provides: locale(gimp:pt_BR) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:pt) +Provides: locale(glib-networking:pt_BR) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:pt) Provides: locale(glib2:pt_BR) @@ -641,6 +680,9 @@ Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:pt) Provides: locale(util-linux:pt_BR) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:pt) +Provides: locale(wdiff:pt_BR) %description pt This package groups translations for a dozen of programs which are both @@ -667,6 +709,8 @@ Provides: locale(gdk-pixbuf:pl) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:pl) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:pl) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:pl) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -699,6 +743,8 @@ Provides: locale(upower:pl) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:pl) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:pl) %description pl This package groups translations for a dozen of programs which are both @@ -725,6 +771,8 @@ Provides: locale(gdk-pixbuf:ca) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ca) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ca) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ca) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -757,6 +805,8 @@ Provides: locale(upower:ca) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ca) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ca) %description ca This package groups translations for a dozen of programs which are both @@ -783,6 +833,8 @@ Provides: locale(gdk-pixbuf:ar) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ar) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ar) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ar) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -815,6 +867,8 @@ Provides: locale(upower:ar) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ar) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ar) %description ar This package groups translations for a dozen of programs which are both @@ -841,6 +895,8 @@ Provides: locale(gdk-pixbuf:hu) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:hu) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:hu) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:hu) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -873,6 +929,8 @@ Provides: locale(upower:hu) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:hu) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:hu) %description hu This package groups translations for a dozen of programs which are both @@ -899,6 +957,8 @@ Provides: locale(gdk-pixbuf:ko) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ko) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ko) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ko) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -931,6 +991,8 @@ Provides: locale(upower:ko) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ko) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ko) %description ko This package groups translations for a dozen of programs which are both @@ -957,6 +1019,8 @@ Provides: locale(gdk-pixbuf:da) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:da) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:da) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:da) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -989,6 +1053,8 @@ Provides: locale(upower:da) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:da) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:da) %description da This package groups translations for a dozen of programs which are both @@ -1015,6 +1081,8 @@ Provides: locale(gdk-pixbuf:sv) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:sv) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:sv) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:sv) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -1047,6 +1115,8 @@ Provides: locale(upower:sv) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:sv) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:sv) %description sv This package groups translations for a dozen of programs which are both @@ -1073,6 +1143,8 @@ Provides: locale(gdk-pixbuf:ru) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ru) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ru) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ru) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -1105,6 +1177,8 @@ Provides: locale(upower:ru) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ru) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ru) %description ru This package groups translations for a dozen of programs which are both @@ -1131,6 +1205,8 @@ Provides: locale(gdk-pixbuf:fi) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:fi) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:fi) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:fi) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -1163,6 +1239,8 @@ Provides: locale(upower:fi) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:fi) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:fi) %description fi This package groups translations for a dozen of programs which are both @@ -1189,6 +1267,8 @@ Provides: locale(gdk-pixbuf:nb) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:nb) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:nb) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:nb) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -1221,6 +1301,8 @@ Provides: locale(upower:nb) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:nb) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:nb) %description nb This package groups translations for a dozen of programs which are both @@ -1234,7 +1316,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang polkit-gnome-lang tar-lang upower-lang util-linux-lang +bash %SOURCE0 PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib-networking-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang polkit-gnome-lang tar-lang upower-lang util-linux-lang wdiff-lang if test common = kde; then # pretty evil hack to keep the symlinks working ++++++ bundle-lang-gnome-extras.spec ++++++ ++++ 2303 lines (skipped) ++++ between bundle-lang-common/bundle-lang-gnome-extras.spec ++++ and /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-gnome-extras.spec ++++++ bundle-lang-gnome.spec ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:12.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:12.000000000 +0200 @@ -20,13 +20,13 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-gnome -BuildRequires: aisleriot-lang alacarte-lang at-spi-lang banshee-1-lang brasero-lang bug-buddy-lang cheese-lang clutter-lang compiz-lang dasher-lang deskbar-applet-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang gftp-common-lang glchess-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop-lang gnome-do-lang gnome-do-plugins-lang gnome-doc-utils-lang gnome-games-support-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-sudoku-lang gnome-system-monitor-lang gnome-terminal-lang gnome-user-docs-lang gnome-user-share-lang gnome-utils-lang gnome-web-photo-lang gnomine-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang iagno-lang libbonobo-lang libbonoboui-lang libepc-lang libgdata-lang libgdu-lang libgnome-keyring-lang libgnome-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libiptcdata-lang libpurple-lang libslab-lang libwebkitgtk2-lang liferea-lang lightsoff-lang mahjongg-lang metacity-lang mousetweaks-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang orca-lang pulseaudio-lang quadrapassel-lang seahorse-lang seahorse-plugins-lang swell-foop-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang tracker-lang transmission-common-lang vino-lang vte-lang xchat-lang xdg-user-dirs-gtk-lang yelp-lang zenity-lang +BuildRequires: PolicyKit-gnome-lang aisleriot-lang alacarte-lang at-spi-lang banshee-1-lang brasero-lang bug-buddy-lang cheese-lang clutter-lang compiz-lang dasher-lang deskbar-applet-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang gftp-common-lang glchess-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop2-lang gnome-do-lang gnome-do-plugins-lang gnome-doc-utils-lang gnome-games-support-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-sudoku-lang gnome-system-monitor-lang gnome-terminal-lang gnome-user-docs-lang gnome-user-share-lang gnome-utils-lang gnome-web-photo-lang gnomine-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang iagno-lang libbonobo-lang libbonoboui-lang libepc-lang libgdata-lang libgdu-lang libgnome-keyring-lang libgnome-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libiptcdata-lang libpurple-lang libslab-lang libwebkitgtk2-lang liferea-lang lightsoff-lang mahjongg-lang metacity-lang mousetweaks-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang orca-lang pulseaudio-lang quadrapassel-lang seahorse-lang seahorse-plugins-lang swell-foop-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang tracker-lang transmission-common-lang vino-lang vte-lang xchat-lang xdg-user-dirs-gtk-lang yelp-lang zenity-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input License: MIT License (or similar) Group: System/Localization Version: 11.3 -Release: 16 +Release: 17 Summary: Translations for many GNOME programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -45,6 +45,8 @@ License: MIT License (or similar) Summary: English translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:en) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:en) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -99,8 +101,8 @@ Provides: locale(gnome-bluetooth:en) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:en) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:en) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:en) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:en) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -271,6 +273,8 @@ License: MIT License (or similar) Summary: German translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:de) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:de) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -325,8 +329,8 @@ Provides: locale(gnome-bluetooth:de) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:de) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:de) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:de) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:de) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -497,6 +501,8 @@ License: GPLv2+ Summary: Spanish translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:es) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:es) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -551,8 +557,8 @@ Provides: locale(gnome-bluetooth:es) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:es) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:es) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:es) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:es) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -723,6 +729,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:it) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:it) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -777,8 +785,8 @@ Provides: locale(gnome-bluetooth:it) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:it) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:it) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:it) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:it) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -949,6 +957,8 @@ License: GPLv2+ Summary: French translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:fr) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:fr) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1003,8 +1013,8 @@ Provides: locale(gnome-bluetooth:fr) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:fr) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:fr) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:fr) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:fr) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -1175,6 +1185,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ja) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ja) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1229,8 +1241,8 @@ Provides: locale(gnome-bluetooth:ja) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ja) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ja) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ja) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ja) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -1401,6 +1413,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:zh) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:zh) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1455,8 +1469,8 @@ Provides: locale(gnome-bluetooth:zh) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:zh) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:zh) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:zh) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:zh) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -1627,6 +1641,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:nl) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:nl) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1681,8 +1697,8 @@ Provides: locale(gnome-bluetooth:nl) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:nl) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:nl) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:nl) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:nl) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -1853,6 +1869,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:cs) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:cs) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1907,8 +1925,8 @@ Provides: locale(gnome-bluetooth:cs) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:cs) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:cs) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:cs) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:cs) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -2079,6 +2097,9 @@ License: GPLv2+ Summary: Portuguese translations for a many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:pt) +Provides: locale(PolicyKit-gnome:pt_BR) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:pt) Provides: locale(aisleriot:pt_BR) @@ -2160,9 +2181,9 @@ Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:pt) Provides: locale(gnome-control-center:pt_BR) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:pt) -Provides: locale(gnome-desktop:pt_BR) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:pt) +Provides: locale(gnome-desktop2:pt_BR) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:pt) Provides: locale(gnome-do:pt_BR) @@ -2414,6 +2435,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:pl) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:pl) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -2468,8 +2491,8 @@ Provides: locale(gnome-bluetooth:pl) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:pl) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:pl) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:pl) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:pl) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -2640,6 +2663,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ca) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ca) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -2694,8 +2719,8 @@ Provides: locale(gnome-bluetooth:ca) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ca) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ca) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ca) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ca) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -2866,6 +2891,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ar) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ar) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -2920,8 +2947,8 @@ Provides: locale(gnome-bluetooth:ar) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ar) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ar) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ar) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ar) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3092,6 +3119,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:hu) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:hu) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -3146,8 +3175,8 @@ Provides: locale(gnome-bluetooth:hu) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:hu) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:hu) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:hu) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:hu) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3318,6 +3347,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ko) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ko) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -3372,8 +3403,8 @@ Provides: locale(gnome-bluetooth:ko) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ko) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ko) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ko) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ko) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3544,6 +3575,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:da) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:da) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -3598,8 +3631,8 @@ Provides: locale(gnome-bluetooth:da) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:da) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:da) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:da) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:da) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3770,6 +3803,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:sv) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:sv) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -3824,8 +3859,8 @@ Provides: locale(gnome-bluetooth:sv) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:sv) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:sv) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:sv) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:sv) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3996,6 +4031,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ru) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ru) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -4050,8 +4087,8 @@ Provides: locale(gnome-bluetooth:ru) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ru) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ru) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ru) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ru) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -4222,6 +4259,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:fi) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:fi) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -4276,8 +4315,8 @@ Provides: locale(gnome-bluetooth:fi) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:fi) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:fi) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:fi) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:fi) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -4448,6 +4487,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:nb) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:nb) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -4502,8 +4543,8 @@ Provides: locale(gnome-bluetooth:nb) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:nb) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:nb) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:nb) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:nb) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -4677,7 +4718,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 aisleriot-lang alacarte-lang at-spi-lang banshee-1-lang brasero-lang bug-buddy-lang cheese-lang clutter-lang compiz-lang dasher-lang deskbar-applet-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang gftp-common-lang glchess-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop-lang gnome-do-lang gnome-do-plugins-lang gnome-doc-utils-lang gnome-games-support-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-sudoku-lang gnome-system-monitor-lang gnome-terminal-lang gnome-user-docs-lang gnome-user-share-lang gnome-utils-lang gnome-web-photo-lang gnomine-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang iagno-lang libbonobo-lang libbonoboui-lang libepc-lang libgdata-lang libgdu-lang libgnome-keyring-lang libgnome-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libiptcdata-lang libpurple-lang libslab-lang libwebkitgtk2-lang liferea-lang lightsoff-lang mahjongg-lang metacity-lang mousetweaks-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang orca-lang pulseaudio-lang quadrapassel-lang seahorse-lang seahorse-plugins-lang swell-foop-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang tracker-lang transmission-common-lang vino-lang vte-lang xchat-lang xdg-user-dirs-gtk-lang yelp-lang zenity-lang +bash %SOURCE0 PolicyKit-gnome-lang aisleriot-lang alacarte-lang at-spi-lang banshee-1-lang brasero-lang bug-buddy-lang cheese-lang clutter-lang compiz-lang dasher-lang deskbar-applet-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang gftp-common-lang glchess-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop2-lang gnome-do-lang gnome-do-plugins-lang gnome-doc-utils-lang gnome-games-support-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-sudoku-lang gnome-system-monitor-lang gnome-terminal-lang gnome-user-docs-lang gnome-user-share-lang gnome-utils-lang gnome-web-photo-lang gnomine-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang iagno-lang libbonobo-lang libbonoboui-lang libepc-lang libgdata-lang libgdu-lang libgnome-keyring-lang libgnome-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libiptcdata-lang libpurple-lang libslab-lang libwebkitgtk2-lang liferea-lang lightsoff-lang mahjongg-lang metacity-lang mousetweaks-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang orca-lang pulseaudio-lang quadrapassel-lang seahorse-lang seahorse-plugins-lang swell-foop-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang tracker-lang transmission-common-lang vino-lang vte-lang xchat-lang xdg-user-dirs-gtk-lang yelp-lang zenity-lang if test gnome = kde; then # pretty evil hack to keep the symlinks working ++++++ bundle-lang-kde.spec ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:13.000000000 +0200 @@ -20,13 +20,13 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-kde -BuildRequires: NetworkManager-kde4-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libktorrent2-lang +BuildRequires: NetworkManager-kde4-libs-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libktorrent2-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input License: MIT License (or similar) Group: System/Localization Version: 11.3 -Release: 12 +Release: 13 Summary: Translations for a group of KDE applications BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -61,6 +61,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:en) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:en) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:en) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -97,6 +99,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:de) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:de) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:de) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -133,6 +137,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:es) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:es) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:es) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -169,6 +175,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:it) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:it) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:it) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -205,6 +213,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:fr) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:fr) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:fr) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -241,6 +251,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ja) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ja) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ja) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -277,6 +289,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:zh) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:zh) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:zh) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -313,6 +327,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:nl) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:nl) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:nl) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -349,6 +365,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:cs) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:cs) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:cs) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -386,6 +404,9 @@ Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:pt) Provides: locale(NetworkManager-kde4-libs:pt_BR) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:pt) +Provides: locale(ggz-client-libs:pt_BR) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:pt) Provides: locale(k3b:pt_BR) @@ -428,6 +449,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:pl) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:pl) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:pl) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -464,6 +487,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ca) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ca) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ca) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -500,6 +525,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ar) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ar) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ar) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -536,6 +563,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:hu) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:hu) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:hu) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -572,6 +601,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ko) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ko) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ko) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -608,6 +639,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:da) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:da) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:da) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -644,6 +677,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:sv) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:sv) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:sv) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -680,6 +715,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ru) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ru) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ru) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -716,6 +753,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:fi) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:fi) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:fi) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -752,6 +791,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:nb) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:nb) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:nb) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -789,7 +830,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 NetworkManager-kde4-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libktorrent2-lang +bash %SOURCE0 NetworkManager-kde4-libs-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libktorrent2-lang if test kde = kde; then # pretty evil hack to keep the symlinks working ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:13.000000000 +0200 @@ -22,7 +22,7 @@ License: MIT License (or similar) Group: System/GUI/KDE Version: 11.2 -Release: 35 +Release: 36 Summary: Translations for languages not covered by one of the bundle-lang-*-* packages BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:13.000000000 +0200 @@ -1,11 +1,14 @@ NetworkManager-kde4-libs-lang kde PackageKit-lang common +PolicyKit-gnome-lang gnome accerciser-lang gnome-extras aisleriot-lang gnome alacarte-lang gnome +alarm-clock-applet-lang gnome-extras anjuta-extras-lang gnome-extras anjuta-lang gnome-extras aqbanking-lang gnome-extras +arista-lang gnome-extras at-spi-lang gnome at-spi2-atk-lang gnome-extras atk-lang gnome-extras @@ -18,6 +21,7 @@ bug-buddy-lang gnome byzanz-lang gnome-extras cheese-lang gnome +cherrytree-lang gnome-extras claws-mail-extra-plugins-lang gnome-extras claws-mail-lang gnome-extras clutter-lang gnome @@ -33,6 +37,7 @@ deskbar-applet-lang gnome devhelp-lang gnome-extras dia-lang gnome-extras +drapes-lang gnome-extras eiciel-lang gnome-extras ekiga-lang gnome empathy-lang gnome @@ -55,10 +60,12 @@ gdl-lang gnome-extras gdm-lang gnome geany-lang gnome-extras +geany-plugins-lang gnome-extras gedit-lang gnome gedit-plugins-lang gnome-extras genius-lang gnome-extras gftp-common-lang gnome +ggz-client-libs-lang kde ghex-lang gnome-extras giggle-lang gnome-extras gimp-gap-lang gnome-extras @@ -67,6 +74,7 @@ glabels-lang gnome-extras glade3-lang gnome-extras glchess-lang gnome +glib-networking-lang common glib2-lang common glines-lang gnome-extras gnac-lang gnome-extras @@ -81,7 +89,8 @@ gnome-color-manager-lang gnome-extras gnome-commander-lang gnome-extras gnome-control-center-lang gnome -gnome-desktop-lang gnome +gnome-desktop-lang gnome-extras +gnome-desktop2-lang gnome gnome-devel-docs-lang gnome-extras gnome-do-lang gnome gnome-do-plugins-lang gnome @@ -103,6 +112,7 @@ gnome-power-manager-lang gnome gnome-reset-lang gnome-extras gnome-screensaver-lang gnome +gnome-search-tool-lang gnome-extras gnome-session-lang gnome gnome-settings-daemon-lang gnome gnome-shell-lang gnome-extras @@ -161,6 +171,7 @@ kdebase4-openSUSE-lang kde kipi-plugins-lang kde konversation-lang kde +krb5-auth-dialog-lang gnome-extras ktorrent-lang kde last-exit-lang gnome-extras libbonobo-lang gnome @@ -196,6 +207,7 @@ lightsoff-lang gnome login-lang common mahjongg-lang gnome +mail-notification-lang gnome-extras mc-lang common meld-lang gnome-extras memprof-lang gnome-extras @@ -213,8 +225,10 @@ obby-lang gnome-extras orca-lang gnome pan-lang gnome-extras +pango-module-thai-lang gnome-extras pessulus-lang gnome-extras pino-lang gnome-extras +planner-lang gnome-extras polkit-gnome-lang common pulseaudio-lang gnome quadrapassel-lang gnome @@ -224,6 +238,7 @@ scrollkeeper-lang gnome-extras seahorse-lang gnome seahorse-plugins-lang gnome +shotwell-lang gnome-extras simple-scan-lang gnome-extras sound-juicer-lang gnome-extras sparkleshare-lang gnome-extras @@ -242,9 +257,11 @@ twitux-lang gnome-extras upower-lang common util-linux-lang common +vboxgtk-lang gnome-extras vinagre-lang gnome-extras vino-lang gnome vte-lang gnome +wdiff-lang common xchat-gnome-lang gnome-extras xchat-lang gnome xdg-user-dirs-gtk-lang gnome ++++++ update-gnome-extras.sh ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:13.000000000 +0200 @@ -44,7 +44,7 @@ LANG=C sort -u -o $PACKAGESFILE $PACKAGESFILE.new -for pack in pango-module-thai-lang alarm-clock-applet-lang drapes-lang geany-plugins-lang krb5-auth-dialog-lang libpeas-lang mail-notification-lang yelp-xsl-lang deja-dup-lang pdfmod-lang konqueror-plugins-lang cherrytree-lang glib-networking-lang shotwell-lang planner-lang; do +for pack in pitivi-lang konqueror-plugins-lang libpeas-lang yelp-xsl-lang pdfmod-lang duplicity-lang deja-dup-lang; do grep -v "^$pack " $PACKAGESFILE > $PACKAGESFILE.new && mv $PACKAGESFILE.new $PACKAGESFILE done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit at for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package at for openSUSE:Factory checked in at Tue Sep 28 22:34:11 CEST 2010. -------- --- at/at.changes 2010-07-20 22:30:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/at/at.changes 2010-09-28 06:31:06.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 28 04:53:33 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- /etc/at.deny has wrong account name [bnc#632250] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- at-3.1.8-denylist.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at.spec ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Daemons AutoReqProv: on Version: 3.1.8 -Release: 1079 +Release: 1086 Summary: A Job Manager Source: at_3.1.8-11.tar.gz Source1: atd.init @@ -52,6 +52,8 @@ Patch14: %{name}-%{version}-pam-session-as-root.patch # PATCH-FIX-UPSTRAM clean-up opened descriptors (bnc#533454, bnc#523346) Patch15: %{name}-%{version}-leak-fix.patch +#PATCH_FIX-OPENSUSE add proper system users to the deny list +Patch16: at-3.1.8-denylist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %{_sbindir}/useradd %{_sbindir}/groupadd %fillup_prereq %insserv_prereq Recommends: smtp_daemon @@ -84,8 +86,9 @@ %patch11 %patch12 %patch13 -%patch14 -p1 +%patch14 %patch15 +%patch16 %build %{?suse_update_config:%{suse_update_config -f}} ++++++ at-3.1.8-bison.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -1,6 +1,6 @@ ---- parsetime.y +--- parsetime.y.orig +++ parsetime.y -@@ -63,6 +63,7 @@ +@@ -63,6 +63,7 @@ now : NOW time_or_not : time | @@ -8,7 +8,7 @@ time : hr24clock_hr_min | hr24clock_hr_min timezone_name -@@ -112,6 +113,7 @@ +@@ -112,6 +113,7 @@ date : month_name day_number inc_or_dec : increment | decrement @@ -16,7 +16,7 @@ increment : '+' inc_number inc_period { -@@ -288,6 +290,8 @@ +@@ -287,6 +289,8 @@ month_number : INT free($1); } } ++++++ at-3.1.8-cleanup_perm.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -1,6 +1,6 @@ ---- panic.c +--- panic.c.orig +++ panic.c -@@ -58,8 +58,11 @@ +@@ -58,8 +58,11 @@ panic(char *a) /* Something fatal has happened, print error message and exit. */ fprintf(stderr, "%s: %s\n", namep, a); ++++++ at-3.1.8-delete_r.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.1.in +--- at.1.in.orig +++ at.1.in -@@ -9,7 +9,7 @@ +@@ -9,7 +9,7 @@ at, batch, atq, atrm \- queue, examine o .IR queue ] .RB [ -f .IR file ] @@ -9,7 +9,7 @@ .B TIME .br .B "at -c" -@@ -219,8 +219,8 @@ +@@ -219,8 +219,8 @@ rather than standard input. Is an alias for .B atq. .TP @@ -20,9 +20,9 @@ .B atrm. .TP .TP ---- at.c +--- at.c.orig +++ at.c -@@ -692,7 +692,7 @@ +@@ -692,7 +692,7 @@ main(int argc, char **argv) char *pgm; int program = AT; /* our default program */ @@ -31,7 +31,7 @@ int disp_version = 0; time_t timer; struct passwd *pwe; -@@ -765,6 +765,7 @@ +@@ -765,6 +765,7 @@ main(int argc, char **argv) break; case 'd': @@ -39,9 +39,9 @@ if (program != AT) usage(); ---- panic.c +--- panic.c.orig +++ panic.c -@@ -92,6 +92,7 @@ +@@ -92,6 +92,7 @@ usage(void) /* Print usage and exit. */ fprintf(stderr, "Usage: at [-V] [-q x] [-f file] [-m] time\n" ++++++ at-3.1.8-denylist.patch ++++++ --- at.deny.orig +++ at.deny @@ -1,24 +1,12 @@ -alias -backup +root bin daemon -ftp -games -gnats -guest -irc lp mail +news +uucp +games man +wwwrun +ftp nobody -operator -proxy -qmaild -qmaill -qmailp -qmailq -qmailr -qmails -sync -sys -www-data ++++++ at-3.1.8-documentation-dir.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.1.in +--- at.1.in.orig +++ at.1.in -@@ -117,7 +117,7 @@ +@@ -117,7 +117,7 @@ and to run a job at 1am tomorrow, you wo .B at 1am tomorrow. .PP The exact definition of the time specification can be found in ++++++ at-3.1.8-eal3-manpages.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,4 +1,4 @@ ---- at.allow.5 +--- /dev/null +++ at.allow.5 @@ -0,0 +1,36 @@ +.Id $Id: at.allow.5,v 1.1 1997/09/28 20:00:28 ig25 Exp $ @@ -37,7 +37,7 @@ +.BR cron (8), +.BR crontab (1), +.BR atd (8). ---- at.deny.5 +--- /dev/null +++ at.deny.5 @@ -0,0 +1,36 @@ +.Id $Id: at.allow.5,v 1.1 1997/09/28 20:00:28 ig25 Exp $ ++++++ at-3.1.8-formatbugs.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- atd.c +--- atd.c.orig +++ atd.c -@@ -293,7 +293,7 @@ +@@ -293,7 +293,7 @@ run_file(const char *filename, uid_t uid if (buf.st_nlink > 2) { perr("Someboy is trying to run a linked script for job %8lu (%.500s)", @@ -9,9 +9,9 @@ } if ((fflags = fcntl(fd_in, F_GETFD)) < 0) perr("Error in fcntl"); ---- daemon.h +--- daemon.h.orig +++ daemon.h -@@ -5,12 +5,12 @@ +@@ -5,12 +5,12 @@ void #ifdef HAVE_ATTRIBUTE_NORETURN __attribute__((noreturn)) #endif @@ -26,9 +26,9 @@ +perr (const char *fmt, ...) __attribute__((__format__(printf,1,2))); extern int daemon_debug; ---- panic.h +--- panic.h.orig +++ panic.h -@@ -26,7 +26,9 @@ +@@ -26,7 +26,9 @@ void #ifdef HAVE_ATTRIBUTE_NORETURN __attribute__((noreturn)) #endif ++++++ at-3.1.8-joblist.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.c +--- at.c.orig +++ at.c -@@ -132,8 +132,10 @@ +@@ -133,8 +133,10 @@ static void sigc(int signo); static void alarmc(int signo); static char *cwdname(void); static void writefile(time_t runtimer, char queue); @@ -12,7 +12,7 @@ /* Signal catching functions */ -@@ -525,8 +527,20 @@ +@@ -526,8 +528,20 @@ writefile(time_t runtimer, char queue) return; } @@ -34,7 +34,7 @@ { /* List all a user's jobs in the queue, by looping through ATJOB_DIR, * or everybody's if we are root -@@ -565,6 +579,10 @@ +@@ -566,6 +580,10 @@ list_jobs() if (sscanf(dirent->d_name, "%c%5lx%8lx", &queue, &jobno, &ctm) != 3) continue; @@ -45,7 +45,7 @@ if (atqueue && (queue != atqueue)) continue; -@@ -742,6 +760,28 @@ +@@ -743,6 +761,28 @@ terr: "out of range or illegal time specification: [[CC]YY]MMDDhhmm[.SS]"); } @@ -74,7 +74,7 @@ /* Global functions */ -@@ -768,9 +808,13 @@ +@@ -769,9 +809,13 @@ main(int argc, char **argv) char *options = "q:f:t:MmvldrhVc"; /* default options for at */ int disp_version = 0; time_t timer; @@ -88,7 +88,7 @@ timer = -1; RELINQUISH_PRIVS -@@ -900,7 +944,9 @@ +@@ -901,7 +945,9 @@ main(int argc, char **argv) case ATQ: REDUCE_PRIV(daemon_uid, daemon_gid) @@ -99,9 +99,9 @@ break; case ATRM: ---- panic.c +--- panic.c.orig +++ panic.c -@@ -95,6 +95,8 @@ +@@ -95,6 +95,8 @@ usage(void) " at [-V] -c job [job ...]\n" " at [-V] -r job [job ...]\n" " at [-V] [-f file] -t [[CC]YY]MMDDhhmm[.SS]\n" ++++++ at-3.1.8-leak-fix.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.c.orig 2009-08-27 11:22:49.000000000 +0200 -+++ at.c 2009-08-27 12:12:58.000000000 +0200 -@@ -600,6 +600,9 @@ +--- at.c.orig ++++ at.c +@@ -600,6 +600,9 @@ list_jobs(long *joblist, int len) else printf("%ld\t%s %c\n", jobno, timestr, queue); } @@ -10,7 +10,7 @@ PRIV_END } -@@ -676,6 +679,11 @@ +@@ -676,6 +679,11 @@ process_jobs(int argc, char **argv, int while ((ch = getc(fp)) != EOF) { putchar(ch); } @@ -22,7 +22,7 @@ } break; -@@ -687,7 +695,13 @@ +@@ -687,7 +695,13 @@ process_jobs(int argc, char **argv, int } } } ++++++ at-3.1.8-massive_batch.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- atd.c +--- atd.c.orig +++ atd.c -@@ -140,9 +140,10 @@ +@@ -137,9 +137,10 @@ static char rcsid[] = "$Id: atd.c,v 1.28 static double load_avg = LOADAVG_MX; static time_t now; static time_t last_chg; @@ -12,7 +12,7 @@ static volatile sig_atomic_t term_signal = 0; -@@ -155,9 +156,10 @@ +@@ -152,9 +153,10 @@ set_term(int dummy) } RETSIGTYPE @@ -25,7 +25,7 @@ return; } -@@ -765,6 +767,7 @@ +@@ -790,6 +792,7 @@ run_loop() return next_job; last_chg = buf.st_mtime; @@ -33,7 +33,7 @@ if ((spool = opendir(".")) == NULL) perr("Cannot read " ATJOB_DIR); -@@ -989,7 +992,7 @@ +@@ -1014,7 +1017,7 @@ main(int argc, char *argv[]) */ sigaction(SIGHUP, NULL, &act); @@ -42,7 +42,7 @@ sigaction(SIGHUP, &act, NULL); sigaction(SIGTERM, NULL, &act); -@@ -1005,9 +1008,10 @@ +@@ -1030,9 +1033,10 @@ main(int argc, char *argv[]) do { now = time(NULL); next_invocation = run_loop(); ++++++ at-3.1.8-pam-session-as-root.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,8 +1,6 @@ -Index: at-3.1.8/atd.c -=================================================================== ---- at-3.1.8.orig/atd.c 2009-05-14 15:47:05.000000000 +0200 -+++ at-3.1.8/atd.c 2009-05-14 15:47:42.000000000 +0200 -@@ -587,11 +587,13 @@ run_file(const char *filename, uid_t uid +--- atd.c.orig ++++ atd.c +@@ -612,11 +612,13 @@ run_file(const char *filename, uid_t uid unlink(filename); #ifdef WITH_PAM @@ -16,7 +14,7 @@ #endif /* The job is now finished. We can delete its input file. -@@ -712,11 +714,13 @@ run_file(const char *filename, uid_t uid +@@ -737,11 +739,13 @@ run_file(const char *filename, uid_t uid waitpid(mail_pid, (int *) NULL, 0); } #ifdef WITH_PAM ++++++ at-3.1.8-pam.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,5 +1,3 @@ -Index: Makefile.in -=================================================================== --- Makefile.in.orig +++ Makefile.in @@ -28,6 +28,7 @@ YACC = @YACC@ @@ -19,8 +17,6 @@ y.tab.c y.tab.h: parsetime.y $(YACC) -d parsetime.y -Index: atd.c -=================================================================== --- atd.c.orig +++ atd.c @@ -93,6 +93,17 @@ int selinux_enabled=0; @@ -352,8 +348,6 @@ opterr = 0; errno = 0; run_as_daemon = 1; -Index: config.h.in -=================================================================== --- config.h.in.orig +++ config.h.in @@ -187,3 +187,7 @@ @@ -364,8 +358,6 @@ +/* Define if you are building with_pam */ +#undef WITH_PAM + -Index: configure.in -=================================================================== --- configure.in.orig +++ configure.in @@ -323,4 +323,11 @@ AC_CHECK_LIB(selinux, is_selinux_enabled @@ -380,8 +372,6 @@ +AC_SUBST(PAMLIB) + AC_OUTPUT(Makefile atrun atd.8 atrun.8 at.1 batch) -Index: perm.c -=================================================================== --- perm.c.orig +++ perm.c @@ -109,14 +109,15 @@ user_in_file(const char *path, const cha ++++++ at-3.1.8-pie.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.in +--- Makefile.in.orig +++ Makefile.in -@@ -67,13 +67,13 @@ +@@ -67,13 +67,13 @@ LIST = Filelist Filelist.asc all: at atd atrun at: $(ATOBJECTS) @@ -16,7 +16,7 @@ y.tab.c y.tab.h: parsetime.y $(YACC) -d parsetime.y -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ atrun: atrun.in configure .c.o: ++++++ at-3.1.8-queue-nice-level.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,8 +1,6 @@ -Index: atd.c -=================================================================== --- atd.c.orig +++ atd.c -@@ -457,7 +457,7 @@ run_file(const char *filename, uid_t uid +@@ -482,7 +482,7 @@ run_file(const char *filename, uid_t uid if (chdir(ATJOB_DIR) < 0) perr("Cannot chdir to " ATJOB_DIR); ++++++ at-3.1.8-selinux.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.in +--- Makefile.in.orig +++ Makefile.in -@@ -27,6 +27,7 @@ +@@ -27,6 +27,7 @@ LN_S = @LN_S@ YACC = @YACC@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -8,7 +8,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ -@@ -72,7 +73,7 @@ +@@ -72,7 +73,7 @@ at: $(ATOBJECTS) $(LN_S) -f at atrm atd: $(RUNOBJECTS) @@ -17,7 +17,7 @@ y.tab.c y.tab.h: parsetime.y $(YACC) -d parsetime.y ---- atd.c +--- atd.c.orig +++ atd.c @@ -85,6 +85,14 @@ #include <syslog.h> @@ -34,7 +34,7 @@ /* Local headers */ #include "privs.h" -@@ -404,6 +412,76 @@ +@@ -404,6 +412,76 @@ run_file(const char *filename, uid_t uid chdir("/"); @@ -111,7 +111,7 @@ if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0) perr("Exec failed for /bin/sh"); -@@ -420,6 +498,13 @@ +@@ -420,6 +498,13 @@ run_file(const char *filename, uid_t uid */ waitpid(pid, (int *) NULL, 0); @@ -125,7 +125,7 @@ /* Send mail. Unlink the output file after opening it, so it * doesn't hang around after the run. */ -@@ -654,6 +739,9 @@ +@@ -654,6 +739,9 @@ main(int argc, char *argv[]) struct passwd *pwe; struct group *ge; @@ -135,7 +135,7 @@ /* We don't need root privileges all the time; running under uid and gid * daemon is fine. */ ---- config.h.in +--- config.h.in.orig +++ config.h.in @@ -184,3 +184,6 @@ #undef DEFAULT_BATCH_QUEUE @@ -144,9 +144,9 @@ + +/* Define if you are building with_selinux */ +#undef WITH_SELINUX ---- configure.in +--- configure.in.orig +++ configure.in -@@ -315,4 +315,12 @@ +@@ -315,4 +315,12 @@ AC_ARG_WITH(daemon_groupname, ) AC_SUBST(DAEMON_GROUPNAME) ++++++ at-3.1.8-ttime.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.1.in +--- at.1.in.orig +++ at.1.in -@@ -9,7 +9,7 @@ +@@ -9,7 +9,7 @@ at, batch, atq, atrm \- queue, examine o .IR queue ] .RB [ -f .IR file ] @@ -9,7 +9,7 @@ .B TIME .br .B "at -c" -@@ -235,6 +235,9 @@ +@@ -235,6 +235,9 @@ is set; then, it will be "Thu Feb 20 14: .B \-c cats the jobs listed on the command line to standard output. @@ -19,7 +19,7 @@ .SH FILES .I @ATJBD@ .br ---- at.c +--- at.c.orig +++ at.c @@ -28,6 +28,7 @@ @@ -29,7 +29,7 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -@@ -133,6 +134,7 @@ +@@ -133,6 +134,7 @@ static void alarmc(int signo); static char *cwdname(void); static void writefile(time_t runtimer, char queue); static void list_jobs(void); @@ -37,7 +37,7 @@ /* Signal catching functions */ -@@ -670,6 +672,78 @@ +@@ -670,6 +672,78 @@ process_jobs(int argc, char **argv, int } } /* delete_jobs */ @@ -116,7 +116,7 @@ /* Global functions */ void * -@@ -692,12 +766,13 @@ +@@ -692,12 +766,13 @@ main(int argc, char **argv) char *pgm; int program = AT; /* our default program */ @@ -131,7 +131,7 @@ RELINQUISH_PRIVS if ((pwe = getpwnam(DAEMON_USERNAME)) == NULL) -@@ -781,6 +856,13 @@ +@@ -781,6 +856,13 @@ main(int argc, char **argv) options = "q:V"; break; @@ -145,7 +145,7 @@ case 'b': if (program != AT) usage(); -@@ -834,10 +916,16 @@ +@@ -834,10 +916,16 @@ main(int argc, char **argv) break; case AT: @@ -166,9 +166,9 @@ } if (timer == 0) { ---- panic.c +--- panic.c.orig +++ panic.c -@@ -92,7 +92,9 @@ +@@ -92,7 +92,9 @@ usage(void) /* Print usage and exit. */ fprintf(stderr, "Usage: at [-V] [-q x] [-f file] [-m] time\n" ++++++ at-3.1.8.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.in +--- Makefile.in.orig +++ Makefile.in -@@ -87,37 +87,35 @@ +@@ -87,37 +87,35 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all @@ -58,9 +58,9 @@ rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ $(IROOT)$(mandir)/cat1/atq.1* rm -f $(IROOT)$(mandir)/cat1/atd.8* ---- Problems +--- Problems.orig +++ Problems -@@ -5,7 +5,7 @@ +@@ -5,7 +5,7 @@ Possible reasons why at may not run for make -f Makefile.old install @@ -69,9 +69,9 @@ - If you find numerous 'try again' error messages in your syslog files, you have too many processes running; recompile your kernel for a ---- README +--- README.orig +++ README -@@ -23,7 +23,7 @@ +@@ -23,7 +23,7 @@ The new one is to start up an atd daemon The old one is to put @@ -80,7 +80,7 @@ into root's crontab file (or wherever you put the atrun binary; don't forget to start up cron.) ---- atd.c +--- atd.c.orig +++ atd.c @@ -1,4 +1,4 @@ -/* @@ -97,7 +97,7 @@ * /usr/bin/mail aka /usr/bin/mailx require the subject to be * specified on the command line instead of reading it from stdin like * /usr/sbin/sendmail does. For now simply disable MAILC and MAILX, -@@ -121,14 +121,14 @@ +@@ -121,14 +121,14 @@ static int run_as_daemon = 0; static volatile sig_atomic_t term_signal = 0; /* Signal handlers */ @@ -114,7 +114,7 @@ sdummy(int dummy) { /* Empty signal handler */ -@@ -156,7 +156,7 @@ +@@ -156,7 +156,7 @@ release_zombie(int dummy) } return; } @@ -123,7 +123,7 @@ /* Local functions */ -@@ -196,7 +196,7 @@ +@@ -196,7 +196,7 @@ run_file(const char *filename, uid_t uid */ pid_t pid; int fd_out, fd_in; @@ -132,7 +132,7 @@ char *mailname = NULL; char *newname; FILE *stream; -@@ -290,7 +290,12 @@ +@@ -290,7 +290,12 @@ run_file(const char *filename, uid_t uid if ((fflags = fcntl(fd_in, F_GETFD)) < 0) perr("Error in fcntl"); @@ -146,7 +146,7 @@ /* * If the spool directory is mounted via NFS `atd' isn't able to -@@ -299,7 +304,7 @@ +@@ -299,7 +304,7 @@ run_file(const char *filename, uid_t uid * NFS and works with local file systems. It's not clear where * the bug is located. -Joey */ @@ -155,7 +155,7 @@ &nuid, &ngid, mailbuf, &send_mail) != 4) pabort("File %.500s is in wrong format - aborting", filename); -@@ -328,7 +333,7 @@ +@@ -328,7 +333,7 @@ run_file(const char *filename, uid_t uid perr("Cannot chdir to " ATSPOOL_DIR); /* Create a file to hold the output of the job we are about to run. @@ -164,7 +164,7 @@ */ if (unlink(filename) != -1) { -@@ -343,7 +348,7 @@ +@@ -343,7 +348,7 @@ run_file(const char *filename, uid_t uid write_string(fd_out, "Subject: Output from your job "); write_string(fd_out, jobbuf); write_string(fd_out, "\nTo: "); @@ -173,7 +173,7 @@ write_string(fd_out, "\n\n"); fstat(fd_out, &buf); size = buf.st_size; -@@ -394,6 +399,9 @@ +@@ -394,6 +399,9 @@ run_file(const char *filename, uid_t uid if (setuid(uid) < 0) perr("Cannot set user id"); @@ -183,7 +183,7 @@ chdir("/"); if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0) -@@ -408,7 +416,7 @@ +@@ -408,7 +416,7 @@ run_file(const char *filename, uid_t uid /* We inherited the master's SIGCHLD handler, which does a non-blocking waitpid. So this blocking one will eventually @@ -192,7 +192,7 @@ */ waitpid(pid, (int *) NULL, 0); -@@ -557,7 +565,8 @@ +@@ -557,7 +565,8 @@ run_loop() /* Something went wrong the last time this was executed. * Let's remove the lockfile and reschedule. */ @@ -202,7 +202,7 @@ lock_name[0] = '='; unlink(lock_name); next_job = now; -@@ -591,7 +600,8 @@ +@@ -591,7 +600,8 @@ run_loop() */ run_batch++; if (strcmp(batch_name, dirent->d_name) > 0) { @@ -212,9 +212,9 @@ batch_uid = buf.st_uid; batch_gid = buf.st_gid; batch_queue = queue; ---- configure.in +--- configure.in.orig +++ configure.in -@@ -126,7 +126,7 @@ +@@ -126,7 +126,7 @@ else fi AC_MSG_CHECKING(location of spool directory) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit arpwatch-ethercodes for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package arpwatch-ethercodes for openSUSE:Factory checked in at Tue Sep 28 22:32:39 CEST 2010. -------- --- AUTO/all/arpwatch-ethercodes/arpwatch-ethercodes.changes 2010-09-26 06:40:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/arpwatch-ethercodes/arpwatch-ethercodes.changes 2010-09-28 06:40:08.000000000 +0200 @@ -2 +2 @@ -Sun Sep 26 06:40:08 CEST 2010 - autobuild(a)suse.de +Tue Sep 28 06:40:08 CEST 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-09-26 +- automated update on 2010-09-28 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch-ethercodes.spec ++++++ --- /var/tmp/diff_new_pack.3wJPn4/_old 2010-09-28 22:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.3wJPn4/_new 2010-09-28 22:32:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package arpwatch-ethercodes (Version 2010.9.25) +# spec file for package arpwatch-ethercodes (Version 2010.9.28) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Group: Productivity/Networking/Diagnostic AutoReqProv: on Summary: Ethercodes Data for arpwatch -Version: 2010.9.25 +Version: 2010.9.28 Release: 1 Source: http://standards.ieee.org/regauth/oui/oui.txt.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ oui.txt.bz2 ++++++ Files AUTO/all/arpwatch-ethercodes/oui.txt.bz2 and /mounts/work_src_done/STABLE/arpwatch-ethercodes/oui.txt.bz2 differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patterns-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package patterns-openSUSE for openSUSE:Factory checked in at Tue Sep 28 14:46:52 CEST 2010. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2010-08-30 14:34:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2010-09-28 11:10:26.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Sep 28 09:09:48 UTC 2010 - coolo(a)novell.com + +376de2b use empathy instead of pidgin +6fb5b3b preload is not strictly required +b9cc276 moblin pattern is gone as most packages of it are gone too +e2068ef remove packages gone from the distribution +3f5cdf7 Remove some obviously unneeded parts in GNOME patterns +2bc03b8 Update GNOME-IDE to include devhelp and glade3 +19c6c60 Reorder GNOME-BASIS so that low-level bits are easily findable +c21ed96 Remove yast bits from GNOME-BASIS +a3141f8 Make packages in GNOME-Games recommended instead of required +e6a80e0 Move packages around all the GNOME-* patterns + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.Y6BMir/_old 2010-09-28 14:46:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Y6BMir/_new 2010-09-28 14:46:09.000000000 +0200 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.3 -Release: 25 +Release: 26 Url: http://en.opensuse.org/Patterns BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 @@ -271,7 +271,6 @@ Recommends: ghex Recommends: glade Recommends: glib2-devel -Recommends: glitz-devel Recommends: gnome-bluetooth-devel Recommends: gnome-common Recommends: gnome-control-center-devel @@ -441,7 +440,6 @@ Recommends: kdebase4-workspace-devel Recommends: krb5-devel Recommends: libSDL-devel -Recommends: libakode-devel Recommends: libao-devel Recommends: libattr-devel Recommends: libavahi-devel @@ -991,6 +989,31 @@ License: GPLv2+ Group: Metapackages Summary: Meta package for pattern gnome +Recommends: alacarte +Recommends: brasero +Recommends: cheese +Recommends: dasher +Recommends: deskbar-applet +Recommends: empathy +Recommends: eog +Recommends: evince +Recommends: evolution +Recommends: evolution-tracker +Recommends: file-roller +Recommends: gcalctool +Recommends: gconf-editor +Recommends: gedit +Recommends: gnome-bluetooth +Recommends: gnome-media +Recommends: gnome-nettool +Recommends: gnome-system-monitor +Recommends: gnome-themes +Recommends: gnome-user-share +Recommends: gnome-utils +Recommends: gucharmap +Recommends: mousetweaks +Recommends: nautilus-sendto +Recommends: orca Recommends: patterns-openSUSE-games Recommends: patterns-openSUSE-gnome_admin Recommends: patterns-openSUSE-gnome_internet @@ -1000,6 +1023,18 @@ Recommends: patterns-openSUSE-non_oss Recommends: patterns-openSUSE-office Recommends: patterns-openSUSE-xgl +Recommends: seahorse +Recommends: system-config-printer +Recommends: telepathy-gabble +Recommends: telepathy-haze +Recommends: telepathy-salut +Recommends: tomboy +Recommends: totem +Recommends: totem-browser-plugin +Recommends: tracker +Recommends: tracker-gui +Recommends: vino +Recommends: zenity Requires: patterns-openSUSE-gnome Requires: patterns-openSUSE-gnome_basis @@ -1029,74 +1064,43 @@ Recommends: aria2 Recommends: at-spi Recommends: avahi -Recommends: brasero Recommends: bug-buddy Recommends: cups-backends Recommends: dbus-1-x11 Recommends: desktop-data-openSUSE Recommends: desktop-file-utils Recommends: droid-fonts -Recommends: empathy -Recommends: eog -Recommends: evince -Recommends: evolution -Recommends: evolution-tracker Recommends: fifth-leg-font -Recommends: file-roller -Recommends: gcalctool -Recommends: gconf-editor Recommends: gconf2-branding-openSUSE Recommends: gdb -Recommends: gedit Recommends: glib2-branding-openSUSE Recommends: gnome-control-center Recommends: gnome-desktop -Recommends: gnome-do Recommends: gnome-icon-theme Recommends: gnome-keyring Recommends: gnome-keyring-pam Recommends: gnome-mag -Recommends: gnome-media Recommends: gnome-menus Recommends: gnome-menus-branding-openSUSE -Recommends: gnome-nettool Recommends: gnome-power-manager Recommends: gnome-screensaver -Recommends: gnome-system-monitor Recommends: gnome-terminal -Recommends: gnome-themes Recommends: gnome-user-docs -Recommends: gnome-utils -Recommends: gnome-web-photo Recommends: gpg2 Recommends: gpgme -Recommends: gstreamer-0_10 -Recommends: gstreamer-0_10-plugins-base -Recommends: gstreamer-0_10-plugins-good Recommends: gtk2 Recommends: gtk2-branding-openSUSE -%ifarch ix86 -Recommends: gtk2-branding-openSUSE -%endif Recommends: gtk2-engine-murrine Recommends: gtk2-engines Recommends: gtk2-metatheme-sonar Recommends: gtkhtml2 Recommends: gtkspell -Recommends: gucharmap Recommends: input-utils Recommends: libgail-gnome Recommends: metacity -Recommends: mousetweaks Recommends: nautilus -Recommends: nautilus-open-terminal -Recommends: nautilus-sendto -Recommends: nautilus-share Recommends: notification-daemon -Recommends: orca -Recommends: paprefs Recommends: patterns-openSUSE-gnome_basis_opt -Recommends: pavucontrol Recommends: pinentry-gtk2 Recommends: polkit-default-privs Recommends: preload @@ -1113,30 +1117,17 @@ Recommends: shared-mime-info Recommends: startup-notification Recommends: susehelp -Recommends: system-config-printer Recommends: tango-icon-theme -Recommends: tasque -Recommends: telepathy-gabble -Recommends: telepathy-haze -Recommends: telepathy-salut -Recommends: tomboy -Recommends: tracker -Recommends: tracker-gui -Recommends: vino Recommends: vte Recommends: xdg-user-dirs Recommends: xdg-user-dirs-gtk Recommends: xkeyboard-config -Recommends: yast2-control-center-gnome -Recommends: yast2-sound Recommends: yelp -Recommends: zenity Requires: gdm Requires: gnome-applets Requires: gnome-main-menu Requires: gnome-panel Requires: gnome-session -Requires: gnome-vfs2 Requires: patterns-openSUSE-basesystem Requires: patterns-openSUSE-gnome_basis Requires: patterns-openSUSE-x11 @@ -1152,9 +1143,7 @@ Recommends: gutenprint Recommends: hplip Recommends: java-1_6_0-openjdk-plugin -Recommends: latex2html-pngicons Recommends: samba -Recommends: sensors Requires: patterns-openSUSE-basesystem Requires: patterns-openSUSE-x11 %ifarch x86_64 @@ -1168,9 +1157,9 @@ License: GPLv2+ Group: Metapackages Summary: Meta package for pattern gnome_games +Recommends: gbrainy +Recommends: gnome-games-recommended Recommends: phalanx -Requires: gbrainy -Requires: gnome-games-recommended Requires: patterns-openSUSE-gnome_games Supplements: packageand(patterns-openSUSE-gnome:patterns-openSUSE-games) @@ -1182,6 +1171,8 @@ Group: Metapackages Summary: Meta package for pattern gnome_ide Recommends: anjuta +Recommends: devhelp +Recommends: glade3 Requires: patterns-openSUSE-gnome_ide Supplements: packageand(patterns-openSUSE-gnome:patterns-openSUSE-devel_ide) @@ -1206,9 +1197,7 @@ License: GPLv2+ Group: Metapackages Summary: Meta package for pattern gnome_imaging_opt -Recommends: ImageMagick Recommends: dia -Recommends: gphoto Recommends: inkscape Recommends: xsane Requires: patterns-openSUSE-gnome_basis @@ -1224,8 +1213,11 @@ Recommends: NetworkManager-openvpn-gnome Recommends: NetworkManager-pptp-gnome Recommends: NetworkManager-vpnc-gnome -Recommends: cheese Recommends: ekiga +Recommends: empathy +Recommends: evolution +Recommends: gftp +Recommends: gnome-nettool Recommends: liferea Recommends: transmission-gtk Recommends: xchat @@ -1257,11 +1249,14 @@ Recommends: banshee-1-backend-platform-gnome Recommends: banshee-1-backend-platform-unix Recommends: banshee-1-extensions-default +Recommends: gnome-media Recommends: gstreamer-0_10-plugins-base Recommends: gstreamer-0_10-plugins-good Recommends: gstreamer-0_10-schroedinger Recommends: gstreamer-utils +Recommends: paprefs Recommends: patterns-openSUSE-gnome_multimedia_opt +Recommends: pavucontrol Recommends: totem Recommends: totem-browser-plugin Requires: patterns-openSUSE-gnome_multimedia @@ -1274,8 +1269,6 @@ License: GPLv2+ Group: Metapackages Summary: Meta package for pattern gnome_multimedia_opt -Recommends: gphoto -Recommends: inkscape Supplements: packageand(patterns-openSUSE-gnome:patterns-openSUSE-multimedia) %description gnome_multimedia_opt @@ -1287,6 +1280,7 @@ Summary: Meta package for pattern gnome_office Recommends: OpenOffice_org-gnome Recommends: OpenOffice_org-icon-theme-tango +Recommends: evolution Recommends: patterns-openSUSE-gnome_office_opt Requires: patterns-openSUSE-gnome_basis Requires: patterns-openSUSE-gnome_office @@ -1311,17 +1305,25 @@ License: GPLv2+ Group: Metapackages Summary: Meta package for pattern gnome_utilities -Recommends: alacarte +Recommends: cheese Recommends: dasher Recommends: deskbar-applet Recommends: evolution-pilot -Recommends: gftp -Recommends: gnome-bluetooth -Recommends: gnome-user-share +Recommends: file-roller +Recommends: gcalctool +Recommends: gedit +Recommends: gnome-do +Recommends: gnome-utils +Recommends: gnome-web-photo +Recommends: gucharmap Recommends: libopensync-plugin-file Recommends: multisync-gui +Recommends: nautilus-open-terminal +Recommends: nautilus-sendto +Recommends: nautilus-share Recommends: seahorse -Recommends: vino +Recommends: tasque +Recommends: tomboy Requires: patterns-openSUSE-gnome_basis Requires: patterns-openSUSE-gnome_utilities @@ -1440,7 +1442,6 @@ Recommends: kdepim4-wizards Recommends: kdm Recommends: keditbookmarks -Recommends: kinfocenter Recommends: kio_iso Recommends: kmail Recommends: knotes @@ -1748,10 +1749,12 @@ %endif Recommends: beaver Recommends: brasero +Recommends: bug-buddy Recommends: cheese Recommends: claws-mail Recommends: desktop-data-openSUSE Recommends: droid-fonts +Recommends: empathy Recommends: galculator Recommends: gmixer Recommends: gnome-packagekit @@ -1792,7 +1795,6 @@ Recommends: patterns-openSUSE-multimedia Recommends: patterns-openSUSE-remote_desktop Recommends: pcmanfm -Recommends: pidgin Recommends: pinentry-gtk2 Recommends: preload Recommends: samba @@ -1887,118 +1889,6 @@ %description misc_server This package is installed if a pattern is selected to have a working update path -%package moblin -License: GPLv2+ -Group: Metapackages -Summary: Meta package for pattern moblin -Recommends: MozillaFirefox -Recommends: MozillaFirefox-branding-Moblin -Recommends: anerley -Recommends: aria2 -Recommends: atmel-firmware -Recommends: avahi -Recommends: banshee-1 -Recommends: bickley -Recommends: bisho -Recommends: bluez -Recommends: bluez-alsa -Recommends: bluez-cups -Recommends: bluez-gnome -Recommends: bluez-gstreamer -Recommends: bug-buddy -Recommends: ccss -Recommends: cheese -Recommends: clutter-imcontext -Recommends: cups-backends -Recommends: dalston -Recommends: dbus-1-x11 -Recommends: desktop-data-openSUSE -Recommends: droid-fonts -Recommends: evince -Recommends: evolution -Recommends: evolution-exchange -Recommends: extreme-tuxracer -Recommends: f-spot -Recommends: file-roller -Recommends: frozen-bubble -Recommends: gdm -Recommends: gedit -Recommends: glib2-branding-Moblin -Recommends: gnome-keyring-pam -Recommends: gnome-menus-branding-Moblin -Recommends: gnome-packagekit -Recommends: gnome-terminal -Recommends: gpg2 -Recommends: gpgme -Recommends: gstreamer-0_10 -Recommends: gstreamer-0_10-plugins-base -Recommends: gstreamer-0_10-plugins-farsight -Recommends: gstreamer-0_10-plugins-good -Recommends: gstreamer-0_10-schroedinger -Recommends: gstreamer-0_10-utils -Recommends: gsynaptics -Recommends: gtk2-branding-Moblin -Recommends: gutenprint -Recommends: hplip -Recommends: icon-theme-dmz-cursors -Recommends: ipw-firmware -Recommends: iw -Recommends: jana -Recommends: java-1_6_0-openjdk-plugin -Recommends: laptop-mode-tools -Recommends: libclutter-box2d-0_10-0 -Recommends: libmux0 -Recommends: libnbtk-1_2-0 -Recommends: libsmbios-bin -Recommends: mobile-broadband-provider-info -Recommends: moblin-branding-openSUSE -Recommends: moblin-gtk-engine -Recommends: moblin-icon-theme -Recommends: moblin-panel-applications -Recommends: moblin-panel-myzone -Recommends: moblin-panel-pasteboard -Recommends: moblin-panel-people -Recommends: moblin-panel-status -Recommends: moblin-sound-theme -Recommends: mojito -Recommends: mutter-moblin -Recommends: nautilus -Recommends: nautilus-open-terminal -Recommends: nautilus-sendto -Recommends: nautilus-share -Recommends: network-manager-netbook -Recommends: neverball -Recommends: padevchooser -Recommends: paman -Recommends: paprefs -Recommends: patterns-openSUSE-office -Recommends: pavucontrol -Recommends: pavumeter -Recommends: pcmciautils -Recommends: plymouth-lite -Recommends: preload -Recommends: pulseaudio-esound-compat -Recommends: pulseaudio-module-bluetooth -Recommends: pulseaudio-module-gconf -Recommends: pulseaudio-module-x11 -Recommends: pulseaudio-module-zeroconf -Recommends: pulseaudio-utils -Recommends: samba -Recommends: seahorse -Recommends: smolt -Recommends: syncevolution -Recommends: uxlaunch -Recommends: xdg-user-dirs -Recommends: yast2-gtk -Requires: patterns-openSUSE-moblin -Requires: patterns-openSUSE-x11 -%ifarch x86_64 -Recommends: nspluginwrapper -%endif - -%description moblin -This package is installed if a pattern is selected to have a working update path - %package multimedia License: GPLv2+ Group: Metapackages @@ -2618,7 +2508,6 @@ echo 'This file marks the pattern lxde_office to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/lxde_office.txt echo 'This file marks the pattern mail_server to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/mail_server.txt echo 'This file marks the pattern misc_server to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/misc_server.txt -echo 'This file marks the pattern moblin to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/moblin.txt echo 'This file marks the pattern multimedia to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/multimedia.txt echo 'This file marks the pattern multimedia_opt to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/multimedia_opt.txt echo 'This file marks the pattern network_admin to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/network_admin.txt @@ -3051,11 +2940,6 @@ %dir /usr/share/doc/packages/patterns-openSUSE /usr/share/doc/packages/patterns-openSUSE/misc_server.txt -%files moblin -%defattr(-,root,root) -%dir /usr/share/doc/packages/patterns-openSUSE -/usr/share/doc/packages/patterns-openSUSE/moblin.txt - %files multimedia %defattr(-,root,root) %dir /usr/share/doc/packages/patterns-openSUSE ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/DEVEL-GNOME new/patterns-openSUSE-data/data/DEVEL-GNOME --- old/patterns-openSUSE-data/data/DEVEL-GNOME 2010-06-21 13:39:41.000000000 +0200 +++ new/patterns-openSUSE-data/data/DEVEL-GNOME 2010-09-22 13:20:10.000000000 +0200 @@ -25,7 +25,6 @@ ghex glade glib2-devel -glitz-devel gvfs-devel libgweather-devel gnome-bluetooth-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/DEVEL-IDE new/patterns-openSUSE-data/data/DEVEL-IDE --- old/patterns-openSUSE-data/data/DEVEL-IDE 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/DEVEL-IDE 2010-09-22 09:29:27.000000000 +0200 @@ -7,6 +7,4 @@ -Prc: +Psg: anjuta -#pragma online -eclipse -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/DEVEL-KDE new/patterns-openSUSE-data/data/DEVEL-KDE --- old/patterns-openSUSE-data/data/DEVEL-KDE 2010-06-21 13:48:23.000000000 +0200 +++ new/patterns-openSUSE-data/data/DEVEL-KDE 2010-09-22 13:19:55.000000000 +0200 @@ -16,7 +16,6 @@ icecream ImageMagick-devel krb5-devel -libakode-devel libao-devel libattr-devel libcurl-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GAMES new/patterns-openSUSE-data/data/GAMES --- old/patterns-openSUSE-data/data/GAMES 2010-06-21 12:38:00.000000000 +0200 +++ new/patterns-openSUSE-data/data/GAMES 2010-09-22 09:26:34.000000000 +0200 @@ -8,6 +8,5 @@ circuslinux csmash solarwolf -black-box -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-ADMIN new/patterns-openSUSE-data/data/GNOME-ADMIN --- old/patterns-openSUSE-data/data/GNOME-ADMIN 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-ADMIN 2010-09-23 10:28:30.000000000 +0200 @@ -7,7 +7,8 @@ // bnc#372207 vinagre -Prc: + +Psg: -sabayon pessulus +sabayon -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-BASIS new/patterns-openSUSE-data/data/GNOME-BASIS --- old/patterns-openSUSE-data/data/GNOME-BASIS 2010-06-21 13:43:13.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-BASIS 2010-09-23 10:28:30.000000000 +0200 @@ -5,94 +5,69 @@ gnome-main-menu gnome-panel gnome-session -gnome-vfs2 -Prq: +Prc: -// #591535 -glib2-branding-openSUSE -gtk2-branding-openSUSE +// +// Low-level parts that we need +// // bnc#430161 +NetworkManager +cups-backends +dbus-1-x11 +desktop-file-utils +// we want useful bug reports +gdb +gpg2 +gpgme +input-utils polkit-default-privs +samba +susehelp +// +// Branding +// +// #591535 gconf2-branding-openSUSE +glib2-branding-openSUSE +gnome-menus-branding-openSUSE gtk2-branding-openSUSE +// +// Now the real packages +// // #302205 libgail-gnome -// gconf-editor by default (#304663) -gconf-editor // #332596 gnome-keyring-pam at-spi bug-buddy gnome-control-center -cups-backends -dbus-1-x11 -desktop-file-utils -eog -evince -evolution -file-roller gtk2 -gcalctool -gedit -// open terminal from RMB on desktop -nautilus-open-terminal gnome-user-docs -system-config-printer gnome-desktop gnome-icon-theme gnome-keyring gnome-mag -gnome-media gnome-menus -gnome-menus-branding-openSUSE -gnome-nettool gnome-power-manager gnome-screensaver -gnome-system-monitor gnome-terminal -gnome-themes -gnome-utils -// thumbnailing in nautilus -gnome-web-photo -gpg2 -gpgme -gstreamer-0_10 -gstreamer-0_10-plugins-base -gstreamer-0_10-plugins-good gtk2-engines gtkhtml2 gtkspell -gucharmap -input-utils metacity nautilus -// #302492 -brasero -nautilus-sendto -nautilus-share -NetworkManager NetworkManager-gnome notification-daemon -orca pinentry-gtk2 python-gnome python-gtk -samba shared-mime-info startup-notification -susehelp tango-icon-theme -tomboy -vino vte xkeyboard-config -yast2-control-center-gnome -yast2-sound yelp -zenity -// we want useful bug reports -gdb // Pulseaudio is the default sound server pulseaudio-esound-compat pulseaudio-module-bluetooth @@ -101,31 +76,12 @@ pulseaudio-module-x11 pulseaudio-module-zeroconf pulseaudio-utils -paprefs -pavucontrol -// #379486 -gnome-do -tasque -// #399801 -mousetweaks // #505211 gtk2-metatheme-sonar fifth-leg-font gtk2-engine-murrine // #509829 xdg-user-dirs-gtk -// #594593 -empathy -telepathy-gabble -telepathy-haze -telepathy-salut -// More telepathy connection managers can be added if there's space -// telepathy-butterfly -// telepathy-idle -// #608156 -tracker -tracker-gui -evolution-tracker -Prc: +Psg: // #301664 -> suggests due to 380248 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-BASIS-OPT new/patterns-openSUSE-data/data/GNOME-BASIS-OPT --- old/patterns-openSUSE-data/data/GNOME-BASIS-OPT 2010-06-21 11:52:30.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-BASIS-OPT 2010-09-23 10:28:30.000000000 +0200 @@ -1,6 +1,4 @@ +Prc: -latex2html-pngicons -sensors // #394406 desktop-data-openSUSE-extra-gnome -Prc: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-DESKTOP new/patterns-openSUSE-data/data/GNOME-DESKTOP --- old/patterns-openSUSE-data/data/GNOME-DESKTOP 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-DESKTOP 2010-09-23 10:28:30.000000000 +0200 @@ -2,7 +2,70 @@ patterns-openSUSE-gnome -Prq: ++Prc: +// +// Official upstream +// +// #544192 +alacarte +// #302492 +brasero +// bnc#366894 +cheese +dasher +deskbar-applet +// #594593 +empathy +eog +evince +evolution +file-roller +gcalctool +// gconf-editor by default (#304663) +gconf-editor +gedit +gnome-bluetooth +gnome-media +gnome-nettool +gnome-system-monitor +gnome-themes +// #447627 +gnome-user-share +gnome-utils +gucharmap +// #399801 +mousetweaks +nautilus-sendto +orca +// #545263 +seahorse +tomboy +totem +totem-browser-plugin +vino +zenity +// +// Packages that really make sense +// +system-config-printer +// #608156 +tracker +tracker-gui +evolution-tracker +// +// Telepathy connection managers +// +telepathy-gabble +telepathy-haze +telepathy-salut +// More can be added if there's space +// telepathy-butterfly +// telepathy-idle +-Prc: + +Psg: -xsane +evolution-webcal gnome-backgrounds +// #554954 +gnome-disk-utility -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-Games new/patterns-openSUSE-data/data/GNOME-Games --- old/patterns-openSUSE-data/data/GNOME-Games 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-Games 2010-09-23 10:28:30.000000000 +0200 @@ -1,11 +1,13 @@ +Prq: patterns-openSUSE-gnome_games -gnome-games-recommended -gbrainy -Prq: + +Prc: +gbrainy +gnome-games-recommended phalanx -Prc: + +Psg: gnuchess -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-IDE new/patterns-openSUSE-data/data/GNOME-IDE --- old/patterns-openSUSE-data/data/GNOME-IDE 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-IDE 2010-09-23 10:28:30.000000000 +0200 @@ -4,4 +4,6 @@ +Prc: anjuta +devhelp +glade3 -Prc: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-IMAGE new/patterns-openSUSE-data/data/GNOME-IMAGE --- old/patterns-openSUSE-data/data/GNOME-IMAGE 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-IMAGE 2010-09-23 10:28:30.000000000 +0200 @@ -3,6 +3,12 @@ -Prq: +Prc: +// +// Official upstream +// eog +// +// Packages that really make sense +// f-spot -Prc: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-IMAGE-OPT new/patterns-openSUSE-data/data/GNOME-IMAGE-OPT --- old/patterns-openSUSE-data/data/GNOME-IMAGE-OPT 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-IMAGE-OPT 2010-09-23 10:28:30.000000000 +0200 @@ -1,8 +1,6 @@ +Prc: dia -ImageMagick inkscape -gphoto xsane -Prc: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-Internet new/patterns-openSUSE-data/data/GNOME-Internet --- old/patterns-openSUSE-data/data/GNOME-Internet 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-Internet 2010-09-23 10:28:30.000000000 +0200 @@ -3,23 +3,31 @@ -Prq: +Prc: -liferea -// bnc#381620 -xchat -// bnc#530416 -transmission-gtk +// +// Official upstream +// // bnc#366894 ekiga -// bnc#366894 -cheese +empathy +evolution +gnome-nettool +// +// Packages that really make sense +// +gftp +liferea // bnc#533580 NetworkManager-openvpn-gnome -NetworkManager-vpnc-gnome NetworkManager-pptp-gnome +NetworkManager-vpnc-gnome +// bnc#530416 +transmission-gtk +// bnc#381620 +xchat -Prc: +Psg: +gwibber pan xchat-gnome -gwibber -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-Multimedia new/patterns-openSUSE-data/data/GNOME-Multimedia --- old/patterns-openSUSE-data/data/GNOME-Multimedia 2010-05-27 21:02:58.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-Multimedia 2010-09-23 10:28:30.000000000 +0200 @@ -3,11 +3,9 @@ -Prq: +Prc: -banshee-1 -banshee-1-backend-engine-gstreamer -banshee-1-backend-platform-unix -totem -totem-browser-plugin +// +// GStreamer magic +// // software.openSUSE.org/codecs gstreamer-0_10-plugins-base gstreamer-0_10-plugins-good @@ -15,8 +13,22 @@ gstreamer-0_10-schroedinger // bnc#445314 gstreamer-utils -banshee-1-extensions-default +// +// Official upstream +// +gnome-media +totem +totem-browser-plugin +// +// Packages that really make sense +// +banshee-1 +banshee-1-backend-engine-gstreamer banshee-1-backend-platform-gnome +banshee-1-backend-platform-unix +banshee-1-extensions-default +paprefs +pavucontrol -Prc: +Psg: sound-juicer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-Multimedia-OPT new/patterns-openSUSE-data/data/GNOME-Multimedia-OPT --- old/patterns-openSUSE-data/data/GNOME-Multimedia-OPT 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-Multimedia-OPT 2010-09-23 10:28:30.000000000 +0200 @@ -1,5 +1,2 @@ +Prc: -//392974 banshee-plugins-DAAP -inkscape -gphoto -Prc: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-Office new/patterns-openSUSE-data/data/GNOME-Office --- old/patterns-openSUSE-data/data/GNOME-Office 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-Office 2010-09-23 10:28:30.000000000 +0200 @@ -3,6 +3,13 @@ -Prq: +Prc: +// +// Official upstream +// +evolution +// +// Packages that really make sense +// OpenOffice_org-gnome OpenOffice_org-icon-theme-tango -Prc: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-Office-OPT new/patterns-openSUSE-data/data/GNOME-Office-OPT --- old/patterns-openSUSE-data/data/GNOME-Office-OPT 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-Office-OPT 2010-09-23 10:28:30.000000000 +0200 @@ -6,5 +6,4 @@ +Psg: abiword gnumeric -goffice -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-Utilities new/patterns-openSUSE-data/data/GNOME-Utilities --- old/patterns-openSUSE-data/data/GNOME-Utilities 2010-04-28 10:25:24.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-Utilities 2010-09-23 10:28:30.000000000 +0200 @@ -3,26 +3,36 @@ -Prq: +Prc: -// #544192 -alacarte +// +// Official upstream +// +cheese +dasher deskbar-applet +file-roller +gcalctool +gedit +gnome-utils +gucharmap +nautilus-sendto +seahorse +tomboy +// +// Packages that really make sense +// evolution-pilot -gftp -gnome-bluetooth -// #447627 -gnome-user-share +// #379486 +gnome-do +// thumbnailing in nautilus +gnome-web-photo multisync-gui libopensync-plugin-file -// #545263 -seahorse -vino -dasher +// open terminal from RMB on desktop +nautilus-open-terminal +nautilus-share +tasque -Prc: +Psg: -gnet -bluez-gnome -// #554954 -gnome-disk-utility // #388570 kerneloops-applet libopensync-plugin-evolution2 @@ -35,5 +45,4 @@ libopensync-plugin-syncml libopensync libopensync-tools -evolution-webcal -Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/KDE4-BASIS new/patterns-openSUSE-data/data/KDE4-BASIS --- old/patterns-openSUSE-data/data/KDE4-BASIS 2010-06-21 14:00:41.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-BASIS 2010-09-22 13:20:30.000000000 +0200 @@ -49,7 +49,6 @@ alsa-plugins-pulse #endif kdepasswd -kinfocenter kvkbd // bnc#605509 oxygen-molecule diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/KDE4-Utilities new/patterns-openSUSE-data/data/KDE4-Utilities --- old/patterns-openSUSE-data/data/KDE4-Utilities 2010-05-18 13:47:44.000000000 +0200 +++ new/patterns-openSUSE-data/data/KDE4-Utilities 2010-09-22 13:21:00.000000000 +0200 @@ -13,7 +13,6 @@ -Prc: +Psg: okteta -kweather kteatime ktux amor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/LXDE new/patterns-openSUSE-data/data/LXDE --- old/patterns-openSUSE-data/data/LXDE 2010-06-29 16:17:11.000000000 +0200 +++ new/patterns-openSUSE-data/data/LXDE 2010-09-09 11:00:27.000000000 +0200 @@ -31,7 +31,7 @@ gmixer parcellite xscreensaver -pidgin +empathy xchat claws-mail transmission-gtk @@ -70,6 +70,8 @@ NetworkManager NetworkManager-gnome opensuse-codecs-installer +// help users to provide usefull backtrace +bug-buddy // Default office patter require OO.o // Recommends lxde-office pattern instead patterns-openSUSE-lxde_office diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/MOBLIN new/patterns-openSUSE-data/data/MOBLIN --- old/patterns-openSUSE-data/data/MOBLIN 2010-06-30 10:54:07.000000000 +0200 +++ new/patterns-openSUSE-data/data/MOBLIN 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ -+Prq: -patterns-openSUSE-moblin --Prq: - -+Prc: -anerley -atmel-firmware -banshee-1 -bickley -bisho -bluez -bluez-alsa -bluez-cups -bluez-gnome -bluez-gstreamer -bug-buddy -ccss -cheese -clutter-imcontext -cups-backends -dalston -dbus-1-x11 -evince -evolution -evolution-exchange -extreme-tuxracer -f-spot -file-roller -frozen-bubble -gdm -gedit -glib2-branding-Moblin -gnome-keyring-pam -gnome-menus-branding-Moblin -gnome-packagekit -gnome-terminal -gpg2 -gpgme -gstreamer-0_10 -gstreamer-0_10-plugins-base -gstreamer-0_10-plugins-good -gstreamer-0_10-plugins-farsight -gstreamer-0_10-schroedinger -gstreamer-0_10-utils -gsynaptics -gtk2-branding-Moblin -icon-theme-dmz-cursors -ipw-firmware -iw -jana -laptop-mode-tools -libclutter-box2d-0_10-0 -libmux0 -libnbtk-1_2-0 -libsmbios-bin -mobile-broadband-provider-info -moblin-branding-openSUSE -moblin-gtk-engine -moblin-icon-theme -moblin-panel-applications -moblin-panel-myzone -moblin-panel-pasteboard -moblin-panel-people -moblin-panel-status -moblin-sound-theme -mojito -MozillaFirefox-branding-Moblin -mutter-moblin -nautilus -nautilus-open-terminal -nautilus-sendto -nautilus-share -network-manager-netbook -neverball -pcmciautils -plymouth-lite -pulseaudio-esound-compat -pulseaudio-module-bluetooth -pulseaudio-module-gconf -pulseaudio-module-x11 -pulseaudio-module-zeroconf -pulseaudio-utils -padevchooser -paman -paprefs -pavucontrol -pavumeter -seahorse -smolt -syncevolution -uxlaunch -yast2-gtk --Prc: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/REST-CD new/patterns-openSUSE-data/data/REST-CD --- old/patterns-openSUSE-data/data/REST-CD 2010-06-21 13:39:56.000000000 +0200 +++ new/patterns-openSUSE-data/data/REST-CD 2010-09-09 10:59:48.000000000 +0200 @@ -1,18 +1,22 @@ +Prq: #if defined(__x86_64__) kernel-desktop -preload-kmp-desktop #else kernel-default -preload-kmp-default #endif kernel-firmware -// we need it for the live cds -preload -//compcache -Prq: +Prc: + +#if defined(__x86_64__) +preload-kmp-desktop +#else +preload-kmp-default +#endif +// we need it for the live cds +preload + // #327506 b43-fwcutter // #304219 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/REST-DVD new/patterns-openSUSE-data/data/REST-DVD --- old/patterns-openSUSE-data/data/REST-DVD 2010-08-03 11:54:59.000000000 +0200 +++ new/patterns-openSUSE-data/data/REST-DVD 2010-09-22 13:20:42.000000000 +0200 @@ -37,7 +37,6 @@ kiwi-desc-oemboot kiwi-desc-usbboot kiwi-desc-vmxboot -kiwi-desc-xenboot kiwi-pxeboot kiwi-templates // #301029 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/REST-DVD9 new/patterns-openSUSE-data/data/REST-DVD9 --- old/patterns-openSUSE-data/data/REST-DVD9 2010-06-21 11:15:11.000000000 +0200 +++ new/patterns-openSUSE-data/data/REST-DVD9 2010-09-22 09:29:32.000000000 +0200 @@ -1,7 +1,6 @@ +Prc: kdeartwork4-wallpapers kdebase4-wallpapers -eclipse netbeans javamail-javadoc kernel-debug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/moblin/category new/patterns-openSUSE-data/toinstall/moblin/category --- old/patterns-openSUSE-data/toinstall/moblin/category 2010-05-26 12:00:07.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/moblin/category 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -addon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/moblin/icon new/patterns-openSUSE-data/toinstall/moblin/icon --- old/patterns-openSUSE-data/toinstall/moblin/icon 2010-05-26 12:00:07.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/moblin/icon 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -pattern-moblin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/moblin/order new/patterns-openSUSE-data/toinstall/moblin/order --- old/patterns-openSUSE-data/toinstall/moblin/order 2010-05-26 12:00:07.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/moblin/order 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -4000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/moblin/recommends new/patterns-openSUSE-data/toinstall/moblin/recommends --- old/patterns-openSUSE-data/toinstall/moblin/recommends 2010-05-26 12:00:07.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/moblin/recommends 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -office diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/moblin/requires new/patterns-openSUSE-data/toinstall/moblin/requires --- old/patterns-openSUSE-data/toinstall/moblin/requires 2010-05-26 12:00:07.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/moblin/requires 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -x11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/moblin/role new/patterns-openSUSE-data/toinstall/moblin/role --- old/patterns-openSUSE-data/toinstall/moblin/role 2010-05-26 12:00:07.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/moblin/role 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Graphical Environments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/moblin/sel new/patterns-openSUSE-data/toinstall/moblin/sel --- old/patterns-openSUSE-data/toinstall/moblin/sel 2010-05-26 12:00:07.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/moblin/sel 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -MOBLIN -COMMON-DESKTOP -COMMON-DESKTOP-OPT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/moblin/visible new/patterns-openSUSE-data/toinstall/moblin/visible --- old/patterns-openSUSE-data/toinstall/moblin/visible 2010-05-26 12:00:07.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/moblin/visible 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -false ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patterns for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package patterns for openSUSE:Factory checked in at Tue Sep 28 14:44:49 CEST 2010. -------- --- patterns/patterns.changes 2010-06-18 16:30:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns/patterns.changes 2010-09-28 11:08:33.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 28 09:07:54 UTC 2010 - coolo(a)novell.com + +- update translations + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- patterns-1.2094.tar.bz2 New: ---- patterns-1.2095.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns.spec ++++++ --- /var/tmp/diff_new_pack.N8dSPh/_old 2010-09-28 14:44:38.000000000 +0200 +++ /var/tmp/diff_new_pack.N8dSPh/_new 2010-09-28 14:44:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package patterns (Version 1.2094) +# spec file for package patterns (Version 1.2095) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ Group: System/Packages AutoReqProv: on Summary: Patterns Translation Tool -Version: 1.2094 -Release: 2 +Version: 1.2095 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-%{version}.tar.bz2 Source1: create_pattern.sh ++++++ patterns-1.2094.tar.bz2 -> patterns-1.2095.tar.bz2 ++++++ ++++ 8167 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at Tue Sep 28 14:44:10 CEST 2010. -------- --- linuxrc/linuxrc.changes 2010-09-10 14:54:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2010-09-28 14:22:56.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 28 14:22:06 CEST 2010 - snwint(a)suse.de + +- remove 'no DUD found' message (bnc #601770) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linuxrc-3.5.2.tar.bz2 New: ---- linuxrc-3.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.6RXjbN/_old 2010-09-28 14:43:54.000000000 +0200 +++ /var/tmp/diff_new_pack.6RXjbN/_new 2010-09-28 14:43:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.5.2) +# spec file for package linuxrc (Version 3.5.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.5.2 +Version: 3.5.3 Release: 1 -Source: linuxrc-3.5.2.tar.bz2 +Source: linuxrc-3.5.3.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-3.5.2.tar.bz2 -> linuxrc-3.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/auto2.c new/linuxrc-3.5.3/auto2.c --- old/linuxrc-3.5.2/auto2.c 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/auto2.c 2010-09-28 14:21:31.000000000 +0200 @@ -391,12 +391,6 @@ if(dud_count == config.update.count) { fprintf(stderr, "No new driver updates found.\n"); - if(config.win && config.manual) { - dia_message(txt_get(TXT_DUD_NOTFOUND), MSGTYPE_INFO); - } - else { - // printf("No new driver updates found.\n"); - } } else { if(*names) { @@ -1094,7 +1088,6 @@ if(dud_count == config.update.count) { fprintf(stderr, "No new driver updates found.\n"); - if(config.win && config.manual) dia_message(txt_get(TXT_DUD_NOTFOUND), MSGTYPE_INFO); } else { if(*names) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/changelog new/linuxrc-3.5.3/changelog --- old/linuxrc-3.5.2/changelog 2010-09-10 14:54:14.000000000 +0200 +++ new/linuxrc-3.5.3/changelog 2010-09-28 14:22:00.000000000 +0200 @@ -1,4 +1,7 @@ -2010-09-10: HEAD +2010-09-28: HEAD + - remove 'no DUD found' message (bnc #601770) + +2010-09-10: 3.5.2 - fix scanning for driver updates 2010-09-02: 3.5.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/af.po new/linuxrc-3.5.3/po/af.po --- old/linuxrc-3.5.2/po/af.po 2010-09-10 14:53:47.000000000 +0200 +++ new/linuxrc-3.5.3/po/af.po 2010-09-28 14:21:31.000000000 +0200 @@ -963,10 +963,6 @@ msgid "Reading Driver Update..." msgstr "Lees van aandrywerbywerking ..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Geen nuwe aandrywerbywerkings gevind nie" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Aandrywerbywerkings bygevoeg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/bg.po new/linuxrc-3.5.3/po/bg.po --- old/linuxrc-3.5.2/po/bg.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/bg.po 2010-09-28 14:21:31.000000000 +0200 @@ -970,10 +970,6 @@ msgid "Reading Driver Update..." msgstr "Четене на обновяването на драйверите..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Не са намерени нови драйвери" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Добавени драйвери за обновяване" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/ca.po new/linuxrc-3.5.3/po/ca.po --- old/linuxrc-3.5.2/po/ca.po 2010-09-10 14:53:47.000000000 +0200 +++ new/linuxrc-3.5.3/po/ca.po 2010-09-28 14:21:31.000000000 +0200 @@ -966,10 +966,6 @@ msgid "Reading Driver Update..." msgstr "S'està llegint l'actualització de controladors..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "No s'ha trobat cap actualització de controladors." - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "S'ha afegit l'actualització de controladors" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/cs.po new/linuxrc-3.5.3/po/cs.po --- old/linuxrc-3.5.2/po/cs.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/cs.po 2010-09-28 14:21:31.000000000 +0200 @@ -970,10 +970,6 @@ msgid "Reading Driver Update..." msgstr "Načítám aktualizaci ovladače..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Nebyla nalezena žádná aktualizace ovladače" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Aktualizace ovladače provedena" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/da.po new/linuxrc-3.5.3/po/da.po --- old/linuxrc-3.5.2/po/da.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/da.po 2010-09-28 14:21:31.000000000 +0200 @@ -968,10 +968,6 @@ msgid "Reading Driver Update..." msgstr "Indlæser driveropdatering..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Ingen nye drivere fundet" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Driveropdateringer tilføjet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/de.po new/linuxrc-3.5.3/po/de.po --- old/linuxrc-3.5.2/po/de.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/de.po 2010-09-28 14:21:31.000000000 +0200 @@ -971,10 +971,6 @@ msgid "Reading Driver Update..." msgstr "Treiber-Aktualisierung wird eingelesen ..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Es wurden keine neuen Treiber-Aktualisierungen gefunden." - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Treiber-Aktualisierungen hinzugefügt" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/el.po new/linuxrc-3.5.3/po/el.po --- old/linuxrc-3.5.2/po/el.po 2010-09-10 14:53:47.000000000 +0200 +++ new/linuxrc-3.5.3/po/el.po 2010-09-28 14:21:31.000000000 +0200 @@ -972,10 +972,6 @@ msgid "Reading Driver Update..." msgstr "Ανάγνωση Ενημέρωσης Οδηγού..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Δεν βρέθηκαν νέες Ενημερώσεις Οδηγών" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Προστέθηκε Ενημέρωση Οδηγού " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/es.po new/linuxrc-3.5.3/po/es.po --- old/linuxrc-3.5.2/po/es.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/es.po 2010-09-28 14:21:31.000000000 +0200 @@ -971,10 +971,6 @@ msgid "Reading Driver Update..." msgstr "Leyendo actualización de controladores..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "No se han encontrado actualizaciones de controladores" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Actualizaciones de controladores añadidas" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/fi.po new/linuxrc-3.5.3/po/fi.po --- old/linuxrc-3.5.2/po/fi.po 2010-09-10 14:53:47.000000000 +0200 +++ new/linuxrc-3.5.3/po/fi.po 2010-09-28 14:21:31.000000000 +0200 @@ -967,10 +967,6 @@ msgid "Reading Driver Update..." msgstr "Luetaan ohjainpäivitystä..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Uusia ohjainpäivityksiä ei löytynyt" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Ohjainpäivitykset lisättiin" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/fr.po new/linuxrc-3.5.3/po/fr.po --- old/linuxrc-3.5.2/po/fr.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/fr.po 2010-09-28 14:21:31.000000000 +0200 @@ -1140,10 +1140,6 @@ msgid "Reading Driver Update..." msgstr "Lecture de la mise à jour du pilote..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Aucune nouvelle mise à jour de pilote" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Mises à jour de pilote ajoutées" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/hu.po new/linuxrc-3.5.3/po/hu.po --- old/linuxrc-3.5.2/po/hu.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/hu.po 2010-09-28 14:21:31.000000000 +0200 @@ -972,10 +972,6 @@ msgid "Reading Driver Update..." msgstr "Illesztőprogram-frissítés olvasása..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Új Illesztőprogram-frissítés nem található" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Illesztőprogram-frissítések hozzáadva" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/it.po new/linuxrc-3.5.3/po/it.po --- old/linuxrc-3.5.2/po/it.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/it.po 2010-09-28 14:21:31.000000000 +0200 @@ -964,10 +964,6 @@ msgid "Reading Driver Update..." msgstr "Lettura dell'aggiornamento driver in corso..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Non sono stati rilevati nuovi aggiornamenti driver" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Aggiornamenti driver aggiunti" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/ja.po new/linuxrc-3.5.3/po/ja.po --- old/linuxrc-3.5.2/po/ja.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/ja.po 2010-09-28 14:21:31.000000000 +0200 @@ -966,10 +966,6 @@ msgid "Reading Driver Update..." msgstr "ドライバ更新を読み取っています..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "新しいドライバ更新が見つかりませんでした。" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "ドライバ更新が追加されました" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/linuxrc.pot new/linuxrc-3.5.3/po/linuxrc.pot --- old/linuxrc-3.5.2/po/linuxrc.pot 2010-09-10 14:53:47.000000000 +0200 +++ new/linuxrc-3.5.3/po/linuxrc.pot 2010-09-28 14:21:31.000000000 +0200 @@ -917,10 +917,6 @@ msgid "Reading Driver Update..." msgstr "" -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/nb.po new/linuxrc-3.5.3/po/nb.po --- old/linuxrc-3.5.2/po/nb.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/nb.po 2010-09-28 14:21:31.000000000 +0200 @@ -970,10 +970,6 @@ msgid "Reading Driver Update..." msgstr "Leser driveroppgradering..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Ingen nye driveroppgraderinger funnet" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Driveroppgraderinger lagt til" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/nl.po new/linuxrc-3.5.3/po/nl.po --- old/linuxrc-3.5.2/po/nl.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/nl.po 2010-09-28 14:21:31.000000000 +0200 @@ -967,10 +967,6 @@ msgid "Reading Driver Update..." msgstr "Stuurprogramma-opwaardering wordt gelezen..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Geen nieuwe stuurprogramma-opwaardering gevonden" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Stuurprogramma-opwaardering toegevoegd" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/pl.po new/linuxrc-3.5.3/po/pl.po --- old/linuxrc-3.5.2/po/pl.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/pl.po 2010-09-28 14:21:31.000000000 +0200 @@ -965,10 +965,6 @@ msgid "Reading Driver Update..." msgstr "Odczytywanie aktualizacji sterowników..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Nie znaleziono aktualizacji sterowników" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Dodana aktualizacja sterowników" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/pt_BR.po new/linuxrc-3.5.3/po/pt_BR.po --- old/linuxrc-3.5.2/po/pt_BR.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/pt_BR.po 2010-09-28 14:21:31.000000000 +0200 @@ -967,10 +967,6 @@ msgid "Reading Driver Update..." msgstr "Lendo a atualização de driver..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Nenhuma atualização de driver encontrada" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Atualizações de driver adicionadas" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/pt.po new/linuxrc-3.5.3/po/pt.po --- old/linuxrc-3.5.2/po/pt.po 2010-09-10 14:53:47.000000000 +0200 +++ new/linuxrc-3.5.3/po/pt.po 2010-09-28 14:21:31.000000000 +0200 @@ -968,10 +968,6 @@ msgid "Reading Driver Update..." msgstr "A ler a Actualização do Driver..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Nenhuma Actualização Nova do Driver encontrada" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Actualizações do Driver Adicionadas" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/ru.po new/linuxrc-3.5.3/po/ru.po --- old/linuxrc-3.5.2/po/ru.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/ru.po 2010-09-28 14:21:31.000000000 +0200 @@ -965,10 +965,6 @@ msgid "Reading Driver Update..." msgstr "Чтение обновлений драйверов..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Новые обновления драйверов не найдены" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Обновления драйверов добавлены" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/sk.po new/linuxrc-3.5.3/po/sk.po --- old/linuxrc-3.5.2/po/sk.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/sk.po 2010-09-28 14:21:31.000000000 +0200 @@ -971,10 +971,6 @@ msgid "Reading Driver Update..." msgstr "Čítam aktualizáciu ovládačov..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Neboli nájdené žiadne aktualizované ovládače" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Boli pridané aktualizácie ovládačov" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/sl.po new/linuxrc-3.5.3/po/sl.po --- old/linuxrc-3.5.2/po/sl.po 2010-09-10 14:53:47.000000000 +0200 +++ new/linuxrc-3.5.3/po/sl.po 2010-09-28 14:21:31.000000000 +0200 @@ -968,10 +968,6 @@ msgid "Reading Driver Update..." msgstr "Branje posodobitve gonilnika." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Posodobitev gonilnika ni." - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Dodane posodobitve gonilnika" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/sv.po new/linuxrc-3.5.3/po/sv.po --- old/linuxrc-3.5.2/po/sv.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/sv.po 2010-09-28 14:21:31.000000000 +0200 @@ -967,10 +967,6 @@ msgid "Reading Driver Update..." msgstr "Läser drivrutinsuppdatering..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Det gick inte att hitta några nya drivrutinsuppdateringar" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Drivrutinsuppdateringar har lagts till" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/uk.po new/linuxrc-3.5.3/po/uk.po --- old/linuxrc-3.5.2/po/uk.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/uk.po 2010-09-28 14:21:31.000000000 +0200 @@ -968,10 +968,6 @@ msgid "Reading Driver Update..." msgstr "Читання оновлення драйверів..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Не знайдено нових оновлень драйверів" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Додано оновлення драйверів" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/xh.po new/linuxrc-3.5.3/po/xh.po --- old/linuxrc-3.5.2/po/xh.po 2010-09-10 14:53:47.000000000 +0200 +++ new/linuxrc-3.5.3/po/xh.po 2010-09-28 14:21:31.000000000 +0200 @@ -960,10 +960,6 @@ msgid "Reading Driver Update..." msgstr "Kufundwa Uhlaziyo Lomqhubi..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Akukho Ziganeko Zohlaziyo zitsha Zomqhubi zifunyenweyo" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Kufakelwa Iziganeko Zohlaziyo Lomqhubi" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/zh_CN.po new/linuxrc-3.5.3/po/zh_CN.po --- old/linuxrc-3.5.2/po/zh_CN.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/zh_CN.po 2010-09-28 14:21:31.000000000 +0200 @@ -966,10 +966,6 @@ msgid "Reading Driver Update..." msgstr "正在读取驱动程序更新..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "未找到任何新驱动程序更新" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "已添加驱动程序更新" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/zh_TW.po new/linuxrc-3.5.3/po/zh_TW.po --- old/linuxrc-3.5.2/po/zh_TW.po 2010-09-10 14:53:53.000000000 +0200 +++ new/linuxrc-3.5.3/po/zh_TW.po 2010-09-28 14:21:31.000000000 +0200 @@ -964,10 +964,6 @@ msgid "Reading Driver Update..." msgstr "正在讀取「驅動程式更新」..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "找不到新的「驅動程式更新」" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "「驅動程式更新」已新增" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/po/zu.po new/linuxrc-3.5.3/po/zu.po --- old/linuxrc-3.5.2/po/zu.po 2010-09-10 14:53:47.000000000 +0200 +++ new/linuxrc-3.5.3/po/zu.po 2010-09-28 14:21:31.000000000 +0200 @@ -963,10 +963,6 @@ msgid "Reading Driver Update..." msgstr "Ifunda Ukuvuselelwa Kwe-Driver..." -#. TXT_DUD_NOTFOUND -msgid "No new Driver Updates found" -msgstr "Akukho Ukuvuselelwa Kwama-Driver Amasha okutholakele" - #. TXT_DUD_ADDED msgid "Driver Updates added" msgstr "Izinhlelo Zokuvuselelwa Kwama-Driver Zifakiwe" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.2/VERSION new/linuxrc-3.5.3/VERSION --- old/linuxrc-3.5.2/VERSION 2010-09-10 14:54:12.000000000 +0200 +++ new/linuxrc-3.5.3/VERSION 2010-09-28 14:21:59.000000000 +0200 @@ -1 +1 @@ -3.5.2 +3.5.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at Tue Sep 28 00:07:08 CEST 2010. -------- --- xen/xen.changes 2010-07-31 00:30:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2010-09-27 23:07:46.000000000 +0200 @@ -2 +2,88 @@ -Tue Jul 27 16:32:57 MDT 2010 - jfehlig(a)novell.com +Mon Sep 27 09:59:37 MDT 2010 - carnold(a)novell.com + +- bnc#640773 - Xen kernel crashing right after grub + 21894-intel-unmask-cpuid.patch +- Upstream patch from Jan + 22148-serial-irq-dest.patch + +------------------------------------------------------------------- +Tue Sep 23 16:45:11 CST 2010 - cyliu(a)novell.com + +- bnc#628719 - improve check_device_status to handle HA cases + check_device_status.patch + +------------------------------------------------------------------- +Tue Sep 23 16:43:11 CST 2010 - cyliu(a)novell.com + +- bnc#628719 - multi-xvdp + mutli-xvdp.patch + +------------------------------------------------------------------- +Tue Sep 20 14:11:31 CST 2010 - cyliu(a)novell.com + +- bnc#632956 - fix VNC altgr-insert behavior + +------------------------------------------------------------------- +Mon Sep 13 16:24:31 MDT 2010 - carnold(a)novell.com + +- bnc#636231 - XEN: Unable to disconnect/remove CDROM drive from VM + xend-devid-or-name.patch + +------------------------------------------------------------------- +Mon Sep 13 10:50:56 MDT 2010 - carnold(a)novell.com + +- Upstream patches from Jan + 22019-x86-cpuidle-online-check.patch + 22051-x86-forced-EOI.patch + 22067-x86-irq-domain.patch + 22068-vtd-irte-RH-bit.patch + 22071-ept-get-entry-lock.patch + 22084-x86-xsave-off.patch + +------------------------------------------------------------------- +Mon Sep 13 10:47:09 MDT 2010 - carnold(a)novell.com + +- bnc#638465 - hypervisor panic in memory handling + 22135-heap-lock.patch + +------------------------------------------------------------------- +Thu Sep 9 11:29:45 MDT 2010 - carnold(a)novell.com + +- Update to Xen 4.0.1. This is a bug fix release. + +------------------------------------------------------------------- +Mon Aug 16 18:35:11 MDT 2010 - carnold(a)novell.com + +- bnc#626262 - Populate-on-demand memory problem on xen with hvm + guest + 21971-pod-accounting.patch + +------------------------------------------------------------------- +Mon Aug 16 17:03:58 CST 2010 - cyliu(a)novell.com + +- bnc#584204 - xm usb-list broken + usb-list.patch + +------------------------------------------------------------------- +Thu Aug 12 06:13:44 MDT 2010 - carnold(a)novell.com + +- bnc#625520 - TP-L3: NMI cannot be triggered for xen kernel + 21926-x86-pv-NMI-inject.patch + +------------------------------------------------------------------- +Mon Aug 9 09:47:09 MDT 2010 - carnold(a)novell.com + +- bnc#613529 - TP-L3: kdump kernel hangs when crash was initiated + from xen kernel + 21886-kexec-shutdown.patch + +------------------------------------------------------------------- +Mon Aug 2 16:42:41 MDT 2010 - carnold(a)novell.com + +- Upstream Intel patches to improve X2APIC handling. + 21716-iommu-alloc.patch + 21717-ir-qi.patch + 21718-x2apic-logic.patch + +------------------------------------------------------------------- +Tue Jul 27 16:23:09 MDT 2010 - jfehlig(a)novell.com @@ -8 +95 @@ -Tue Jul 27 15:39:17 MDT 2010 - jfehlig(a)novell.com +Tue Jul 27 15:37:51 MDT 2010 - jfehlig(a)novell.com @@ -14 +101 @@ -Mon Jul 26 16:49:39 MDT 2010 - jfehlig(a)novell.com +Mon Jul 26 16:53:02 MDT 2010 - jfehlig(a)novell.com @@ -19 +106 @@ -Mon Jul 26 16:45:21 MDT 2010 - jfehlig(a)novell.com +Mon Jul 26 16:22:56 MDT 2010 - jfehlig(a)novell.com @@ -69,0 +157,2 @@ + 21933-vtd-ioapic-write.patch + 21953-msi-enable.patch calling whatdependson for head-i586 Old: ---- 21109-x86-cpu-hotplug.patch 21128-domain-save-flush.patch 21129-xen-hotplug-cleanup.patch 21150-shadow-race.patch 21151-trace-bounds-check.patch 21160-sysctl-debug-keys.patch 21189-x86-emulate-clflush.patch 21193-blktap-script.patch 21194-ioemu-subtype.patch 21223-xend-preserve-devs.patch 21225-conring-iommu.patch 21234-x86-bad-srat-clear-pxm2node.patch 21266-vmx-disabled-check.patch 21272-x86-dom0-alloc-performance.patch 21273-linux-autconf.patch 21317-xend-blkif-util-tap2.patch 21331-svm-vintr-during-nmi.patch 21333-xentrace-t_info-size.patch 21340-vtd-dom0-mapping-latency.patch 21346-x86-platform-timer-wrap.patch 21349-x86-memcpy.patch 21360-x86-mce-polling-disabled-init.patch 21372-x86-cross-cpu-wait.patch 21373-dummy-domain-io-caps.patch 21408-amd-erratum-383.patch 21435-vmx-retain-global-controls.patch 21445-x86-tsc-handling-cleanups-v2.patch 21446-iommu-graceful-generic-fail.patch 21453-shadow-avoid-remove-all-after-teardown.patch 21456-compat-hvm-addr-check.patch 21459-block-script.patch 21460-xend-timeoffset.patch 21492-x86-pirq-unbind.patch 21620-x86-signed-domain-irq.patch 21643-vmx-vpmu-pmc-offset.patch 21682-trace-buffer-range.patch 21693-memevent-64bit-only.patch 21695-trace-t_info-readonly.patch 21698-x86-pirq-range-check.patch 21699-p2m-query-for-type-change.patch 21700-32on64-vm86-gpf.patch 21705-trace-printk.patch 21706-trace-security.patch 21712-amd-osvw.patch 21744-x86-cpufreq-range-check.patch block-flags.diff block-losetup-retry.diff passthrough-hotplug-segfault.patch suse-disable-tap2-default.patch xen-4.0.0-testing-src.tar.bz2 New: ---- 21894-intel-unmask-cpuid.patch 22019-x86-cpuidle-online-check.patch 22051-x86-forced-EOI.patch 22067-x86-irq-domain.patch 22068-vtd-irte-RH-bit.patch 22071-ept-get-entry-lock.patch 22084-x86-xsave-off.patch 22135-heap-lock.patch 22148-serial-irq-dest.patch 7410-qemu-alt-gr.patch check_device_status.patch multi-xvdp.patch usb-list.patch xen-4.0.1-testing-src.tar.bz2 xend-devid-or-name.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xen (Version 4.0.0_21091_05) +# spec file for package xen (Version 4.0.1_21326_01) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ ExclusiveArch: %ix86 x86_64 %define xvers 4.0 %define xvermaj 4 -%define changeset 21091 -%define xen_build_dir xen-4.0.0-testing +%define changeset 21326 +%define xen_build_dir xen-4.0.1-testing %define with_kmp 1 BuildRequires: LibVNCServer-devel SDL-devel acpica automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel texinfo transfig BuildRequires: texlive texlive-latex @@ -38,14 +38,14 @@ %if %{?with_kmp}0 BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif -Version: 4.0.0_21091_05 -Release: 9 +Version: 4.0.1_21326_01 +Release: 1 License: GPLv2+ Group: System/Kernel AutoReqProv: on PreReq: %insserv_prereq %fillup_prereq Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) -Source0: xen-4.0.0-testing-src.tar.bz2 +Source0: xen-4.0.1-testing-src.tar.bz2 Source2: README.SuSE Source3: boot.xen Source4: boot.local.xenU @@ -75,68 +75,32 @@ Source25: xen-updown.sh # Upstream patches Patch0: 21089-x86-startup-irq-from-setup-gsi.patch -Patch1: 21109-x86-cpu-hotplug.patch -Patch2: 21128-domain-save-flush.patch -Patch3: 21129-xen-hotplug-cleanup.patch -Patch4: 21150-shadow-race.patch -Patch5: 21151-trace-bounds-check.patch -Patch6: 21160-sysctl-debug-keys.patch -Patch7: 21189-x86-emulate-clflush.patch -Patch8: 21193-blktap-script.patch -Patch9: 21194-ioemu-subtype.patch -Patch10: 21223-xend-preserve-devs.patch -Patch11: 21225-conring-iommu.patch -Patch12: 21234-x86-bad-srat-clear-pxm2node.patch -Patch13: 21235-crashkernel-advanced.patch -Patch14: 21266-vmx-disabled-check.patch -Patch15: 21271-x86-cache-flush-global.patch -Patch16: 21272-x86-dom0-alloc-performance.patch -Patch17: 21273-linux-autconf.patch -Patch18: 21301-svm-lmsl.patch -Patch19: 21304-keyhandler-alternative.patch -Patch20: 21317-xend-blkif-util-tap2.patch -Patch21: passthrough-hotplug-segfault.patch -Patch22: 21331-svm-vintr-during-nmi.patch -Patch23: 21333-xentrace-t_info-size.patch -Patch24: 21340-vtd-dom0-mapping-latency.patch -Patch25: 21346-x86-platform-timer-wrap.patch -Patch26: 21349-x86-memcpy.patch -Patch27: 21360-x86-mce-polling-disabled-init.patch -Patch28: 21372-x86-cross-cpu-wait.patch -Patch29: 21373-dummy-domain-io-caps.patch -Patch30: 21406-x86-microcode-quiet.patch -Patch31: 21408-amd-erratum-383.patch -Patch32: 21421-vts-ats-enabling.patch -Patch33: 21435-vmx-retain-global-controls.patch -Patch34: 21445-x86-tsc-handling-cleanups-v2.patch -Patch35: 21446-iommu-graceful-generic-fail.patch -Patch36: 21453-shadow-avoid-remove-all-after-teardown.patch -Patch37: 21456-compat-hvm-addr-check.patch -Patch38: 21459-block-script.patch -Patch39: 21460-xend-timeoffset.patch -Patch40: 21492-x86-pirq-unbind.patch -Patch41: 21526-x86-nehalem-cpuid-mask.patch -Patch42: 21542-amd-erratum-411.patch -Patch43: 21615-dont-save-xen-heap-pages.patch -Patch44: 21620-x86-signed-domain-irq.patch -Patch45: 21627-cpuidle-wrap.patch -Patch46: 21643-vmx-vpmu-pmc-offset.patch -Patch47: 21653-xend-mac-addr.patch -Patch48: 21678-xend-mac-fix.patch -Patch49: 21682-trace-buffer-range.patch -Patch50: 21683-vtd-kill-timer-conditional.patch -Patch51: 21693-memevent-64bit-only.patch -Patch52: 21695-trace-t_info-readonly.patch -Patch53: 21698-x86-pirq-range-check.patch -Patch54: 21699-p2m-query-for-type-change.patch -Patch55: 21700-32on64-vm86-gpf.patch -Patch56: 21705-trace-printk.patch -Patch57: 21706-trace-security.patch -Patch58: 21712-amd-osvw.patch -Patch59: 21723-get-domu-state.patch -Patch60: 21744-x86-cpufreq-range-check.patch -Patch61: 21847-pscsi.patch -Patch62: 21866-xenapi.patch +Patch1: 21235-crashkernel-advanced.patch +Patch2: 21271-x86-cache-flush-global.patch +Patch3: 21301-svm-lmsl.patch +Patch4: 21304-keyhandler-alternative.patch +Patch5: 21406-x86-microcode-quiet.patch +Patch6: 21421-vts-ats-enabling.patch +Patch7: 21526-x86-nehalem-cpuid-mask.patch +Patch8: 21542-amd-erratum-411.patch +Patch9: 21615-dont-save-xen-heap-pages.patch +Patch10: 21627-cpuidle-wrap.patch +Patch11: 21653-xend-mac-addr.patch +Patch12: 21678-xend-mac-fix.patch +Patch13: 21683-vtd-kill-timer-conditional.patch +Patch14: 21723-get-domu-state.patch +Patch15: 21847-pscsi.patch +Patch16: 21866-xenapi.patch +Patch17: 21894-intel-unmask-cpuid.patch +Patch18: 22019-x86-cpuidle-online-check.patch +Patch19: 22051-x86-forced-EOI.patch +Patch20: 22067-x86-irq-domain.patch +Patch21: 22068-vtd-irte-RH-bit.patch +Patch22: 22071-ept-get-entry-lock.patch +Patch23: 22084-x86-xsave-off.patch +Patch24: 7410-qemu-alt-gr.patch +Patch25: 22135-heap-lock.patch +Patch26: 22148-serial-irq-dest.patch # Our patches Patch300: xen-config.diff Patch301: xend-config.diff @@ -156,8 +120,6 @@ Patch315: xen-disable-libxl.diff Patch316: xen-disable-xenpaging.diff Patch317: xen-extra-fixes.patch -Patch320: block-losetup-retry.diff -Patch321: block-flags.diff Patch322: bridge-opensuse.patch Patch323: bridge-vlan.diff Patch324: bridge-bonding.diff @@ -185,7 +147,6 @@ Patch356: ioemu-vnc-resize.patch Patch357: ioemu-debuginfo.patch Patch358: vif-bridge-no-iptables.patch -Patch359: suse-disable-tap2-default.patch # Needs to go upstream Patch360: checkpoint-rename.patch Patch361: xm-save-check-file.patch @@ -200,6 +161,8 @@ Patch370: xend-sysconfig.patch Patch371: domu-usb-controller.patch Patch372: popen2-argument-fix.patch +Patch373: usb-list.patch +Patch374: xend-devid-or-name.patch # Patches for snapshot support Patch400: snapshot-ioemu-save.patch Patch401: snapshot-ioemu-restore.patch @@ -217,14 +180,16 @@ # Other bug fixes or features Patch423: bdrv_open2_fix_flags.patch Patch424: bdrv_open2_flags_2.patch -Patch425: ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch -Patch426: ioemu-bdrv-open-CACHE_WB.patch +Patch425: ioemu-bdrv-open-CACHE_WB.patch +Patch426: ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch Patch427: xen-ioemu-hvm-pv-support.diff Patch428: qemu-dm-segfault.patch Patch429: hibernate.patch Patch430: del_usb_xend_entry.patch Patch431: capslock_enable.patch Patch432: enable_more_nic_pxe.patch +Patch433: multi-xvdp.patch +Patch434: check_device_status.patch # Jim's domain lock patch Patch450: xend-domain-lock.patch # Hypervisor and PV driver Patches @@ -609,42 +574,6 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 -%patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 -%patch53 -p1 -%patch54 -p1 -%patch55 -p1 -%patch56 -p1 -%patch57 -p1 -%patch58 -p1 -%patch59 -p1 -%patch60 -p1 -%patch61 -p1 -%patch62 -p1 %patch300 -p1 %patch301 -p1 %patch302 -p1 @@ -663,8 +592,6 @@ %patch315 -p1 %patch316 -p1 %patch317 -p1 -#%patch320 -p1 -#%patch321 -p1 %patch322 -p1 %patch323 -p1 %patch324 -p1 @@ -692,7 +619,6 @@ %patch356 -p1 %patch357 -p1 %patch358 -p1 -%patch359 -p1 %patch360 -p1 %patch361 -p1 %patch362 -p1 @@ -706,6 +632,8 @@ %patch370 -p1 %patch371 -p1 %patch372 -p1 +%patch373 -p1 +%patch374 -p1 %patch400 -p1 %patch401 -p1 %patch402 -p1 @@ -728,6 +656,8 @@ %patch430 -p1 %patch431 -p1 %patch432 -p1 +%patch433 -p1 +%patch434 -p1 %patch450 -p1 %patch500 -p1 %patch501 -p1 @@ -916,6 +846,7 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/python%{pyver}/site-packages/xen/remus # This is necessary because of the build of libconfig for libxl #rm -rf $RPM_BUILD_ROOT/$RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug %files %defattr(-,root,root) @@ -974,6 +905,7 @@ /usr/sbin/td-util /usr/sbin/vhd-update /usr/sbin/vhd-util +/usr/sbin/gdbsx %dir %{_libdir}/xen %dir %{_libdir}/xen/bin %ifarch x86_64 ++++++ 21089-x86-startup-irq-from-setup-gsi.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -54,9 +54,11 @@ Signed-off-by: Jan Beulich <jbeulich(a)novell.com> ---- a/xen/arch/x86/io_apic.c -+++ b/xen/arch/x86/io_apic.c -@@ -2111,6 +2111,7 @@ int __init io_apic_get_redir_entries (in +Index: xen-4.0.1-testing/xen/arch/x86/io_apic.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/io_apic.c ++++ xen-4.0.1-testing/xen/arch/x86/io_apic.c +@@ -2231,6 +2231,7 @@ int __init io_apic_get_redir_entries (in int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low) { @@ -64,7 +66,7 @@ struct IO_APIC_route_entry entry; unsigned long flags; int vector; -@@ -2162,7 +2163,12 @@ int io_apic_set_pci_routing (int ioapic, +@@ -2282,7 +2283,12 @@ int io_apic_set_pci_routing (int ioapic, io_apic_write(ioapic, 0x11+2*pin, *(((int *)&entry)+1)); io_apic_write(ioapic, 0x10+2*pin, *(((int *)&entry)+0)); set_native_irq_info(irq, TARGET_CPUS); @@ -78,9 +80,11 @@ return 0; } ---- a/xen/arch/x86/mpparse.c -+++ b/xen/arch/x86/mpparse.c -@@ -1103,6 +1103,8 @@ int mp_register_gsi (u32 gsi, int trigge +Index: xen-4.0.1-testing/xen/arch/x86/mpparse.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/mpparse.c ++++ xen-4.0.1-testing/xen/arch/x86/mpparse.c +@@ -1102,6 +1102,8 @@ int mp_register_gsi (u32 gsi, int trigge int ioapic = -1; int ioapic_pin = 0; int idx, bit = 0; @@ -89,7 +93,7 @@ /* * Mapping between Global System Interrups, which -@@ -1127,8 +1129,13 @@ int mp_register_gsi (u32 gsi, int trigge +@@ -1126,8 +1128,13 @@ int mp_register_gsi (u32 gsi, int trigge if (ioapic_renumber_irq) gsi = ioapic_renumber_irq(ioapic, gsi); ++++++ 21235-crashkernel-advanced.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -33,9 +33,11 @@ Signed-off-by: Jan Beulich <jbeulich(a)novell.com> ---- a/xen/arch/x86/setup.c -+++ b/xen/arch/x86/setup.c -@@ -642,6 +642,11 @@ void __init __start_xen(unsigned long mb +Index: xen-4.0.1-testing/xen/arch/x86/setup.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/setup.c ++++ xen-4.0.1-testing/xen/arch/x86/setup.c +@@ -664,6 +664,11 @@ void __init __start_xen(unsigned long mb memcpy(&boot_e820, &e820, sizeof(e820)); /* Early kexec reservation (explicit static start address). */ @@ -47,9 +49,11 @@ kexec_reserve_area(&boot_e820); /* ---- a/xen/common/kexec.c -+++ b/xen/common/kexec.c -@@ -47,15 +47,109 @@ static unsigned char vmcoreinfo_data[VMC +Index: xen-4.0.1-testing/xen/common/kexec.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/common/kexec.c ++++ xen-4.0.1-testing/xen/common/kexec.c +@@ -49,15 +49,109 @@ static unsigned char vmcoreinfo_data[VMC static size_t vmcoreinfo_size = 0; xen_kexec_reserve_t kexec_crash_area; @@ -162,8 +166,10 @@ static void one_cpu_only(void) { /* Only allow the first cpu to continue - force other cpus to spin */ ---- a/xen/include/xen/kexec.h -+++ b/xen/include/xen/kexec.h +Index: xen-4.0.1-testing/xen/include/xen/kexec.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/xen/kexec.h ++++ xen-4.0.1-testing/xen/include/xen/kexec.h @@ -12,6 +12,8 @@ typedef struct xen_kexec_reserve { extern xen_kexec_reserve_t kexec_crash_area; ++++++ 21271-x86-cache-flush-global.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -12,9 +12,11 @@ Signed-off-by: Jan Beulich <jbeulich(a)novell.com> ---- a/xen/arch/x86/mm.c -+++ b/xen/arch/x86/mm.c -@@ -2887,6 +2887,27 @@ int do_mmuext_op( +Index: xen-4.0.1-testing/xen/arch/x86/mm.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/mm.c ++++ xen-4.0.1-testing/xen/arch/x86/mm.c +@@ -2889,6 +2889,27 @@ int do_mmuext_op( } break; @@ -42,8 +44,10 @@ case MMUEXT_SET_LDT: { unsigned long ptr = op.arg1.linear_addr; ---- a/xen/include/public/xen.h -+++ b/xen/include/public/xen.h +Index: xen-4.0.1-testing/xen/include/public/xen.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/public/xen.h ++++ xen-4.0.1-testing/xen/include/public/xen.h @@ -239,6 +239,10 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t); * * cmd: MMUEXT_FLUSH_CACHE ++++++ 21301-svm-lmsl.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -11,9 +11,11 @@ Signed-off-by: Jan Beulich <jbeulich(a)novell.com> ---- a/xen/arch/x86/hvm/hvm.c -+++ b/xen/arch/x86/hvm/hvm.c -@@ -629,11 +629,12 @@ static int hvm_load_cpu_ctxt(struct doma +Index: xen-4.0.1-testing/xen/arch/x86/hvm/hvm.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/hvm/hvm.c ++++ xen-4.0.1-testing/xen/arch/x86/hvm/hvm.c +@@ -603,11 +603,12 @@ static int hvm_load_cpu_ctxt(struct doma return -EINVAL; } @@ -27,7 +29,7 @@ (!cpu_has_ffxsr && (ctxt.msr_efer & EFER_FFXSE)) || ((ctxt.msr_efer & (EFER_LME|EFER_LMA)) == EFER_LMA) ) { -@@ -984,10 +985,11 @@ int hvm_set_efer(uint64_t value) +@@ -960,10 +961,11 @@ int hvm_set_efer(uint64_t value) value &= ~EFER_LMA; @@ -40,9 +42,11 @@ (!cpu_has_ffxsr && (value & EFER_FFXSE)) ) { gdprintk(XENLOG_WARNING, "Trying to set reserved bit in " ---- a/xen/arch/x86/hvm/svm/svm.c -+++ b/xen/arch/x86/hvm/svm/svm.c -@@ -56,6 +56,9 @@ +Index: xen-4.0.1-testing/xen/arch/x86/hvm/svm/svm.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/hvm/svm/svm.c ++++ xen-4.0.1-testing/xen/arch/x86/hvm/svm/svm.c +@@ -57,6 +57,9 @@ u32 svm_feature_flags; @@ -52,7 +56,7 @@ #define set_segment_register(name, value) \ asm volatile ( "movw %%ax ,%%" STR(name) "" : : "a" (value) ) -@@ -847,6 +850,29 @@ static int svm_cpu_up(struct cpuinfo_x86 +@@ -871,6 +874,29 @@ static int svm_cpu_up(struct cpuinfo_x86 /* Initialize core's ASID handling. */ svm_asid_init(c); @@ -82,9 +86,11 @@ return 1; } ---- a/xen/include/asm-x86/hvm/hvm.h -+++ b/xen/include/asm-x86/hvm/hvm.h -@@ -131,6 +131,7 @@ struct hvm_function_table { +Index: xen-4.0.1-testing/xen/include/asm-x86/hvm/hvm.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/asm-x86/hvm/hvm.h ++++ xen-4.0.1-testing/xen/include/asm-x86/hvm/hvm.h +@@ -143,6 +143,7 @@ struct hvm_function_table { extern struct hvm_function_table hvm_funcs; extern int hvm_enabled; ++++++ 21304-keyhandler-alternative.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -11,8 +11,10 @@ Signed-off-by: Jan Beulich <jbeulich(a)novell.com> ---- a/xen/common/keyhandler.c -+++ b/xen/common/keyhandler.c +Index: xen-4.0.1-testing/xen/common/keyhandler.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/common/keyhandler.c ++++ xen-4.0.1-testing/xen/common/keyhandler.c @@ -19,6 +19,7 @@ static struct keyhandler *key_table[256]; @@ -66,7 +68,7 @@ } static struct keyhandler dump_dom0_registers_keyhandler = { -@@ -425,8 +456,28 @@ static struct keyhandler do_debug_key_ke +@@ -434,8 +465,28 @@ static struct keyhandler do_debug_key_ke .desc = "trap to xendbg" }; ++++++ 21421-vts-ats-enabling.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -18,9 +18,11 @@ Signed-off-by: Weidong Han <weidong.han(a)intel.com> ---- a/xen/drivers/passthrough/vtd/ia64/ats.c -+++ b/xen/drivers/passthrough/vtd/ia64/ats.c -@@ -47,6 +47,11 @@ int enable_ats_device(int seg, int bus, +Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/ia64/ats.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/ia64/ats.c ++++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/ia64/ats.c +@@ -47,6 +47,11 @@ int enable_ats_device(int seg, int bus, return 0; } @@ -32,9 +34,11 @@ int dev_invalidate_iotlb(struct iommu *iommu, u16 did, u64 addr, unsigned int size_order, u64 type) { ---- a/xen/drivers/passthrough/vtd/iommu.c -+++ b/xen/drivers/passthrough/vtd/iommu.c -@@ -1324,6 +1324,9 @@ static int domain_context_mapping(struct +Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/iommu.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/iommu.c ++++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/iommu.c +@@ -1331,6 +1331,9 @@ static int domain_context_mapping(struct dprintk(VTDPREFIX, "d%d:PCIe: map bdf = %x:%x.%x\n", domain->domain_id, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); ret = domain_context_mapping_one(domain, drhd->iommu, bus, devfn); @@ -44,7 +48,7 @@ break; case DEV_TYPE_PCI: -@@ -1453,6 +1456,9 @@ static int domain_context_unmap(struct d +@@ -1460,6 +1463,9 @@ static int domain_context_unmap(struct d dprintk(VTDPREFIX, "d%d:PCIe: unmap bdf = %x:%x.%x\n", domain->domain_id, bus, PCI_SLOT(devfn), PCI_FUNC(devfn)); ret = domain_context_unmap_one(domain, iommu, bus, devfn); @@ -54,7 +58,7 @@ break; case DEV_TYPE_PCI: -@@ -1771,8 +1777,6 @@ static void setup_dom0_devices(struct do +@@ -1788,8 +1794,6 @@ static void setup_dom0_devices(struct do list_add(&pdev->domain_list, &d->arch.pdev_list); domain_context_mapping(d, pdev->bus, pdev->devfn); pci_enable_acs(pdev); @@ -63,8 +67,10 @@ } } spin_unlock(&pcidevs_lock); ---- a/xen/drivers/passthrough/vtd/x86/ats.c -+++ b/xen/drivers/passthrough/vtd/x86/ats.c +Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/x86/ats.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/x86/ats.c ++++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/x86/ats.c @@ -92,6 +92,9 @@ int ats_device(int seg, int bus, int dev pdev = pci_get_pdev(bus, devfn); @@ -75,7 +81,7 @@ if ( !ecap_queued_inval(drhd->iommu->ecap) || !ecap_dev_iotlb(drhd->iommu->ecap) ) return 0; -@@ -144,6 +147,9 @@ int enable_ats_device(int seg, int bus, +@@ -144,6 +147,9 @@ int enable_ats_device(int seg, int bus, value = pci_conf_read16(bus, PCI_SLOT(devfn), PCI_FUNC(devfn), pos + ATS_REG_CTL); @@ -85,7 +91,7 @@ value |= ATS_ENABLE; pci_conf_write16(bus, PCI_SLOT(devfn), PCI_FUNC(devfn), pos + ATS_REG_CTL, value); -@@ -153,10 +159,50 @@ int enable_ats_device(int seg, int bus, +@@ -153,10 +159,50 @@ int enable_ats_device(int seg, int bus, pdev->devfn = devfn; pdev->ats_queue_depth = queue_depth; list_add(&(pdev->list), &ats_devices); ++++++ 21526-x86-nehalem-cpuid-mask.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -8,76 +8,201 @@ Signed-off-by: Jun Nakajima <jun.nakajima(a)intel.com> Signed-off-by: Liping Ke <liping.ke(a)intel.com> ---- a/xen/arch/x86/cpu/intel.c -+++ b/xen/arch/x86/cpu/intel.c -@@ -29,6 +29,9 @@ extern int trap_init_f00f_bug(void); - static unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; - integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); - integer_param("cpuid_mask_edx", opt_cpuid_mask_edx); -+static unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; +# HG changeset patch +# User Keir Fraser <keir.fraser(a)citrix.com> +# Date 1276604335 -3600 +# Node ID 2501732e291b001711a0dc1c474bb89ce77f3110 +# Parent a2cc1db1af9c8f9b148c80f8b2c3f64bde7542f9 +x86: fix pv cpuid masking + +Invert initial values of the variables parsed into from the command +line, so that completely clearing out one or more of the four bit +fields is possible. + +Further, consolidate the command line parameter specifications into +a single place. + +Finally, as per "Intel Virtualization Technology FlexMigration +Application Note" (http://www.intel.com/Assets/PDF/manual/323850.pdf) +also handle family 6 model 0x1f. + +What remains open is the question whether pv_cpuid() shouldn't also +consume these masks. + +Signed-off-by: Jan Beulich <jbeulich(a)novell.com> + +Index: xen-4.0.1-testing/xen/arch/x86/cpu/amd.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/cpu/amd.c ++++ xen-4.0.1-testing/xen/arch/x86/cpu/amd.c +@@ -33,14 +33,6 @@ void start_svm(struct cpuinfo_x86 *c); + static char opt_famrev[14]; + string_param("cpuid_mask_cpu", opt_famrev); + +-/* Finer-grained CPUID feature control. */ +-static unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; +-integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); +-integer_param("cpuid_mask_edx", opt_cpuid_mask_edx); +-static unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; +-integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx); +-integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx); +- + static inline void wrmsr_amd(unsigned int index, unsigned int lo, + unsigned int hi) + { +@@ -61,7 +53,7 @@ static inline void wrmsr_amd(unsigned in + * + * The processor revision string parameter has precedene. + */ +-static void __devinit set_cpuidmask(struct cpuinfo_x86 *c) ++static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) + { + static unsigned int feat_ecx, feat_edx; + static unsigned int extfeat_ecx, extfeat_edx; +@@ -76,12 +68,12 @@ static void __devinit set_cpuidmask(stru + ASSERT((status == not_parsed) && (smp_processor_id() == 0)); + status = no_mask; + +- if (opt_cpuid_mask_ecx | opt_cpuid_mask_edx | +- opt_cpuid_mask_ext_ecx | opt_cpuid_mask_ext_edx) { +- feat_ecx = opt_cpuid_mask_ecx ? : ~0U; +- feat_edx = opt_cpuid_mask_edx ? : ~0U; +- extfeat_ecx = opt_cpuid_mask_ext_ecx ? : ~0U; +- extfeat_edx = opt_cpuid_mask_ext_edx ? : ~0U; ++ if (~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx & ++ opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) { ++ feat_ecx = opt_cpuid_mask_ecx; ++ feat_edx = opt_cpuid_mask_edx; ++ extfeat_ecx = opt_cpuid_mask_ext_ecx; ++ extfeat_edx = opt_cpuid_mask_ext_edx; + } else if (*opt_famrev == '\0') { + return; + } else if (!strcmp(opt_famrev, "fam_0f_rev_c")) { +Index: xen-4.0.1-testing/xen/arch/x86/cpu/common.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/cpu/common.c ++++ xen-4.0.1-testing/xen/arch/x86/cpu/common.c +@@ -22,6 +22,15 @@ static int cachesize_override __cpuinitd + static int disable_x86_fxsr __cpuinitdata; + static int disable_x86_serial_nr __cpuinitdata; + ++unsigned int __devinitdata opt_cpuid_mask_ecx = ~0u; ++integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); ++unsigned int __devinitdata opt_cpuid_mask_edx = ~0u; ++integer_param("cpuid_mask_edx", opt_cpuid_mask_edx); ++unsigned int __devinitdata opt_cpuid_mask_ext_ecx = ~0u; +integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx); ++unsigned int __devinitdata opt_cpuid_mask_ext_edx = ~0u; +integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx); ++ + struct cpu_dev * cpu_devs[X86_VENDOR_NUM] = {}; + /* +Index: xen-4.0.1-testing/xen/arch/x86/cpu/cpu.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/cpu/cpu.h ++++ xen-4.0.1-testing/xen/arch/x86/cpu/cpu.h +@@ -21,6 +21,9 @@ struct cpu_dev { + + extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM]; + ++extern unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; ++extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; ++ + extern int get_model_name(struct cpuinfo_x86 *c); + extern void display_cacheinfo(struct cpuinfo_x86 *c); + +Index: xen-4.0.1-testing/xen/arch/x86/cpu/intel.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/cpu/intel.c ++++ xen-4.0.1-testing/xen/arch/x86/cpu/intel.c +@@ -20,16 +20,6 @@ + + extern int trap_init_f00f_bug(void); + +-/* +- * opt_cpuid_mask_ecx/edx: cpuid.1[ecx, edx] feature mask. +- * For example, E8400[Intel Core 2 Duo Processor series] ecx = 0x0008E3FD, +- * edx = 0xBFEBFBFF when executing CPUID.EAX = 1 normally. If you want to +- * 'rev down' to E8400, you can set these values in these Xen boot parameters. +- */ +-static unsigned int opt_cpuid_mask_ecx, opt_cpuid_mask_edx; +-integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); +-integer_param("cpuid_mask_edx", opt_cpuid_mask_edx); +- static int use_xsave = 1; boolean_param("xsave", use_xsave); -@@ -40,24 +43,46 @@ boolean_param("xsave", use_xsave); + +@@ -40,24 +30,57 @@ boolean_param("xsave", use_xsave); struct movsl_mask movsl_mask __read_mostly; #endif -static void __devinit set_cpuidmask(void) -+static void __devinit set_cpuidmask(struct cpuinfo_x86 *c) ++/* ++ * opt_cpuid_mask_ecx/edx: cpuid.1[ecx, edx] feature mask. ++ * For example, E8400[Intel Core 2 Duo Processor series] ecx = 0x0008E3FD, ++ * edx = 0xBFEBFBFF when executing CPUID.EAX = 1 normally. If you want to ++ * 'rev down' to E8400, you can set these values in these Xen boot parameters. ++ */ ++static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) { - unsigned int eax, ebx, ecx, edx, model; -+ unsigned int model = c->x86_model; ++ const char *extra = ""; - if (!(opt_cpuid_mask_ecx | opt_cpuid_mask_edx)) -+ if (!(opt_cpuid_mask_ecx | opt_cpuid_mask_edx | -+ opt_cpuid_mask_ext_ecx | opt_cpuid_mask_ext_edx)) ++ if (!~(opt_cpuid_mask_ecx & opt_cpuid_mask_edx & ++ opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) return; - cpuid(0x00000001, &eax, &ebx, &ecx, &edx); - model = ((eax & 0xf0000) >> 12) | ((eax & 0xf0) >> 4); - if (!((model == 0x1d) || ((model == 0x17) && ((eax & 0xf) >= 4)))) { -+ if (c->x86 != 0x6) /* Only family 6 supports this feature */ -+ return; -+ -+ if ((model == 0x1d) || ((model == 0x17) && (c->x86_mask >= 4))) { -+ wrmsr(MSR_IA32_CPUID_FEATURE_MASK1, -+ opt_cpuid_mask_ecx ? : ~0u, -+ opt_cpuid_mask_edx ? : ~0u); -+ } -+/* +- printk(XENLOG_ERR "Cannot set CPU feature mask on CPU#%d\n", +- smp_processor_id()); ++ /* Only family 6 supports this feature */ ++ switch ((c->x86 == 6) * c->x86_model) { ++ case 0x17: ++ if ((c->x86_mask & 0x0f) < 4) ++ break; ++ /* fall through */ ++ case 0x1d: ++ wrmsr(MSR_INTEL_CPUID_FEATURE_MASK, ++ opt_cpuid_mask_ecx, ++ opt_cpuid_mask_edx); ++ if (!~(opt_cpuid_mask_ext_ecx & opt_cpuid_mask_ext_edx)) ++ return; ++ extra = "extended "; ++ break; ++/* + * CPU supports this feature if the processor signature meets the following: + * (CPUID.(EAX=01h):EAX) > 000106A2h, or + * (CPUID.(EAX=01h):EAX) == 000106Exh, 0002065xh, 000206Cxh, 000206Exh, or 000206Fxh + * + */ -+ else if (((model == 0x1a) && (c->x86_mask > 2)) -+ || model == 0x1e -+ || model == 0x25 -+ || model == 0x2c -+ || model == 0x2e -+ || model == 0x2f) { -+ wrmsr(MSR_IA32_CPUID1_FEATURE_MASK, -+ opt_cpuid_mask_ecx ? : ~0u, -+ opt_cpuid_mask_edx ? : ~0u); -+ wrmsr(MSR_IA32_CPUID80000001_FEATURE_MASK, -+ opt_cpuid_mask_ext_ecx ? : ~0u, -+ opt_cpuid_mask_ext_edx ? : ~0u); -+ } -+ else { - printk(XENLOG_ERR "Cannot set CPU feature mask on CPU#%d\n", - smp_processor_id()); ++ case 0x1a: ++ if ((c->x86_mask & 0x0f) <= 2) ++ break; ++ /* fall through */ ++ case 0x1e: case 0x1f: ++ case 0x25: case 0x2c: case 0x2e: case 0x2f: ++ wrmsr(MSR_INTEL_CPUID1_FEATURE_MASK, ++ opt_cpuid_mask_ecx, ++ opt_cpuid_mask_edx); ++ wrmsr(MSR_INTEL_CPUID80000001_FEATURE_MASK, ++ opt_cpuid_mask_ext_ecx, ++ opt_cpuid_mask_ext_edx); return; } -- + - wrmsr(MSR_IA32_CPUID_FEATURE_MASK1, - opt_cpuid_mask_ecx ? : ~0u, - opt_cpuid_mask_edx ? : ~0u); ++ printk(XENLOG_ERR "Cannot set CPU feature mask on CPU#%d\n", ++ smp_processor_id()); } void __devinit early_intel_workaround(struct cpuinfo_x86 *c) -@@ -179,7 +204,7 @@ static void __devinit init_intel(struct +@@ -179,7 +202,7 @@ static void __devinit init_intel(struct detect_ht(c); @@ -86,14 +211,20 @@ /* Work around errata */ Intel_errata_workarounds(c); ---- a/xen/include/asm-x86/msr-index.h -+++ b/xen/include/asm-x86/msr-index.h -@@ -158,6 +158,8 @@ - - /* MSR for cpuid feature mask */ - #define MSR_IA32_CPUID_FEATURE_MASK1 0x00000478 -+#define MSR_IA32_CPUID1_FEATURE_MASK 0x00000130 -+#define MSR_IA32_CPUID80000001_FEATURE_MASK 0x00000131 +Index: xen-4.0.1-testing/xen/include/asm-x86/msr-index.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/asm-x86/msr-index.h ++++ xen-4.0.1-testing/xen/include/asm-x86/msr-index.h +@@ -156,8 +156,10 @@ + #define MSR_P6_EVNTSEL0 0x00000186 + #define MSR_P6_EVNTSEL1 0x00000187 + +-/* MSR for cpuid feature mask */ +-#define MSR_IA32_CPUID_FEATURE_MASK1 0x00000478 ++/* MSRs for Intel cpuid feature mask */ ++#define MSR_INTEL_CPUID_FEATURE_MASK 0x00000478 ++#define MSR_INTEL_CPUID1_FEATURE_MASK 0x00000130 ++#define MSR_INTEL_CPUID80000001_FEATURE_MASK 0x00000131 /* MSRs & bits used for VMX enabling */ #define MSR_IA32_VMX_BASIC 0x480 ++++++ 21542-amd-erratum-411.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -9,11 +9,11 @@ Signed-off-by: Wei Wang <wei.wang2(a)amd.com> -Index: xen-4.0.0-testing/xen/arch/x86/apic.c +Index: xen-4.0.1-testing/xen/arch/x86/apic.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/apic.c -+++ xen-4.0.0-testing/xen/arch/x86/apic.c -@@ -195,6 +195,9 @@ void clear_local_APIC(void) +--- xen-4.0.1-testing.orig/xen/arch/x86/apic.c ++++ xen-4.0.1-testing/xen/arch/x86/apic.c +@@ -198,6 +198,9 @@ void clear_local_APIC(void) maxlvt = get_maxlvt(); @@ -23,7 +23,7 @@ /* * Masking an LVT entry on a P6 can trigger a local APIC error * if the vector is zero. Mask LVTERR first to prevent this. -@@ -1184,7 +1187,10 @@ void disable_APIC_timer(void) +@@ -1335,7 +1338,10 @@ void disable_APIC_timer(void) { if (using_apic_timer) { unsigned long v; @@ -35,10 +35,10 @@ v = apic_read(APIC_LVTT); apic_write_around(APIC_LVTT, v | APIC_LVT_MASKED); } -Index: xen-4.0.0-testing/xen/arch/x86/hpet.c +Index: xen-4.0.1-testing/xen/arch/x86/hpet.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/hpet.c -+++ xen-4.0.0-testing/xen/arch/x86/hpet.c +--- xen-4.0.1-testing.orig/xen/arch/x86/hpet.c ++++ xen-4.0.1-testing/xen/arch/x86/hpet.c @@ -659,8 +659,7 @@ void hpet_broadcast_enter(void) if ( hpet_attach_channel ) hpet_attach_channel(cpu, ch); ++++++ 21615-dont-save-xen-heap-pages.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -17,8 +17,10 @@ Signed-off-by: Jan Beulich <jbeulich(a)novell.com> ---- a/tools/libxc/xc_domain_save.c -+++ b/tools/libxc/xc_domain_save.c +Index: xen-4.0.1-testing/tools/libxc/xc_domain_save.c +=================================================================== +--- xen-4.0.1-testing.orig/tools/libxc/xc_domain_save.c ++++ xen-4.0.1-testing/tools/libxc/xc_domain_save.c @@ -1282,58 +1282,64 @@ int xc_domain_save(int xc_handle, int io goto out; } @@ -56,11 +58,11 @@ - goto out; - } + unsigned long gmfn = pfn_batch[j]; - -- for ( j = 0; j < batch; j++ ) ++ + if ( !hvm ) + gmfn = pfn_to_mfn(gmfn); -+ + +- for ( j = 0; j < batch; j++ ) + if ( pfn_err[j] ) { - unsigned long mfn = pfn_to_mfn(pfn_batch[j]); @@ -122,9 +124,11 @@ if ( write_exact(io_fd, &batch, sizeof(unsigned int)) ) { PERROR("Error when writing to state file (2)"); ---- a/xen/arch/x86/domctl.c -+++ b/xen/arch/x86/domctl.c -@@ -207,11 +207,12 @@ long arch_do_domctl( +Index: xen-4.0.1-testing/xen/arch/x86/domctl.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/domctl.c ++++ xen-4.0.1-testing/xen/arch/x86/domctl.c +@@ -206,11 +206,12 @@ long arch_do_domctl( for ( j = 0; j < k; j++ ) { @@ -139,7 +143,7 @@ type = XEN_DOMCTL_PFINFO_XTAB; else if ( xsm_getpageframeinfo(page) != 0 ) ; -@@ -306,14 +307,15 @@ long arch_do_domctl( +@@ -305,14 +306,15 @@ long arch_do_domctl( for ( j = 0; j < k; j++ ) { struct page_info *page; ++++++ 21627-cpuidle-wrap.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -7,9 +7,11 @@ Signed-off-by: Wei Gang <gang.wei(a)intel.com> ---- a/xen/arch/x86/acpi/cpu_idle.c -+++ b/xen/arch/x86/acpi/cpu_idle.c -@@ -127,9 +127,9 @@ static inline u32 ticks_elapsed(u32 t1, +Index: xen-4.0.1-testing/xen/arch/x86/acpi/cpu_idle.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/acpi/cpu_idle.c ++++ xen-4.0.1-testing/xen/arch/x86/acpi/cpu_idle.c +@@ -127,9 +127,9 @@ static inline u32 ticks_elapsed(u32 t1, if ( t2 >= t1 ) return (t2 - t1); else if ( !(acpi_gbl_FADT.flags & ACPI_FADT_32BIT_TIMER) ) ++++++ 21653-xend-mac-addr.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -16,10 +16,10 @@ Signed-off-by Chunyan Liu <CYLiu(a)novell.com> -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -847,11 +847,6 @@ class XendDomainInfo: @type dev_config: SXP object (parsed config) """ ++++++ 21678-xend-mac-fix.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -16,10 +16,10 @@ Signed-off-by: Ian Jackson <ian.jackson(a)eu.citrix.com> Signed-off-by Chunyan Liu <CYLiu(a)novell.com> -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -847,6 +847,8 @@ class XendDomainInfo: @type dev_config: SXP object (parsed config) """ ++++++ 21683-vtd-kill-timer-conditional.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -7,8 +7,10 @@ Signed-off-by: Keir Fraser <keir.fraser(a)citrix.com> ---- a/xen/drivers/passthrough/io.c -+++ b/xen/drivers/passthrough/io.c +Index: xen-4.0.1-testing/xen/drivers/passthrough/io.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/drivers/passthrough/io.c ++++ xen-4.0.1-testing/xen/drivers/passthrough/io.c @@ -27,7 +27,7 @@ static void hvm_dirq_assist(unsigned long _d); @@ -18,8 +20,10 @@ { return !(flags & (HVM_IRQ_DPCI_GUEST_MSI | HVM_IRQ_DPCI_TRANSLATE)); } ---- a/xen/drivers/passthrough/pci.c -+++ b/xen/drivers/passthrough/pci.c +Index: xen-4.0.1-testing/xen/drivers/passthrough/pci.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/drivers/passthrough/pci.c ++++ xen-4.0.1-testing/xen/drivers/passthrough/pci.c @@ -257,7 +257,9 @@ static void pci_clean_dpci_irqs(struct d i = find_next_bit(hvm_irq_dpci->mapping, d->nr_pirqs, i + 1) ) { @@ -31,9 +35,11 @@ list_for_each_safe ( digl_list, tmp, &hvm_irq_dpci->mirq[i].digl_list ) ---- a/xen/include/xen/iommu.h -+++ b/xen/include/xen/iommu.h -@@ -92,6 +92,7 @@ void hvm_dpci_isairq_eoi(struct domain * +Index: xen-4.0.1-testing/xen/include/xen/iommu.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/xen/iommu.h ++++ xen-4.0.1-testing/xen/include/xen/iommu.h +@@ -103,6 +103,7 @@ void hvm_dpci_isairq_eoi(struct domain * struct hvm_irq_dpci *domain_get_irq_dpci(struct domain *domain); int domain_set_irq_dpci(struct domain *domain, struct hvm_irq_dpci *dpci); void free_hvm_irq_dpci(struct hvm_irq_dpci *dpci); ++++++ 21723-get-domu-state.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -16,10 +16,10 @@ Signed-off-by James (Song Wei) <jsong(a)novell.com> -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomain.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomain.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomain.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomain.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomain.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomain.py @@ -250,6 +250,18 @@ class XendDomain: @return: path to config file. """ @@ -39,10 +39,10 @@ def _managed_check_point_path(self, domuuid): """Returns absolute path to check point file for managed domain. -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -327,6 +327,8 @@ class XendDomainInfo: @type info: dictionary @ivar domid: Domain ID (if VM has started) @@ -60,10 +60,10 @@ maxmem = self.info.get('memory_static_max', 0) memory = self.info.get('memory_dynamic_max', 0) -Index: xen-4.0.0-testing/tools/python/xen/xend/server/SrvDomain.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/SrvDomain.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/SrvDomain.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/SrvDomain.py @@ -225,6 +225,20 @@ class SrvDomain(SrvDir): self.acceptCommand(req) return self.xd.domain_reset(self.dom.getName()) @@ -85,10 +85,10 @@ def op_usb_add(self, op, req): self.acceptCommand(req) return req.threadRequest(self.do_usb_add, op, req) -Index: xen-4.0.0-testing/tools/python/xen/xm/main.py +Index: xen-4.0.1-testing/tools/python/xen/xm/main.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/main.py -+++ xen-4.0.0-testing/tools/python/xen/xm/main.py +--- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py ++++ xen-4.0.1-testing/tools/python/xen/xm/main.py @@ -165,6 +165,8 @@ SUBCOMMAND_HELP = { #usb 'usb-add' : ('<domain> <[host:bus.addr] [host:vendor_id:product_id]>','Add the usb device to FV VM.'), @@ -144,7 +144,7 @@ def xm_dump_core(args): live = False -@@ -1515,6 +1522,32 @@ def xm_usb_add(args): +@@ -1517,6 +1524,32 @@ def xm_usb_add(args): arg_check(args, "usb-add", 2) server.xend.domain.usb_add(args[0],args[1]) @@ -177,7 +177,7 @@ def xm_usb_del(args): arg_check(args, "usb-del", 2) server.xend.domain.usb_del(args[0],args[1]) -@@ -3538,6 +3571,8 @@ commands = { +@@ -3542,6 +3575,8 @@ commands = { #usb "usb-add": xm_usb_add, "usb-del": xm_usb_del, ++++++ 21847-pscsi.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -37,10 +37,10 @@ Comment from Masaki Kanno <kanno.masaki(a)jp.fujitsu.com>: "Well done" Committed-by: Ian Jackson <ian.jackson(a)eu.citrix.com> -Index: xen-4.0.0-testing/tools/examples/xend-config.sxp +Index: xen-4.0.1-testing/tools/examples/xend-config.sxp =================================================================== ---- xen-4.0.0-testing.orig/tools/examples/xend-config.sxp -+++ xen-4.0.0-testing/tools/examples/xend-config.sxp +--- xen-4.0.1-testing.orig/tools/examples/xend-config.sxp ++++ xen-4.0.1-testing/tools/examples/xend-config.sxp @@ -277,3 +277,11 @@ # we have to realize this may incur security issue and we can't make sure the # device assignment could really work properly even after we do this. @@ -50,13 +50,13 @@ +# because xend scans all the device paths to build its internal PSCSI device +# list. If we need only a few devices for assigning to a guest, we can reduce +# the scan to this device. Set list list of device paths in same syntax like in -+# command lsscsi, e.g. ('16:0:0:0' '15:0') ++# command lsscsi, e.g. ('16:0:0:0' '15:0') +# (pscsi-device-mask ('*')) + -Index: xen-4.0.0-testing/tools/python/xen/util/vscsi_util.py +Index: xen-4.0.1-testing/tools/python/xen/util/vscsi_util.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/util/vscsi_util.py -+++ xen-4.0.0-testing/tools/python/xen/util/vscsi_util.py +--- xen-4.0.1-testing.orig/tools/python/xen/util/vscsi_util.py ++++ xen-4.0.1-testing/tools/python/xen/util/vscsi_util.py @@ -148,11 +148,12 @@ def _vscsi_get_scsidevices_by_sysfs(): return devices @@ -85,10 +85,10 @@ scsi_record = _make_scsi_record(scsi_info) scsi_records.append(scsi_record) return scsi_records -Index: xen-4.0.0-testing/tools/python/xen/xend/XendNode.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendNode.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendNode.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendNode.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendNode.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendNode.py @@ -323,7 +323,12 @@ class XendNode: pscsi_table = {} pscsi_HBA_table = {} @@ -103,10 +103,10 @@ scsi_id = pscsi_record['scsi_id'] if scsi_id: saved_HBA_uuid = None -Index: xen-4.0.0-testing/tools/python/xen/xend/XendOptions.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendOptions.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendOptions.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendOptions.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendOptions.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendOptions.py @@ -164,6 +164,9 @@ class XendOptions: """ print >>sys.stderr, "xend [ERROR]", fmt % args ++++++ 21866-xenapi.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -18,10 +18,10 @@ Acked-by: Jim Fehlig <jfehlig(a)novell.com> Committed-by: Ian Jackson <ian.jackson(a)eu.citrix.com> -Index: xen-4.0.0-testing/tools/python/xen/xend/XendAPI.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPI.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendAPI.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendAPI.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPI.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendAPI.py @@ -1667,7 +1667,8 @@ class XendAPI(object): def VM_set_actions_after_crash(self, session, vm_ref, action): if action not in XEN_API_ON_CRASH_BEHAVIOUR: @@ -32,10 +32,10 @@ def VM_set_HVM_boot_policy(self, session, vm_ref, value): if value != "" and value != "BIOS order": -Index: xen-4.0.0-testing/tools/python/xen/xend/XendAPIConstants.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPIConstants.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendAPIConstants.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendAPIConstants.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPIConstants.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendAPIConstants.py @@ -63,6 +63,18 @@ XEN_API_ON_CRASH_BEHAVIOUR_FILTER = { 'rename_restart' : 'rename_restart', } @@ -55,10 +55,10 @@ XEN_API_VBD_MODE = ['RO', 'RW'] XEN_API_VDI_TYPE = ['system', 'user', 'ephemeral'] XEN_API_VBD_TYPE = ['CD', 'Disk'] -Index: xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendConfig.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py @@ -41,6 +41,7 @@ from xen.util.pci import pci_opts_list_f from xen.xend.XendSXPDev import dev_dict_to_sxp from xen.util import xsconstants ++++++ 21894-intel-unmask-cpuid.patch ++++++ # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1280486194 -3600 # Node ID c9e7850ec9a18d7085c7468407e175bb64513846 # Parent 754877be695ba3050f140002dbd185a27a437fcc x86: unmask CPUID levels on Intel CPUs References: bnc#640773 If the CPUID limit bit in MSR_IA32_MISC_ENABLE is set, clear it to make all CPUID information available. This is required for some features to work, such as MWAIT in cpuidle, get cpu topology, XSAVE, etc. Signed-off-by: Wei Gang <gang.wei(a)intel.com> --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -90,6 +90,20 @@ void __devinit early_intel_workaround(st /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; + + /* Unmask CPUID levels if masked: */ + if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) { + u64 misc_enable; + + rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); + + if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) { + misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID; + wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable); + c->cpuid_level = cpuid_eax(0); + printk("revised cpuid_level = %d\n", c->cpuid_level); + } + } } /* --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -324,6 +324,7 @@ #define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1<<11) #define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1<<12) #define MSR_IA32_MISC_ENABLE_MONITOR_ENABLE (1<<18) +#define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1<<22) #define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1<<23) /* Intel Model 6 */ ++++++ 22019-x86-cpuidle-online-check.patch ++++++ # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1282069957 -3600 # Node ID 5218db847b58a151d8f320b7141efc984f759b35 # Parent 542e8cd16a6cf036e89b597ba6343245fcaafa25 x86 cpuidle: check whether cpu is online in cpu idle control We observed a 2.6.18.8 dom0 kernel crash when Xen has maxcpus < num of physical cores (maxcpus=3D4 for a 12-core system). It appeared that hypervisor doesn't check whether CPU is online or not. This small patch fixed the issue. Signed-off-by: Uwe Dannowski <uwe.dannowski(a)amd.com> Acked-by: Wei Huang <wei.huang2(a)amd.com> --- a/xen/arch/x86/acpi/cpuidle_menu.c +++ b/xen/arch/x86/acpi/cpuidle_menu.c @@ -270,9 +270,10 @@ static void menu_reflect(struct acpi_pro static int menu_enable_device(struct acpi_processor_power *power) { - struct menu_device *data = &per_cpu(menu_devices, power->cpu); + if (!cpu_online(power->cpu)) + return -1; - memset(data, 0, sizeof(struct menu_device)); + memset(&per_cpu(menu_devices, power->cpu), 0, sizeof(struct menu_device)); return 0; } ++++++ 22051-x86-forced-EOI.patch ++++++ # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1282466228 -3600 # Node ID 59ff5820534f4c5ec006d1ddca0f4356634c3b22 # Parent f77261710856aad506dda92cfa3b92b923be4e15 x86: Automatically EOI guest-bound interrupts if guest takes too long. Signed-off-by: Keir Fraser <keir.fraser(a)citrix.com> Includes the x86 IRQ specific parts of c/s 21508: # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1275480791 -3600 # Node ID 5aabc6f94df5f275647d55caa24780eff0c81355 # Parent a3bdee5a20daf590ae7a440dad4e3b104b99c620 timers: Track inactive timers and migrate them on cpu offline. Signed-off-by: Keir Fraser <keir.fraser(a)citrix.com> --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -46,8 +46,6 @@ static DECLARE_BITMAP(used_vectors, NR_V struct irq_cfg __read_mostly *irq_cfg = NULL; -static struct timer *__read_mostly irq_guest_eoi_timer; - static DEFINE_SPINLOCK(vector_lock); DEFINE_PER_CPU(vector_irq_t, vector_irq) = { @@ -274,18 +272,15 @@ int init_irq_data(void) irq_desc = xmalloc_array(struct irq_desc, nr_irqs); irq_cfg = xmalloc_array(struct irq_cfg, nr_irqs); irq_status = xmalloc_array(int, nr_irqs); - irq_guest_eoi_timer = xmalloc_array(struct timer, nr_irqs); irq_vector = xmalloc_array(u8, nr_irqs_gsi); - if (!irq_desc || !irq_cfg || !irq_status ||! irq_vector || - !irq_guest_eoi_timer) + if ( !irq_desc || !irq_cfg || !irq_status ||! irq_vector ) return -ENOMEM; memset(irq_desc, 0, nr_irqs * sizeof(*irq_desc)); memset(irq_cfg, 0, nr_irqs * sizeof(*irq_cfg)); memset(irq_status, 0, nr_irqs * sizeof(*irq_status)); memset(irq_vector, 0, nr_irqs_gsi * sizeof(*irq_vector)); - memset(irq_guest_eoi_timer, 0, nr_irqs * sizeof(*irq_guest_eoi_timer)); for (irq = 0; irq < nr_irqs; irq++) { desc = irq_to_desc(irq); @@ -740,6 +735,7 @@ typedef struct { #define ACKTYPE_UNMASK 1 /* Unmask PIC hardware (from any CPU) */ #define ACKTYPE_EOI 2 /* EOI on the CPU that was interrupted */ cpumask_t cpu_eoi_map; /* CPUs that need to EOI this interrupt */ + struct timer eoi_timer; struct domain *guest[IRQ_MAX_GUESTS]; } irq_guest_action_t; @@ -784,13 +780,55 @@ static void _irq_guest_eoi(struct irq_de desc->handler->enable(irq); } +static void set_eoi_ready(void *data); + static void irq_guest_eoi_timer_fn(void *data) { struct irq_desc *desc = data; + unsigned int irq = desc - irq_desc; + irq_guest_action_t *action; + cpumask_t cpu_eoi_map; unsigned long flags; spin_lock_irqsave(&desc->lock, flags); - _irq_guest_eoi(desc); + + if ( !(desc->status & IRQ_GUEST) ) + goto out; + + action = (irq_guest_action_t *)desc->action; + + if ( action->ack_type != ACKTYPE_NONE ) + { + unsigned int i; + for ( i = 0; i < action->nr_guests; i++ ) + { + struct domain *d = action->guest[i]; + unsigned int pirq = domain_irq_to_pirq(d, irq); + if ( test_and_clear_bit(pirq, d->pirq_mask) ) + action->in_flight--; + } + } + + if ( action->in_flight != 0 ) + goto out; + + switch ( action->ack_type ) + { + case ACKTYPE_UNMASK: + desc->handler->end(irq); + break; + case ACKTYPE_EOI: + cpu_eoi_map = action->cpu_eoi_map; + spin_unlock_irq(&desc->lock); + on_selected_cpus(&cpu_eoi_map, set_eoi_ready, desc, 0); + spin_lock_irq(&desc->lock); + break; + case ACKTYPE_NONE: + _irq_guest_eoi(desc); + break; + } + + out: spin_unlock_irqrestore(&desc->lock, flags); } @@ -847,9 +885,11 @@ static void __do_IRQ_guest(int irq) } } - if ( already_pending == action->nr_guests ) + stop_timer(&action->eoi_timer); + + if ( (action->ack_type == ACKTYPE_NONE) && + (already_pending == action->nr_guests) ) { - stop_timer(&irq_guest_eoi_timer[irq]); desc->handler->disable(irq); desc->status |= IRQ_GUEST_EOI_PENDING; for ( i = 0; i < already_pending; ++i ) @@ -865,10 +905,10 @@ static void __do_IRQ_guest(int irq) * - skip the timer setup below. */ } - init_timer(&irq_guest_eoi_timer[irq], - irq_guest_eoi_timer_fn, desc, smp_processor_id()); - set_timer(&irq_guest_eoi_timer[irq], NOW() + MILLISECS(1)); } + + migrate_timer(&action->eoi_timer, smp_processor_id()); + set_timer(&action->eoi_timer, NOW() + MILLISECS(1)); } /* @@ -978,7 +1018,7 @@ static void __pirq_guest_eoi(struct doma if ( action->ack_type == ACKTYPE_NONE ) { ASSERT(!test_bit(pirq, d->pirq_mask)); - stop_timer(&irq_guest_eoi_timer[irq]); + stop_timer(&action->eoi_timer); _irq_guest_eoi(desc); } @@ -1162,6 +1202,7 @@ int pirq_guest_bind(struct vcpu *v, int action->shareable = will_share; action->ack_type = pirq_acktype(v->domain, pirq); cpus_clear(action->cpu_eoi_map); + init_timer(&action->eoi_timer, irq_guest_eoi_timer_fn, desc, 0); desc->depth = 0; desc->status |= IRQ_GUEST; @@ -1266,7 +1307,7 @@ static irq_guest_action_t *__pirq_guest_ } break; case ACKTYPE_NONE: - stop_timer(&irq_guest_eoi_timer[irq]); + stop_timer(&action->eoi_timer); _irq_guest_eoi(desc); break; } @@ -1306,9 +1347,7 @@ static irq_guest_action_t *__pirq_guest_ BUG_ON(!cpus_empty(action->cpu_eoi_map)); desc->action = NULL; - desc->status &= ~IRQ_GUEST; - desc->status &= ~IRQ_INPROGRESS; - kill_timer(&irq_guest_eoi_timer[irq]); + desc->status &= ~(IRQ_GUEST|IRQ_GUEST_EOI_PENDING|IRQ_INPROGRESS); desc->handler->shutdown(irq); /* Caller frees the old guest descriptor block. */ @@ -1342,7 +1381,10 @@ void pirq_guest_unbind(struct domain *d, spin_unlock_irq(&desc->lock); if ( oldaction != NULL ) + { + kill_timer(&oldaction->eoi_timer); xfree(oldaction); + } } static int pirq_guest_force_unbind(struct domain *d, int irq) @@ -1380,7 +1422,10 @@ static int pirq_guest_force_unbind(struc spin_unlock_irq(&desc->lock); if ( oldaction != NULL ) + { + kill_timer(&oldaction->eoi_timer); xfree(oldaction); + } return bound; } ++++++ 22067-x86-irq-domain.patch ++++++ # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1282817774 -3600 # Node ID 3eb5127e46365242401e37df292fbe290fa0a974 # Parent eccfdeb41b803d07bcb4f7fa912a8341fdb19162 Fix bind_irq_vector() destination The "mask" covered all online cpus in the "domain". It should be used as destination later, instead of using "domain" directly. Signed-off-by: Sheng Yang <sheng(a)linux.intel.com> --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -88,14 +88,14 @@ static int __bind_irq_vector(int irq, in cpus_and(mask, domain, cpu_online_map); if (cpus_empty(mask)) return -EINVAL; - if ((cfg->vector == vector) && cpus_equal(cfg->domain, domain)) + if ((cfg->vector == vector) && cpus_equal(cfg->domain, mask)) return 0; if (cfg->vector != IRQ_VECTOR_UNASSIGNED) return -EBUSY; for_each_cpu_mask(cpu, mask) per_cpu(vector_irq, cpu)[vector] = irq; cfg->vector = vector; - cfg->domain = domain; + cfg->domain = mask; irq_status[irq] = IRQ_USED; if (IO_APIC_IRQ(irq)) irq_vector[irq] = vector; ++++++ 22068-vtd-irte-RH-bit.patch ++++++ # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1282817816 -3600 # Node ID 3c4c3d48a8350994f4450314c6b759771c7ad4ef # Parent 3eb5127e46365242401e37df292fbe290fa0a974 VT-d: Hardware require RH bit to be set in IRTE when delivery mode is LPR Signed-off-by: Sheng Yang <sheng(a)linux.intel.com> --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -318,9 +318,10 @@ static int ioapic_rte_to_remap_entry(str *(((u32 *)&new_rte) + 0) = value; new_ire.lo.fpd = 0; new_ire.lo.dm = new_rte.dest_mode; - new_ire.lo.rh = 0; new_ire.lo.tm = new_rte.trigger; new_ire.lo.dlm = new_rte.delivery_mode; + /* Hardware require RH = 1 for LPR delivery mode */ + new_ire.lo.rh = (new_ire.lo.dlm == dest_LowestPrio); new_ire.lo.avail = 0; new_ire.lo.res_1 = 0; new_ire.lo.vector = new_rte.vector; @@ -630,9 +631,10 @@ static int msi_msg_to_remap_entry( /* Set interrupt remapping table entry */ new_ire.lo.fpd = 0; new_ire.lo.dm = (msg->address_lo >> MSI_ADDR_DESTMODE_SHIFT) & 0x1; - new_ire.lo.rh = 0; new_ire.lo.tm = (msg->data >> MSI_DATA_TRIGGER_SHIFT) & 0x1; new_ire.lo.dlm = (msg->data >> MSI_DATA_DELIVERY_MODE_SHIFT) & 0x1; + /* Hardware require RH = 1 for LPR delivery mode */ + new_ire.lo.rh = (new_ire.lo.dlm == dest_LowestPrio); new_ire.lo.avail = 0; new_ire.lo.res_1 = 0; new_ire.lo.vector = (msg->data >> MSI_DATA_VECTOR_SHIFT) & ++++++ 22071-ept-get-entry-lock.patch ++++++ # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1283153992 -3600 # Node ID c5aed2e049bce2724b035dd6aa09c4c4e609c27c # Parent 20920c12bc4815b1f755786c0924393809664807 ept: Put locks around ept_get_entry There's a subtle race in ept_get_entry, such that if tries to read an entry that ept_set_entry is modifying, it gets neither the old entry nor the new entry, but empty. In the case of multi-cpu populate-on-demand guests, this manifests as a guest crash when one vcpu tries to read a page which another page is trying to populate, and ept_get_entry returns p2m_mmio_dm. This bug can also be fixed by making both ept_set_entry and ept_next_level access-once (i.e., ept_next_level reads full ept_entry and then works with local value; ept_set_entry construct the entry locally and then sets it in one write). But there doesn't seem to be any major performance implications of just making ept_get_entry use locks; so the simpler, the better. Signed-off-by: George Dunlap <george.dunlap(a)eu.citrix.com> --- a/xen/arch/x86/mm/hap/p2m-ept.c +++ b/xen/arch/x86/mm/hap/p2m-ept.c @@ -387,6 +387,10 @@ static mfn_t ept_get_entry(struct domain int i; int ret = 0; mfn_t mfn = _mfn(INVALID_MFN); + int do_locking = !p2m_locked_by_me(d->arch.p2m); + + if ( do_locking ) + p2m_lock(d->arch.p2m); *t = p2m_mmio_dm; @@ -464,6 +468,8 @@ static mfn_t ept_get_entry(struct domain } out: + if ( do_locking ) + p2m_unlock(d->arch.p2m); unmap_domain_page(table); return mfn; } ++++++ 22084-x86-xsave-off.patch ++++++ # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1283332754 -3600 # Node ID ae0cd4e5cc0149ceb5d3dd61a003aadc008f036e # Parent 972d90ff31349816cc8c785a8b2defb2f70ed441 x86 intel: Disable XSAVE support. It breaks HVM save/restore. Signed-off-by: Keir Fraser <keir.fraser(a)citrix.com> --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -20,7 +20,7 @@ extern int trap_init_f00f_bug(void); -static int use_xsave = 1; +static int use_xsave; boolean_param("xsave", use_xsave); #ifdef CONFIG_X86_INTEL_USERCOPY ++++++ 22135-heap-lock.patch ++++++ References: bnc#638465 # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1284394111 -3600 # Node ID 69e8bb164683c76e0cd787df21b98c73905a61e6 # Parent e300bfa3c0323ac08e7b8cd9fb40f9f1ab548543 page_alloc: Hold heap_lock while adjusting page states to/from PGC_state_free. This avoids races with buddy-merging logic in free_heap_pages(). Signed-off-by: Keir Fraser <keir.fraser(a)citrix.com> --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -378,8 +378,6 @@ static struct page_info *alloc_heap_page total_avail_pages -= request; ASSERT(total_avail_pages >= 0); - spin_unlock(&heap_lock); - cpus_clear(mask); for ( i = 0; i < (1 << order); i++ ) @@ -401,6 +399,8 @@ static struct page_info *alloc_heap_page page_set_owner(&pg[i], NULL); } + spin_unlock(&heap_lock); + if ( unlikely(!cpus_empty(mask)) ) { perfc_incr(need_flush_tlb_flush); @@ -496,6 +496,8 @@ static void free_heap_pages( ASSERT(order <= MAX_ORDER); ASSERT(node >= 0); + spin_lock(&heap_lock); + for ( i = 0; i < (1 << order); i++ ) { /* @@ -523,8 +525,6 @@ static void free_heap_pages( pg[i].tlbflush_timestamp = tlbflush_current_time(); } - spin_lock(&heap_lock); - avail[node][zone] += 1 << order; total_avail_pages += 1 << order; ++++++ 22148-serial-irq-dest.patch ++++++ # HG changeset patch # User Keir Fraser <keir.fraser(a)citrix.com> # Date 1284395845 -3600 # Node ID a254d1236c1a52264beb0253352ef64d65a98eb3 # Parent f0a1229cb0a6505f3240ac59a3bb6ade2acfa1a2 Fix serial interrupt's destination Lowest Priority can't use with invalid cpu_mask, and the default value of CPU_MASK_ALL may cover CPU which wasn't online. From: "Yang, Sheng" <sheng.yang(a)intel.com> Signed-off-by: Keir Fraser <keir.fraser(a)citrix.com> --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -1602,7 +1602,7 @@ void __init smp_intr_init(void) irq_vector[irq] = FIRST_HIPRIORITY_VECTOR + seridx + 1; per_cpu(vector_irq, cpu)[FIRST_HIPRIORITY_VECTOR + seridx + 1] = irq; irq_cfg[irq].vector = FIRST_HIPRIORITY_VECTOR + seridx + 1; - irq_cfg[irq].domain = (cpumask_t)CPU_MASK_ALL; + irq_cfg[irq].domain = cpu_online_map; } /* IPI for cleanuping vectors after irq move */ ++++++ 32on64-extra-mem.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -1,8 +1,8 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -2917,7 +2917,7 @@ class XendDomainInfo: +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -2920,7 +2920,7 @@ class XendDomainInfo: self.guest_bitsize = self.image.getBitSize() # Make sure there's enough RAM available for the domain ++++++ 7410-qemu-alt-gr.patch ++++++ # HG changeset patch # User Ian Jackson <ian.jackson(a)eu.citrix.com> # Date 1284481903 -3600 # Node ID f71a4c18e34e86e1011662fa42c10ec54bff0688 # Parent 080b5a094d4e0acab6646125f91f988911409016 ioemu: fix VNC altgr-insert behavior When access to a Xen DomU (Linux) from a VNC client in Windows, alt-gr key is not working properly with Spanish keyboard. When Alt + another key pressed, vncserver receives Altgr down, Altgr up and key down messages in order, that causes incorrect output. With following patch, when vncerver receives key down message, it first check if the keysym needs altgr modifer, if it needs altgr modifier but altgr is not 'down', sending altgr keycode before sending key keycode. Signed-off-by: Chunyan Liu <cyliu(a)novell.com> committer: Ian Jackson <Ian.Jackson(a)eu.citrix.com> git-commit-id: f95d202ed6444dacb15fbea4dee185eb0e048d9a diff -r 080b5a094d4e -r f71a4c18e34e keymaps.c --- a/tools/ioemu-qemu-xen/keymaps.c Wed Sep 08 16:38:09 2010 +0100 +++ b//tools/ioemu-qemu-xen/keymaps.c Tue Sep 14 17:31:43 2010 +0100 @@ -51,6 +51,7 @@ struct key_range *numlock_range; struct key_range *shift_range; struct key_range *localstate_range; + struct key_range *altgr_range; } kbd_layout_t; static void add_to_key_range(struct key_range **krp, int code) { @@ -133,7 +134,11 @@ add_to_key_range(&k->localstate_range, keycode); //fprintf(stderr, "localstate keysym %04x keycode %d\n", keysym, keycode); } - + if (rest && strstr(rest, "altgr")) { + add_to_key_range(&k->altgr_range, keysym); + //fprintf(stderr, "altgr keysym %04x keycode %d\n", keysym, keycode); + } + /* if(keycode&0x80) keycode=(keycode<<8)^0x80e0; */ if (keysym < MAX_NORMAL_KEYCODE) { @@ -233,3 +238,16 @@ return 0; return 1; } + +static inline int keysym_is_altgr(void *kbd_layout, int keysym) +{ + kbd_layout_t *k = kbd_layout; + struct key_range *kr; + + for (kr = k->altgr_range; kr; kr = kr->next) + if (keysym >= kr->start && keysym <= kr->end){ + return 1; + } + return 0; +} + diff -r 080b5a094d4e -r f71a4c18e34e vnc.c --- a/tools/ioemu-qemu-xen/vnc.c Wed Sep 08 16:38:09 2010 +0100 +++ b/tools/ioemu-qemu-xen/vnc.c Tue Sep 14 17:31:43 2010 +0100 @@ -1274,12 +1274,27 @@ } } +static void press_key_altgr_down(VncState *vs, int down) +{ + kbd_put_keycode(0xe0); + if (down){ + kbd_put_keycode(0xb8 & 0x7f); + vs->modifiers_state[0xb8] = 1; + } + else { + kbd_put_keycode(0xb8 | 0x80); + vs->modifiers_state[0xb8] = 0; + } +} + static void do_key_event(VncState *vs, int down, uint32_t sym) { int keycode; int shift_keys = 0; int shift = 0; int keypad = 0; + int altgr = 0; + int altgr_keys = 0; if (is_graphic_console()) { if (sym >= 'A' && sym <= 'Z') { @@ -1289,8 +1304,11 @@ else { shift = keysym_is_shift(vs->kbd_layout, sym & 0xFFFF); } + + altgr = keysym_is_altgr(vs->kbd_layout, sym & 0xFFFF); } shift_keys = vs->modifiers_state[0x2a] | vs->modifiers_state[0x36]; + altgr_keys = vs->modifiers_state[0xb8]; keycode = keysym2scancode(vs->kbd_layout, sym & 0xFFFF); if (keycode == 0) { @@ -1357,6 +1375,11 @@ } if (is_graphic_console()) { + + if (altgr && !altgr_keys) { + press_key_altgr_down(vs, down); + } + /* If the shift state needs to change then simulate an additional keypress before sending this one. Ignore for non shiftable keys. */ ++++++ README.SuSE ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -464,9 +464,6 @@ upgraded together. Consult the online documentation for a matrix of supported 32- and 64-bit combinations -A 64-bit paravirtualized VM will not run on 32-bit host but a 32-bit -paravirtualized VM will run on a 64-bit host. - On certain machines with 2GB or less of RAM, domain 0 Linux may fail to boot, printing the following messages: PCI-DMA: Using software bounce buffering for IO (SWIOTLB) @@ -498,8 +495,8 @@ If problems persist, check if a newer version is available. Well-tested versions will be shipped with SUSE and via YaST Online Update. More frequent -(but less supported) updates are available on the Xen Technical Preview site: - ftp://ftp.novell.com/forge/XenTechnicalPreview/ +(but less supported) updates are available on Novell's Forge site: + http://forge.novell.com/modules/xfmod/project/?xenpreview Known Issues ++++++ bdrv_open2_fix_flags.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/block.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/block.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/block.c -+++ xen-4.0.0-testing/tools/ioemu-remote/block.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/block.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/block.c @@ -350,7 +350,7 @@ int bdrv_file_open(BlockDriverState **pb int bdrv_open(BlockDriverState *bs, const char *filename, int flags) @@ -18,7 +18,7 @@ - /* Note: for compatibility, we open disk image files as RDWR, and - RDONLY as fallback */ if (!(flags & BDRV_O_FILE)) -- open_flags = BDRV_O_RDWR | (flags & BDRV_O_CACHE_MASK); +- open_flags = (flags & BDRV_O_ACCESS) | (flags & BDRV_O_CACHE_MASK); + open_flags = flags; else open_flags = flags & ~(BDRV_O_FILE | BDRV_O_SNAPSHOT); @@ -28,10 +28,10 @@ ret = drv->bdrv_open(bs, filename, open_flags); if ((ret == -EACCES || ret == -EPERM) && !(flags & BDRV_O_FILE)) { ret = drv->bdrv_open(bs, filename, open_flags & ~BDRV_O_RDWR); -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/usb-msd.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/usb-msd.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/usb-msd.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/usb-msd.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/usb-msd.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/usb-msd.c @@ -551,7 +551,7 @@ USBDevice *usb_msd_init(const char *file s = qemu_mallocz(sizeof(MSDState)); @@ -41,10 +41,10 @@ goto fail; s->bs = bdrv; *pbs = bdrv; -Index: xen-4.0.0-testing/tools/ioemu-remote/qemu-img.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-img.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/qemu-img.c -+++ xen-4.0.0-testing/tools/ioemu-remote/qemu-img.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-img.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-img.c @@ -32,7 +32,7 @@ #endif @@ -54,7 +54,7 @@ static void QEMU_NORETURN error(const char *fmt, ...) { -@@ -185,7 +185,7 @@ static int read_password(char *buf, int +@@ -185,7 +185,7 @@ static int read_password(char *buf, int #endif static BlockDriverState *bdrv_new_open(const char *filename, @@ -118,7 +118,7 @@ error("Could not open '%s'", filename); } bdrv_get_format(bs, fmt_name, sizeof(fmt_name)); -@@ -810,7 +811,7 @@ static void img_snapshot(int argc, char +@@ -810,7 +811,7 @@ static void img_snapshot(int argc, char if (!bs) error("Not enough memory"); ++++++ bdrv_open2_flags_2.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -227,6 +227,7 @@ static int open_disk(struct td_state *s, BlockDriver* drv; char* devname; @@ -19,10 +19,10 @@ fprintf(stderr, "Could not open image file %s\n", path); return -ENOMEM; } -Index: xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/xenstore.c -+++ xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c @@ -136,7 +136,8 @@ static void insert_media(void *opaque) else format = &bdrv_raw; @@ -33,19 +33,7 @@ #ifdef CONFIG_STUBDOM { char *buf, *backend, *params_path, *params; -@@ -400,9 +401,9 @@ void xenstore_parse_domain_config(int hv - { - char **e_danger = NULL; - char *buf = NULL; -- char *fpath = NULL, *bpath = NULL, *btype = NULL, -+ char *fpath = NULL, *bpath = NULL, *btype = NULL, *mode = NULL, - *dev = NULL, *params = NULL, *drv = NULL; -- int i, j, ret, is_tap; -+ int i, j, ret, is_tap, flags; - unsigned int len, num, hd_index, pci_devid = 0; - BlockDriverState *bs; - BlockDriver *format; -@@ -464,7 +465,8 @@ void xenstore_parse_domain_config(int hv +@@ -469,7 +470,8 @@ void xenstore_parse_domain_config(int hv } for (i = 0; i < num; i++) { @@ -55,7 +43,7 @@ /* read the backend path */ xenstore_get_backend_path(&bpath, "vbd", danger_path, hvm_domid, e_danger[i]); if (bpath == NULL) -@@ -550,6 +552,17 @@ void xenstore_parse_domain_config(int hv +@@ -555,6 +557,17 @@ void xenstore_parse_domain_config(int hv format = &bdrv_raw; } @@ -73,7 +61,7 @@ #if 0 /* Phantom VBDs are disabled because the use of paths * from guest-controlled areas in xenstore is unsafe. -@@ -617,7 +630,7 @@ void xenstore_parse_domain_config(int hv +@@ -622,7 +635,7 @@ void xenstore_parse_domain_config(int hv #ifdef CONFIG_STUBDOM if (pasprintf(&danger_buf, "%s/device/vbd/%s", danger_path, e_danger[i]) == -1) continue; @@ -82,10 +70,10 @@ pstrcpy(bs->filename, sizeof(bs->filename), params); } #else -@@ -646,7 +659,7 @@ void xenstore_parse_domain_config(int hv - } - } - pstrcpy(bs->filename, sizeof(bs->filename), params); +@@ -668,7 +681,7 @@ void xenstore_parse_domain_config(int hv + + fprintf(stderr, "Using file %s in read-%s mode\n", bs->filename, is_readonly ? "only" : "write"); + - if (bdrv_open2(bs, params, BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0) { + if (bdrv_open2(bs, params, flags|BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0) { fprintf(stderr, "qemu: could not open vbd '%s' or hard disk image '%s' (drv '%s' format '%s')\n", buf, params, drv ? drv : "?", format ? format->format_name : "0"); ++++++ blktap-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/blktap/drivers/block-cdrom.c +Index: xen-4.0.1-testing/tools/blktap/drivers/block-cdrom.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/blktap/drivers/block-cdrom.c ++++ xen-4.0.1-testing/tools/blktap/drivers/block-cdrom.c @@ -0,0 +1,535 @@ +/* block-cdrom.c + * @@ -538,10 +538,10 @@ + .td_get_parent_id = tdcdrom_get_parent_id, + .td_validate_parent = tdcdrom_validate_parent +}; -Index: xen-4.0.0-testing/xen/include/public/io/cdromif.h +Index: xen-4.0.1-testing/xen/include/public/io/cdromif.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/xen/include/public/io/cdromif.h ++++ xen-4.0.1-testing/xen/include/public/io/cdromif.h @@ -0,0 +1,122 @@ +/****************************************************************************** + * cdromif.h @@ -665,10 +665,10 @@ + sizeof(struct vcd_generic_command) - sizeof(struct request_sense)) + +#endif -Index: xen-4.0.0-testing/tools/blktap/drivers/Makefile +Index: xen-4.0.1-testing/tools/blktap/drivers/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/blktap/drivers/Makefile -+++ xen-4.0.0-testing/tools/blktap/drivers/Makefile +--- xen-4.0.1-testing.orig/tools/blktap/drivers/Makefile ++++ xen-4.0.1-testing/tools/blktap/drivers/Makefile @@ -28,8 +28,9 @@ CFLAGS += -DMEMSHR MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a endif @@ -676,7 +676,7 @@ -LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread -LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz +LDFLAGS_xen := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -+LDFLAGS_blktapctrl := $(LDFLAGS_xen) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread ++LDFLAGS_blktapctrl := $(LDFLAGS_xen) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread $(LDFLAGS_xen) +LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz $(LDFLAGS_xen) BLK-OBJS-y := block-aio.o @@ -689,10 +689,10 @@ BLK-OBJS-y += aes.o BLK-OBJS-y += tapaio.o BLK-OBJS-$(CONFIG_Linux) += blk_linux.o -Index: xen-4.0.0-testing/tools/blktap/drivers/tapdisk.h +Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.h =================================================================== ---- xen-4.0.0-testing.orig/tools/blktap/drivers/tapdisk.h -+++ xen-4.0.0-testing/tools/blktap/drivers/tapdisk.h +--- xen-4.0.1-testing.orig/tools/blktap/drivers/tapdisk.h ++++ xen-4.0.1-testing/tools/blktap/drivers/tapdisk.h @@ -137,6 +137,9 @@ struct tap_disk { int (*td_get_parent_id) (struct disk_driver *dd, struct disk_id *id); int (*td_validate_parent)(struct disk_driver *dd, @@ -737,10 +737,10 @@ }; typedef struct driver_list_entry { -Index: xen-4.0.0-testing/tools/blktap/lib/blktaplib.h +Index: xen-4.0.1-testing/tools/blktap/lib/blktaplib.h =================================================================== ---- xen-4.0.0-testing.orig/tools/blktap/lib/blktaplib.h -+++ xen-4.0.0-testing/tools/blktap/lib/blktaplib.h +--- xen-4.0.1-testing.orig/tools/blktap/lib/blktaplib.h ++++ xen-4.0.1-testing/tools/blktap/lib/blktaplib.h @@ -220,6 +220,7 @@ typedef struct msg_pid { #define DISK_TYPE_RAM 3 #define DISK_TYPE_QCOW 4 @@ -749,10 +749,10 @@ /* xenstore/xenbus: */ #define DOMNAME "Domain-0" -Index: xen-4.0.0-testing/xen/include/public/io/blkif.h +Index: xen-4.0.1-testing/xen/include/public/io/blkif.h =================================================================== ---- xen-4.0.0-testing.orig/xen/include/public/io/blkif.h -+++ xen-4.0.0-testing/xen/include/public/io/blkif.h +--- xen-4.0.1-testing.orig/xen/include/public/io/blkif.h ++++ xen-4.0.1-testing/xen/include/public/io/blkif.h @@ -76,6 +76,10 @@ * "feature-flush-cache" node! */ @@ -764,10 +764,10 @@ /* * Maximum scatter/gather segments per request. -Index: xen-4.0.0-testing/tools/blktap/drivers/tapdisk.c +Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.c =================================================================== ---- xen-4.0.0-testing.orig/tools/blktap/drivers/tapdisk.c -+++ xen-4.0.0-testing/tools/blktap/drivers/tapdisk.c +--- xen-4.0.1-testing.orig/tools/blktap/drivers/tapdisk.c ++++ xen-4.0.1-testing/tools/blktap/drivers/tapdisk.c @@ -735,6 +735,22 @@ static void get_io_request(struct td_sta goto out; } @@ -791,10 +791,10 @@ default: DPRINTF("Unknown block operation\n"); break; -Index: xen-4.0.0-testing/tools/python/xen/xend/server/BlktapController.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/BlktapController.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/BlktapController.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/BlktapController.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/BlktapController.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/BlktapController.py @@ -20,6 +20,7 @@ blktap1_disk_types = [ 'ram', 'qcow', ++++++ blktap.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -1,10 +1,10 @@ bug #239173 bug #242953 -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -3290,7 +3290,7 @@ class XendDomainInfo: (fn, BOOTLOADER_LOOPBACK_DEVICE)) @@ -14,10 +14,10 @@ 'device': BOOTLOADER_LOOPBACK_DEVICE, } -Index: xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/xenstore.c -+++ xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c @@ -397,9 +397,9 @@ void xenstore_parse_domain_config(int hv { char **e_danger = NULL; @@ -30,7 +30,7 @@ unsigned int len, num, hd_index, pci_devid = 0; BlockDriverState *bs; BlockDriver *format; -@@ -439,6 +439,14 @@ void xenstore_parse_domain_config(int hv +@@ -444,6 +444,14 @@ void xenstore_parse_domain_config(int hv e_danger[i]); if (bpath == NULL) continue; @@ -45,8 +45,8 @@ /* read the name of the device */ if (pasprintf(&buf, "%s/dev", bpath) == -1) continue; -@@ -715,6 +723,7 @@ void xenstore_parse_domain_config(int hv - free(danger_type); +@@ -738,6 +746,7 @@ void xenstore_parse_domain_config(int hv + free(mode); free(params); free(dev); + free(btype); ++++++ blktapctrl-default-to-ioemu.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/blktap/drivers/tapdisk.h +Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.h =================================================================== ---- xen-4.0.0-testing.orig/tools/blktap/drivers/tapdisk.h -+++ xen-4.0.0-testing/tools/blktap/drivers/tapdisk.h +--- xen-4.0.1-testing.orig/tools/blktap/drivers/tapdisk.h ++++ xen-4.0.1-testing/tools/blktap/drivers/tapdisk.h @@ -168,7 +168,7 @@ static disk_info_t aio_disk = { "raw image (aio)", "aio", ++++++ block-dmmd ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:24.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:24.000000000 +0200 @@ -98,9 +98,9 @@ { # First scan for PVs and VGs; we may then have to activate the VG # first, but can ignore errors: - /sbin/pvscan || : - /sbin/vgscan --mknodes || : - /sbin/vgchange -ay ${1%/*} || : +# /sbin/pvscan || : +# /sbin/vgscan --mknodes || : +# /sbin/vgchange -ay ${1%/*} || : /sbin/lvchange -ay $1 return $? } @@ -110,9 +110,9 @@ /sbin/lvchange -an $1 if [ $? -eq 0 ]; then # We may have to deactivate the VG now, but can ignore errors: - /sbin/vgchange -an ${1%/*} || : +# /sbin/vgchange -an ${1%/*} || : # Maybe we need to cleanup the LVM cache: - /sbin/vgscan --mknodes || : +# /sbin/vgscan --mknodes || : return 0 fi return 1 ++++++ bridge-bonding.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge +Index: xen-4.0.1-testing/tools/hotplug/Linux/network-bridge =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge -+++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-4.0.1-testing/tools/hotplug/Linux/network-bridge @@ -245,6 +245,9 @@ op_start () { claim_lock "network-bridge" ++++++ bridge-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge +Index: xen-4.0.1-testing/tools/hotplug/Linux/network-bridge =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge -+++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-4.0.1-testing/tools/hotplug/Linux/network-bridge @@ -270,19 +270,19 @@ op_stop () { transfer_addrs ${bridge} ${pdev} if ! ifdown ${bridge}; then ++++++ bridge-record-creation.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge +Index: xen-4.0.1-testing/tools/hotplug/Linux/network-bridge =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge -+++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-4.0.1-testing/tools/hotplug/Linux/network-bridge @@ -253,6 +253,11 @@ op_start () { create_bridge ${tdev} ++++++ bridge-vlan.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge +Index: xen-4.0.1-testing/tools/hotplug/Linux/network-bridge =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge -+++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-4.0.1-testing/tools/hotplug/Linux/network-bridge @@ -193,6 +193,28 @@ antispoofing () { iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT } ++++++ build-tapdisk-ioemu.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -15,10 +15,10 @@ tapdisk-ioemu.c | 17 ----------------- 4 files changed, 17 insertions(+), 26 deletions(-) -Index: xen-4.0.0-testing/tools/ioemu-remote/Makefile +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/Makefile -+++ xen-4.0.0-testing/tools/ioemu-remote/Makefile +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/Makefile ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/Makefile @@ -46,14 +46,6 @@ $(filter %-user,$(SUBDIR_RULES)): libqem recurse-all: $(SUBDIR_RULES) @@ -56,10 +56,10 @@ ###################################################################### # libqemu_common.a: Target independent part of system emulation. The # long term path is to suppress *all* target specific code in case of -Index: xen-4.0.0-testing/tools/ioemu-remote/configure +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/configure =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/configure -+++ xen-4.0.0-testing/tools/ioemu-remote/configure +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/configure ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/configure @@ -1511,7 +1511,7 @@ bsd) ;; esac @@ -69,10 +69,10 @@ if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then tools="qemu-img\$(EXESUF) $tools" if [ "$linux" = "yes" ] ; then -Index: xen-4.0.0-testing/tools/ioemu-remote/qemu-tool.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-tool.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/qemu-tool.c -+++ xen-4.0.0-testing/tools/ioemu-remote/qemu-tool.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-tool.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-tool.c @@ -68,7 +68,7 @@ void qemu_bh_delete(QEMUBH *bh) qemu_free(bh); } @@ -82,10 +82,10 @@ IOCanRWHandler *fd_read_poll, IOHandler *fd_read, IOHandler *fd_write, -Index: xen-4.0.0-testing/tools/ioemu-remote/tapdisk-ioemu.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c -+++ xen-4.0.0-testing/tools/ioemu-remote/tapdisk-ioemu.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c @@ -12,34 +12,12 @@ extern void qemu_aio_init(void); ++++++ capslock_enable.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,8 @@ -diff -r c2f19aa8a584 tools/ioemu-remote/vnc.c ---- a/tools/ioemu-remote/vnc.c Wed Apr 07 11:13:49 2010 +0800 -+++ b/tools/ioemu-remote/vnc.c Mon May 24 13:56:22 2010 +0800 -@@ -1326,6 +1326,11 @@ +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/vnc.c +=================================================================== +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/vnc.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/vnc.c +@@ -1344,6 +1344,11 @@ static void do_key_event(VncState *vs, i } break; case 0x3a: /* CapsLock */ ++++++ cdrom-removable.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/server/HalDaemon.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/HalDaemon.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/python/xen/xend/server/HalDaemon.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/HalDaemon.py @@ -0,0 +1,243 @@ +#!/usr/bin/env python +# -*- mode: python; -*- @@ -246,10 +246,10 @@ + print 'Falling off end' + + -Index: xen-4.0.0-testing/tools/python/xen/xend/server/Hald.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/Hald.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/python/xen/xend/server/Hald.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/Hald.py @@ -0,0 +1,125 @@ +#============================================================================ +# This library is free software; you can redistribute it and/or @@ -376,10 +376,10 @@ + watcher.run() + time.sleep(10) + watcher.shutdown() -Index: xen-4.0.0-testing/tools/python/xen/xend/server/SrvServer.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/SrvServer.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/SrvServer.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/SrvServer.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvServer.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/SrvServer.py @@ -56,6 +56,7 @@ from xen.web.SrvDir import SrvDir from SrvRoot import SrvRoot @@ -397,10 +397,10 @@ def create(): root = SrvDir() -Index: xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/xenstore.c -+++ xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c @@ -18,6 +18,7 @@ #include "exec-all.h" #include "sysemu.h" @@ -409,7 +409,7 @@ #include "hw.h" #include "pci.h" #include "qemu-timer.h" -@@ -548,6 +549,21 @@ void xenstore_parse_domain_config(int hv +@@ -553,6 +554,21 @@ void xenstore_parse_domain_config(int hv #endif bs = bdrv_new(dev); @@ -431,7 +431,7 @@ /* check if it is a cdrom */ if (danger_type && !strcmp(danger_type, "cdrom")) { bdrv_set_type_hint(bs, BDRV_TYPE_CDROM); -@@ -938,6 +954,50 @@ void xenstore_record_dm_state(const char +@@ -961,6 +977,50 @@ void xenstore_record_dm_state(const char xenstore_record_dm("state", state); } @@ -482,7 +482,7 @@ void xenstore_process_event(void *opaque) { char **vec, *offset, *bpath = NULL, *buf = NULL, *drv = NULL, *image = NULL; -@@ -968,6 +1028,11 @@ void xenstore_process_event(void *opaque +@@ -991,6 +1051,11 @@ void xenstore_process_event(void *opaque xenstore_watch_callbacks[i].cb(vec[XS_WATCH_TOKEN], xenstore_watch_callbacks[i].opaque); ++++++ check_device_status.patch ++++++ diff -r ce65e0e03a57 tools/python/xen/xend/server/DevController.py --- a/tools/python/xen/xend/server/DevController.py Fri Aug 27 16:53:00 2010 +0800 +++ b/tools/python/xen/xend/server/DevController.py Fri Aug 27 17:13:32 2010 +0800 @@ -149,7 +149,10 @@ (status, err) = self.waitForBackend(devid) if status == Timeout: - self.destroyDevice(devid, False) + #Clean timeout backend resource + dev = self.convertToDeviceNumber(devid) + self.writeBackend(dev, HOTPLUG_STATUS_NODE, HOTPLUG_STATUS_ERROR) + self.destroyDevice(devid, True) raise VmError("Device %s (%s) could not be connected. " "Hotplug scripts not working." % (devid, self.deviceClass)) @@ -554,7 +557,17 @@ xswatch(statusPath, hotplugStatusCallback, ev, result) - ev.wait(DEVICE_CREATE_TIMEOUT) + for i in range(1, 50): + ev.wait(DEVICE_CREATE_TIMEOUT/50) + status = xstransact.Read(statusPath) + if status is not None: + if status == HOTPLUG_STATUS_ERROR: + result['status'] = Error + elif status == HOTPLUG_STATUS_BUSY: + result['status'] = Busy + else: + result['status'] = Connected + break err = xstransact.Read(backpath, HOTPLUG_ERROR_NODE) @@ -571,7 +584,12 @@ xswatch(statusPath, deviceDestroyCallback, ev, result) - ev.wait(DEVICE_DESTROY_TIMEOUT) + for i in range(1, 50): + ev.wait(DEVICE_DESTROY_TIMEOUT/50) + status = xstransact.Read(statusPath) + if status is None: + result['status'] = Disconnected + break return result['status'] ++++++ checkpoint-rename.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/XendCheckpoint.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendCheckpoint.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py @@ -165,7 +165,7 @@ def save(fd, dominfo, network, live, dst dominfo.destroy() dominfo.testDeviceComplete() ++++++ cpu-pools-docs.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,5 +1,7 @@ ---- a/docs/xen-api/coversheet.tex -+++ b/docs/xen-api/coversheet.tex +Index: xen-4.0.1-testing/docs/xen-api/coversheet.tex +=================================================================== +--- xen-4.0.1-testing.orig/docs/xen-api/coversheet.tex ++++ xen-4.0.1-testing/docs/xen-api/coversheet.tex @@ -52,6 +52,7 @@ Mike Day, IBM & Daniel Veillard, Red Hat Jim Fehlig, Novell & Tom Wilkie, University of Cambridge \\ Jon Harrop, XenSource & Yosuke Iwamatsu, NEC \\ @@ -8,8 +10,10 @@ \end{tabular} \end{large} ---- a/docs/xen-api/revision-history.tex -+++ b/docs/xen-api/revision-history.tex +Index: xen-4.0.1-testing/docs/xen-api/revision-history.tex +=================================================================== +--- xen-4.0.1-testing.orig/docs/xen-api/revision-history.tex ++++ xen-4.0.1-testing/docs/xen-api/revision-history.tex @@ -50,6 +50,12 @@ between classes. Added host.PSCSI\_HBAs and VM.DSCSI\_HBAs fields.\tabularnewline @@ -23,8 +27,10 @@ \end{tabular} \end{center} \end{flushleft} ---- a/docs/xen-api/xenapi-coversheet.tex -+++ b/docs/xen-api/xenapi-coversheet.tex +Index: xen-4.0.1-testing/docs/xen-api/xenapi-coversheet.tex +=================================================================== +--- xen-4.0.1-testing.orig/docs/xen-api/xenapi-coversheet.tex ++++ xen-4.0.1-testing/docs/xen-api/xenapi-coversheet.tex @@ -17,12 +17,12 @@ \newcommand{\coversheetlogo}{xen.eps} @@ -40,8 +46,10 @@ %% Document authors \newcommand{\docauthors}{ ---- a/docs/xen-api/xenapi-datamodel-graph.dot -+++ b/docs/xen-api/xenapi-datamodel-graph.dot +Index: xen-4.0.1-testing/docs/xen-api/xenapi-datamodel-graph.dot +=================================================================== +--- xen-4.0.1-testing.orig/docs/xen-api/xenapi-datamodel-graph.dot ++++ xen-4.0.1-testing/docs/xen-api/xenapi-datamodel-graph.dot @@ -14,7 +14,7 @@ fontname="Verdana"; node [ shape=box ]; session VM host network VIF PIF SR VDI VBD PBD user; @@ -59,8 +67,10 @@ +cpu_pool -> VM [ arrowhead="crow", arrowtail="none" ] +host -> cpu_pool [ arrowhead="crow", arrowtail="none" ] } ---- a/docs/xen-api/xenapi-datamodel.tex -+++ b/docs/xen-api/xenapi-datamodel.tex +Index: xen-4.0.1-testing/docs/xen-api/xenapi-datamodel.tex +=================================================================== +--- xen-4.0.1-testing.orig/docs/xen-api/xenapi-datamodel.tex ++++ xen-4.0.1-testing/docs/xen-api/xenapi-datamodel.tex @@ -56,6 +56,7 @@ Name & Description \\ {\tt debug} & A basic class for testing \\ {\tt XSPolicy} & A class for handling Xen Security Policies \\ @@ -79,7 +89,7 @@ \hline \end{tabular}\end{center} -@@ -499,6 +503,56 @@ error code and a message describing the +@@ -499,6 +503,56 @@ error code and a message describing the \begin{verbatim}SECURITY_ERROR(xserr, message)\end{verbatim} \begin{center}\rule{10em}{0.1pt}\end{center} ++++++ cpu-pools-libxc.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,5 +1,7 @@ ---- a/tools/libxc/Makefile -+++ b/tools/libxc/Makefile +Index: xen-4.0.1-testing/tools/libxc/Makefile +=================================================================== +--- xen-4.0.1-testing.orig/tools/libxc/Makefile ++++ xen-4.0.1-testing/tools/libxc/Makefile @@ -8,6 +8,7 @@ CTRL_SRCS-y := CTRL_SRCS-y += xc_core.c CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c @@ -8,8 +10,10 @@ CTRL_SRCS-y += xc_domain.c CTRL_SRCS-y += xc_evtchn.c CTRL_SRCS-y += xc_misc.c +Index: xen-4.0.1-testing/tools/libxc/xc_cpupool.c +=================================================================== --- /dev/null -+++ b/tools/libxc/xc_cpupool.c ++++ xen-4.0.1-testing/tools/libxc/xc_cpupool.c @@ -0,0 +1,165 @@ +/****************************************************************************** + * xc_cpupool.c @@ -176,8 +180,10 @@ + + return 0; +} ---- a/tools/libxc/xc_domain.c -+++ b/tools/libxc/xc_domain.c +Index: xen-4.0.1-testing/tools/libxc/xc_domain.c +=================================================================== +--- xen-4.0.1-testing.orig/tools/libxc/xc_domain.c ++++ xen-4.0.1-testing/tools/libxc/xc_domain.c @@ -220,6 +220,7 @@ int xc_domain_getinfo(int xc_handle, info->cpu_time = domctl.u.getdomaininfo.cpu_time; info->nr_online_vcpus = domctl.u.getdomaininfo.nr_online_vcpus; @@ -186,9 +192,11 @@ memcpy(info->handle, domctl.u.getdomaininfo.handle, sizeof(xen_domain_handle_t)); ---- a/tools/libxc/xenctrl.h -+++ b/tools/libxc/xenctrl.h -@@ -171,6 +171,7 @@ typedef struct xc_dominfo { +Index: xen-4.0.1-testing/tools/libxc/xenctrl.h +=================================================================== +--- xen-4.0.1-testing.orig/tools/libxc/xenctrl.h ++++ xen-4.0.1-testing/tools/libxc/xenctrl.h +@@ -161,6 +161,7 @@ typedef struct xc_dominfo { unsigned int nr_online_vcpus; unsigned int max_vcpu_id; xen_domain_handle_t handle; @@ -196,7 +204,7 @@ } xc_dominfo_t; typedef xen_domctl_getdomaininfo_t xc_domaininfo_t; -@@ -502,6 +503,100 @@ int xc_domain_setdebugging(int xc_handle +@@ -492,6 +493,100 @@ int xc_domain_setdebugging(int xc_handle unsigned int enable); /* ++++++ cpu-pools-libxen.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,17 +1,17 @@ -Index: xen-4.0.0-testing/tools/libxen/include/xen/api/xen_all.h +Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_all.h =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/include/xen/api/xen_all.h -+++ xen-4.0.0-testing/tools/libxen/include/xen/api/xen_all.h +--- xen-4.0.1-testing.orig/tools/libxen/include/xen/api/xen_all.h ++++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_all.h @@ -37,4 +37,5 @@ #include <xen/api/xen_vm_power_state.h> #include <xen/api/xen_vtpm.h> #include <xen/api/xen_xspolicy.h> +#include <xen/api/xen_cpu_pool.h> #endif -Index: xen-4.0.0-testing/tools/libxen/include/xen/api/xen_cpu_pool.h +Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_cpu_pool.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/libxen/include/xen/api/xen_cpu_pool.h ++++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_cpu_pool.h @@ -0,0 +1,424 @@ +/* + * Copyright (c) 2006-2007, XenSource Inc. @@ -437,10 +437,10 @@ + + +#endif -Index: xen-4.0.0-testing/tools/libxen/include/xen/api/xen_cpu_pool_decl.h +Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_cpu_pool_decl.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/libxen/include/xen/api/xen_cpu_pool_decl.h ++++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_cpu_pool_decl.h @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2006-2007, XenSource Inc. @@ -472,10 +472,10 @@ +struct xen_cpu_pool_record_opt_set; + +#endif -Index: xen-4.0.0-testing/tools/libxen/include/xen/api/xen_host.h +Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_host.h =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/include/xen/api/xen_host.h -+++ xen-4.0.0-testing/tools/libxen/include/xen/api/xen_host.h +--- xen-4.0.1-testing.orig/tools/libxen/include/xen/api/xen_host.h ++++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_host.h @@ -29,7 +29,7 @@ #include <xen/api/xen_string_set.h> #include <xen/api/xen_string_string_map.h> @@ -505,10 +505,10 @@ + xen_host host); + #endif -Index: xen-4.0.0-testing/tools/libxen/include/xen/api/xen_host_cpu.h +Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_host_cpu.h =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/include/xen/api/xen_host_cpu.h -+++ xen-4.0.0-testing/tools/libxen/include/xen/api/xen_host_cpu.h +--- xen-4.0.1-testing.orig/tools/libxen/include/xen/api/xen_host_cpu.h ++++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_host_cpu.h @@ -22,6 +22,7 @@ #include <xen/api/xen_common.h> #include <xen/api/xen_host_cpu_decl.h> @@ -544,10 +544,10 @@ + + #endif -Index: xen-4.0.0-testing/tools/libxen/include/xen/api/xen_vm.h +Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_vm.h =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/include/xen/api/xen_vm.h -+++ xen-4.0.0-testing/tools/libxen/include/xen/api/xen_vm.h +--- xen-4.0.1-testing.orig/tools/libxen/include/xen/api/xen_vm.h ++++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_vm.h @@ -34,6 +34,7 @@ #include <xen/api/xen_vm_metrics_decl.h> #include <xen/api/xen_vm_power_state.h> @@ -599,10 +599,10 @@ +xen_vm_cpu_pool_migrate(xen_session *session, xen_vm vm, xen_cpu_pool cpu_pool); + #endif -Index: xen-4.0.0-testing/tools/libxen/src/xen_cpu_pool.c +Index: xen-4.0.1-testing/tools/libxen/src/xen_cpu_pool.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/libxen/src/xen_cpu_pool.c ++++ xen-4.0.1-testing/tools/libxen/src/xen_cpu_pool.c @@ -0,0 +1,671 @@ +/* + * Copyright (c) 2006-2007, XenSource Inc. @@ -1275,10 +1275,10 @@ + return session->ok; +} + -Index: xen-4.0.0-testing/tools/libxen/src/xen_host.c +Index: xen-4.0.1-testing/tools/libxen/src/xen_host.c =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/src/xen_host.c -+++ xen-4.0.0-testing/tools/libxen/src/xen_host.c +--- xen-4.0.1-testing.orig/tools/libxen/src/xen_host.c ++++ xen-4.0.1-testing/tools/libxen/src/xen_host.c @@ -30,6 +30,7 @@ #include <xen/api/xen_sr.h> #include <xen/api/xen_string_string_map.h> @@ -1330,10 +1330,10 @@ + return session->ok; +} + -Index: xen-4.0.0-testing/tools/libxen/src/xen_host_cpu.c +Index: xen-4.0.1-testing/tools/libxen/src/xen_host_cpu.c =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/src/xen_host_cpu.c -+++ xen-4.0.0-testing/tools/libxen/src/xen_host_cpu.c +--- xen-4.0.1-testing.orig/tools/libxen/src/xen_host_cpu.c ++++ xen-4.0.1-testing/tools/libxen/src/xen_host_cpu.c @@ -24,6 +24,7 @@ #include <xen/api/xen_common.h> #include <xen/api/xen_host.h> @@ -1397,10 +1397,10 @@ + + + -Index: xen-4.0.0-testing/tools/libxen/src/xen_vm.c +Index: xen-4.0.1-testing/tools/libxen/src/xen_vm.c =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/src/xen_vm.c -+++ xen-4.0.0-testing/tools/libxen/src/xen_vm.c +--- xen-4.0.1-testing.orig/tools/libxen/src/xen_vm.c ++++ xen-4.0.1-testing/tools/libxen/src/xen_vm.c @@ -36,6 +36,7 @@ #include <xen/api/xen_vm_guest_metrics.h> #include <xen/api/xen_vm_metrics.h> @@ -1504,10 +1504,10 @@ +} + + -Index: xen-4.0.0-testing/tools/libxen/test/test_bindings.c +Index: xen-4.0.1-testing/tools/libxen/test/test_bindings.c =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/test/test_bindings.c -+++ xen-4.0.0-testing/tools/libxen/test/test_bindings.c +--- xen-4.0.1-testing.orig/tools/libxen/test/test_bindings.c ++++ xen-4.0.1-testing/tools/libxen/test/test_bindings.c @@ -28,6 +28,7 @@ #include <xen/api/xen_all.h> ++++++ cpu-pools-python.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/lowlevel/xc/xc.c +Index: xen-4.0.1-testing/tools/python/xen/lowlevel/xc/xc.c =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/lowlevel/xc/xc.c -+++ xen-4.0.0-testing/tools/python/xen/lowlevel/xc/xc.c +--- xen-4.0.1-testing.orig/tools/python/xen/lowlevel/xc/xc.c ++++ xen-4.0.1-testing/tools/python/xen/lowlevel/xc/xc.c @@ -106,8 +106,8 @@ static PyObject *pyxc_domain_create(XcOb static char *kwd_list[] = { "domid", "ssidref", "handle", "flags", "target", NULL }; @@ -289,10 +289,10 @@ { NULL, NULL, 0, NULL } }; -Index: xen-4.0.0-testing/tools/python/xen/util/sxputils.py +Index: xen-4.0.1-testing/tools/python/xen/util/sxputils.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/python/xen/util/sxputils.py ++++ xen-4.0.1-testing/tools/python/xen/util/sxputils.py @@ -0,0 +1,64 @@ +#============================================================================ +# This library is free software; you can redistribute it and/or @@ -358,10 +358,10 @@ + return sxphash + + -Index: xen-4.0.0-testing/tools/python/xen/xend/XendAPI.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPI.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendAPI.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendAPI.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPI.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendAPI.py @@ -51,6 +51,7 @@ from XendDPCI import XendDPCI from XendPSCSI import XendPSCSI, XendPSCSI_HBA from XendDSCSI import XendDSCSI, XendDSCSI_HBA @@ -553,10 +553,10 @@ # Xen API: Class VBD # ---------------------------------------------------------------- -Index: xen-4.0.0-testing/tools/python/xen/xend/XendCPUPool.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendCPUPool.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/python/xen/xend/XendCPUPool.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendCPUPool.py @@ -0,0 +1,903 @@ +#============================================================================ +# This library is free software; you can redistribute it and/or @@ -1461,10 +1461,10 @@ + + unbound_cpus = classmethod(unbound_cpus) + -Index: xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendConfig.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py @@ -134,6 +134,7 @@ XENAPI_CFG_TO_LEGACY_CFG = { 'PV_bootloader': 'bootloader', 'PV_bootloader_args': 'bootloader_args', @@ -1505,10 +1505,10 @@ 'superpages': 0, 'description': '', } -Index: xen-4.0.0-testing/tools/python/xen/xend/XendConstants.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendConstants.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendConstants.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendConstants.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConstants.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendConstants.py @@ -133,6 +133,8 @@ VTPM_DELETE_SCRIPT = auxbin.scripts_dir( XS_VMROOT = "/vm/" @@ -1518,10 +1518,10 @@ NR_PCI_FUNC = 8 NR_PCI_DEV = 32 NR_PCI_DEVFN = NR_PCI_FUNC * NR_PCI_DEV -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -60,6 +60,7 @@ from xen.xend.xenstore.xsutil import Get from xen.xend.xenstore.xswatch import xswatch from xen.xend.XendConstants import * @@ -1574,10 +1574,10 @@ def get_power_state(self): return XEN_API_VM_POWER_STATE[self._stateGet()] def get_platform(self): -Index: xen-4.0.0-testing/tools/python/xen/xend/XendError.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendError.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendError.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendError.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendError.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendError.py @@ -18,6 +18,7 @@ from xmlrpclib import Fault @@ -1613,10 +1613,10 @@ class VDIError(XendAPIError): def __init__(self, error, vdi): XendAPIError.__init__(self) -Index: xen-4.0.0-testing/tools/python/xen/xend/XendNode.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendNode.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendNode.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendNode.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendNode.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendNode.py @@ -43,6 +43,7 @@ from XendStateStore import XendStateStor from XendMonitor import XendMonitor from XendPPCI import XendPPCI @@ -1690,10 +1690,10 @@ 'max_free_memory', 'max_para_memory', 'max_hvm_memory', -Index: xen-4.0.0-testing/tools/python/xen/xend/server/SrvServer.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/SrvServer.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/SrvServer.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/SrvServer.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvServer.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/SrvServer.py @@ -52,6 +52,7 @@ from xen.xend import XendNode, XendOptio from xen.xend.XendLogging import log from xen.xend.XendClient import XEN_API_SOCKET @@ -1715,10 +1715,10 @@ # Reaching this point means we can auto start domains try: xenddomain().autostart_domains() -Index: xen-4.0.0-testing/tools/python/xen/xend/server/XMLRPCServer.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/XMLRPCServer.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/XMLRPCServer.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/XMLRPCServer.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/XMLRPCServer.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/XMLRPCServer.py @@ -33,6 +33,7 @@ from xen.xend.XendClient import XML_RPC_ from xen.xend.XendConstants import DOM_STATE_RUNNING from xen.xend.XendLogging import log @@ -1750,10 +1750,10 @@ # Functions in XendNode and XendDmesg for type, lst, n in [(XendNode, ['info', 'pciinfo', 'send_debug_keys', -Index: xen-4.0.0-testing/tools/python/xen/xm/create.dtd +Index: xen-4.0.1-testing/tools/python/xen/xm/create.dtd =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/create.dtd -+++ xen-4.0.0-testing/tools/python/xen/xm/create.dtd +--- xen-4.0.1-testing.orig/tools/python/xen/xm/create.dtd ++++ xen-4.0.1-testing/tools/python/xen/xm/create.dtd @@ -50,6 +50,7 @@ s3_integrity CDATA #REQUIRED vcpus_max CDATA #REQUIRED @@ -1762,10 +1762,10 @@ actions_after_shutdown %NORMAL_EXIT; #REQUIRED actions_after_reboot %NORMAL_EXIT; #REQUIRED actions_after_crash %CRASH_BEHAVIOUR; #REQUIRED -Index: xen-4.0.0-testing/tools/python/xen/xm/create.py +Index: xen-4.0.1-testing/tools/python/xen/xm/create.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/create.py -+++ xen-4.0.0-testing/tools/python/xen/xm/create.py +--- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py ++++ xen-4.0.1-testing/tools/python/xen/xm/create.py @@ -659,6 +659,10 @@ gopts.var('suppress_spurious_page_faults fn=set_bool, default=None, use="""Do not inject spurious page faults into this guest""") @@ -1777,7 +1777,7 @@ gopts.var('pci_msitranslate', val='TRANSLATE', fn=set_int, default=1, use="""Global PCI MSI-INTx translation flag (0=disable; -@@ -1149,6 +1153,8 @@ def make_config(vals): +@@ -1157,6 +1161,8 @@ def make_config(vals): config.append(['localtime', vals.localtime]) if vals.oos: config.append(['oos', vals.oos]) @@ -1786,10 +1786,10 @@ config_image = configure_image(vals) if vals.bootloader: -Index: xen-4.0.0-testing/tools/python/xen/xm/main.py +Index: xen-4.0.1-testing/tools/python/xen/xm/main.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/main.py -+++ xen-4.0.0-testing/tools/python/xen/xm/main.py +--- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py ++++ xen-4.0.1-testing/tools/python/xen/xm/main.py @@ -56,6 +56,7 @@ from xen.util.xmlrpcclient import Server import xen.util.xsm.xsm as security from xen.util.xsm.xsm import XSMError @@ -1939,7 +1939,7 @@ if use_long: map(PrettyPrint.prettyprint, doms) -@@ -1839,6 +1892,13 @@ def xm_info(args): +@@ -1841,6 +1894,13 @@ def xm_info(args): else: return "" @@ -1953,7 +1953,7 @@ info = { "host": getVal(["name_label"]), "release": getVal(["software_version", "release"]), -@@ -1850,6 +1910,7 @@ def xm_info(args): +@@ -1852,6 +1912,7 @@ def xm_info(args): "threads_per_core": getVal(["cpu_configuration", "threads_per_core"]), "cpu_mhz": getCpuMhz(), "hw_caps": getCpuFeatures(), @@ -1961,7 +1961,7 @@ "total_memory": int(host_metrics_record["memory_total"])/1024/1024, "free_memory": int(host_metrics_record["memory_free"])/1024/1024, "xen_major": getVal(["software_version", "xen_major"]), -@@ -3484,6 +3545,169 @@ def xm_tmem_shared_auth(args): +@@ -3486,6 +3547,169 @@ def xm_tmem_shared_auth(args): else: return server.xend.node.tmem_shared_auth(domid,uuid_str,auth) @@ -2131,7 +2131,7 @@ commands = { "shell": xm_shell, -@@ -3569,6 +3793,14 @@ commands = { +@@ -3571,6 +3795,14 @@ commands = { "usb-list-assignable-devices": xm_usb_list_assignable_devices, "usb-hc-create": xm_usb_hc_create, "usb-hc-destroy": xm_usb_hc_destroy, @@ -2146,7 +2146,7 @@ # tmem "tmem-thaw": xm_tmem_thaw, "tmem-freeze": xm_tmem_freeze, -@@ -3602,6 +3834,8 @@ IMPORTED_COMMANDS = [ +@@ -3604,6 +3836,8 @@ IMPORTED_COMMANDS = [ 'resetpolicy', 'getenforce', 'setenforce', @@ -2155,10 +2155,10 @@ ] for c in IMPORTED_COMMANDS: -Index: xen-4.0.0-testing/tools/python/xen/xm/pool-create.py +Index: xen-4.0.1-testing/tools/python/xen/xm/pool-create.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/python/xen/xm/pool-create.py ++++ xen-4.0.1-testing/tools/python/xen/xm/pool-create.py @@ -0,0 +1,51 @@ +#============================================================================ +# This library is free software; you can redistribute it and/or @@ -2211,10 +2211,10 @@ +if __name__ == '__main__': + main(sys.argv) + -Index: xen-4.0.0-testing/tools/python/xen/xm/pool-new.py +Index: xen-4.0.1-testing/tools/python/xen/xm/pool-new.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/python/xen/xm/pool-new.py ++++ xen-4.0.1-testing/tools/python/xen/xm/pool-new.py @@ -0,0 +1,50 @@ +#============================================================================ +# This library is free software; you can redistribute it and/or @@ -2266,10 +2266,10 @@ +if __name__ == '__main__': + main(sys.argv) + -Index: xen-4.0.0-testing/tools/python/xen/xm/pool.py +Index: xen-4.0.1-testing/tools/python/xen/xm/pool.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/python/xen/xm/pool.py ++++ xen-4.0.1-testing/tools/python/xen/xm/pool.py @@ -0,0 +1,236 @@ +#============================================================================ +# This library is free software; you can redistribute it and/or @@ -2507,10 +2507,10 @@ +def help(): + return str(GOPTS) + -Index: xen-4.0.0-testing/tools/python/xen/xm/xenapi_create.py +Index: xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/xenapi_create.py -+++ xen-4.0.0-testing/tools/python/xen/xm/xenapi_create.py +--- xen-4.0.1-testing.orig/tools/python/xen/xm/xenapi_create.py ++++ xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py @@ -310,6 +310,8 @@ class xenapi_create: get_child_nodes_as_dict(vm, "platform", "key", "value"), "other_config": ++++++ cpu-pools-xmtest.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/xm-test/configure.ac +Index: xen-4.0.1-testing/tools/xm-test/configure.ac =================================================================== ---- xen-4.0.0-testing.orig/tools/xm-test/configure.ac -+++ xen-4.0.0-testing/tools/xm-test/configure.ac +--- xen-4.0.1-testing.orig/tools/xm-test/configure.ac ++++ xen-4.0.1-testing/tools/xm-test/configure.ac @@ -161,6 +161,7 @@ AC_CONFIG_FILES([ tests/vtpm/Makefile tests/xapi/Makefile @@ -10,16 +10,16 @@ lib/XmTestReport/xmtest.py lib/XmTestLib/config.py ]) -Index: xen-4.0.0-testing/tools/xm-test/grouptest/cpupool +Index: xen-4.0.1-testing/tools/xm-test/grouptest/cpupool =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xm-test/grouptest/cpupool ++++ xen-4.0.1-testing/tools/xm-test/grouptest/cpupool @@ -0,0 +1 @@ +cpupool -Index: xen-4.0.0-testing/tools/xm-test/lib/XmTestLib/NetConfig.py +Index: xen-4.0.1-testing/tools/xm-test/lib/XmTestLib/NetConfig.py =================================================================== ---- xen-4.0.0-testing.orig/tools/xm-test/lib/XmTestLib/NetConfig.py -+++ xen-4.0.0-testing/tools/xm-test/lib/XmTestLib/NetConfig.py +--- xen-4.0.1-testing.orig/tools/xm-test/lib/XmTestLib/NetConfig.py ++++ xen-4.0.1-testing/tools/xm-test/lib/XmTestLib/NetConfig.py @@ -56,17 +56,21 @@ def getXendNetConfig(): val = pin.get_val() while val[0] != 'network-script': @@ -51,10 +51,10 @@ configfile.close() return netenv -Index: xen-4.0.0-testing/tools/xm-test/lib/XmTestLib/XenDomain.py +Index: xen-4.0.1-testing/tools/xm-test/lib/XmTestLib/XenDomain.py =================================================================== ---- xen-4.0.0-testing.orig/tools/xm-test/lib/XmTestLib/XenDomain.py -+++ xen-4.0.0-testing/tools/xm-test/lib/XmTestLib/XenDomain.py +--- xen-4.0.1-testing.orig/tools/xm-test/lib/XmTestLib/XenDomain.py ++++ xen-4.0.1-testing/tools/xm-test/lib/XmTestLib/XenDomain.py @@ -181,6 +181,7 @@ class XenDomain: if not self.isManaged: @@ -63,10 +63,10 @@ else: ret, output = traceCommand("xm new %s" % self.config) if ret != 0: -Index: xen-4.0.0-testing/tools/xm-test/runtest.sh +Index: xen-4.0.1-testing/tools/xm-test/runtest.sh =================================================================== ---- xen-4.0.0-testing.orig/tools/xm-test/runtest.sh -+++ xen-4.0.0-testing/tools/xm-test/runtest.sh +--- xen-4.0.1-testing.orig/tools/xm-test/runtest.sh ++++ xen-4.0.1-testing/tools/xm-test/runtest.sh @@ -91,7 +91,7 @@ runnable_tests() { echo "Error: ramdisk/initrd.img is from an old version, or is not for this " echo "architecture ($ARCH)." @@ -76,10 +76,10 @@ fi # See if xend is running -Index: xen-4.0.0-testing/tools/xm-test/tests/Makefile.am +Index: xen-4.0.1-testing/tools/xm-test/tests/Makefile.am =================================================================== ---- xen-4.0.0-testing.orig/tools/xm-test/tests/Makefile.am -+++ xen-4.0.0-testing/tools/xm-test/tests/Makefile.am +--- xen-4.0.1-testing.orig/tools/xm-test/tests/Makefile.am ++++ xen-4.0.1-testing/tools/xm-test/tests/Makefile.am @@ -28,7 +28,8 @@ SUBDIRS = \ vcpu-pin \ vtpm \ @@ -90,10 +90,10 @@ EXTRA_DIST = $(SUBDIRS) Makefile.am.template -Index: xen-4.0.0-testing/tools/xm-test/tests/cpupool/01_cpupool_basic_pos.py +Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/01_cpupool_basic_pos.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xm-test/tests/cpupool/01_cpupool_basic_pos.py ++++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/01_cpupool_basic_pos.py @@ -0,0 +1,72 @@ +#!/usr/bin/python + @@ -167,10 +167,10 @@ +destroyAllDomUs() + + -Index: xen-4.0.0-testing/tools/xm-test/tests/cpupool/02_cpupool_manage_pos.py +Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/02_cpupool_manage_pos.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xm-test/tests/cpupool/02_cpupool_manage_pos.py ++++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/02_cpupool_manage_pos.py @@ -0,0 +1,152 @@ +#!/usr/bin/python + @@ -324,10 +324,10 @@ + FAIL("'Pool-1' not deleted") + + -Index: xen-4.0.0-testing/tools/xm-test/tests/cpupool/03_cpupool_domain.py +Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/03_cpupool_domain.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xm-test/tests/cpupool/03_cpupool_domain.py ++++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/03_cpupool_domain.py @@ -0,0 +1,126 @@ +#!/usr/bin/python + @@ -455,10 +455,10 @@ +for pool in pool_names: + destroyPool(pool, True) + -Index: xen-4.0.0-testing/tools/xm-test/tests/cpupool/04_cpupool_migrate.py +Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/04_cpupool_migrate.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xm-test/tests/cpupool/04_cpupool_migrate.py ++++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/04_cpupool_migrate.py @@ -0,0 +1,84 @@ +#!/usr/bin/python + @@ -544,10 +544,10 @@ +# +cleanupPoolsDomains() + -Index: xen-4.0.0-testing/tools/xm-test/tests/cpupool/Makefile.am +Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/Makefile.am =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xm-test/tests/cpupool/Makefile.am ++++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/Makefile.am @@ -0,0 +1,22 @@ +SUBDIRS = + @@ -571,16 +571,16 @@ + rm -f *log + rm -f *~ + -Index: xen-4.0.0-testing/tools/xm-test/tests/cpupool/pool1.cfg +Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/pool1.cfg =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xm-test/tests/cpupool/pool1.cfg ++++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/pool1.cfg @@ -0,0 +1 @@ +name="Pool-1" -Index: xen-4.0.0-testing/tools/xm-test/tests/cpupool/pools.py +Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/pools.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xm-test/tests/cpupool/pools.py ++++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/pools.py @@ -0,0 +1,78 @@ +#!/usr/bin/python + @@ -660,10 +660,10 @@ + break + time.sleep(1) + -Index: xen-4.0.0-testing/tools/xm-test/tests/xapi/20_xapi-cpu_pool_basic.py +Index: xen-4.0.1-testing/tools/xm-test/tests/xapi/20_xapi-cpu_pool_basic.py =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xm-test/tests/xapi/20_xapi-cpu_pool_basic.py ++++ xen-4.0.1-testing/tools/xm-test/tests/xapi/20_xapi-cpu_pool_basic.py @@ -0,0 +1,157 @@ +#!/usr/bin/python + @@ -822,10 +822,10 @@ +if pool1 in session.xenapi.cpu_pool.get_all(): + FAIL("cpu_pool.destroy() has not removed pool") + -Index: xen-4.0.0-testing/tools/xm-test/tests/xapi/Makefile.am +Index: xen-4.0.1-testing/tools/xm-test/tests/xapi/Makefile.am =================================================================== ---- xen-4.0.0-testing.orig/tools/xm-test/tests/xapi/Makefile.am -+++ xen-4.0.0-testing/tools/xm-test/tests/xapi/Makefile.am +--- xen-4.0.1-testing.orig/tools/xm-test/tests/xapi/Makefile.am ++++ xen-4.0.1-testing/tools/xm-test/tests/xapi/Makefile.am @@ -3,7 +3,8 @@ SUBDIRS = TESTS = 01_xapi-vm_basic.test \ 02_xapi-vbd_basic.test \ ++++++ cpupools-core-fixup.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -9,9 +9,11 @@ missing adjustments get detected at build time) - remove boot time per-CPU pool assignment messages (bnc#572146) ---- a/xen/arch/x86/domain.c -+++ b/xen/arch/x86/domain.c -@@ -1581,6 +1581,7 @@ int continue_hypercall_on_cpu(int cpu, v +Index: xen-4.0.1-testing/xen/arch/x86/domain.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/domain.c ++++ xen-4.0.1-testing/xen/arch/x86/domain.c +@@ -1585,6 +1585,7 @@ int continue_hypercall_on_cpu(int cpu, v v->arch.schedule_tail = continue_hypercall_on_cpu_helper; v->arch.continue_info = info; @@ -19,7 +21,7 @@ } else { -@@ -1591,8 +1592,7 @@ int continue_hypercall_on_cpu(int cpu, v +@@ -1595,8 +1596,7 @@ int continue_hypercall_on_cpu(int cpu, v info->func = func; info->data = data; @@ -29,8 +31,10 @@ raise_softirq(SCHEDULE_SOFTIRQ); /* Dummy return value will be overwritten by new schedule_tail. */ ---- a/xen/common/sched_credit.c -+++ b/xen/common/sched_credit.c +Index: xen-4.0.1-testing/xen/common/sched_credit.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/common/sched_credit.c ++++ xen-4.0.1-testing/xen/common/sched_credit.c @@ -176,7 +176,6 @@ struct csched_private { /* * Global variables @@ -54,8 +58,10 @@ .init_domain = csched_dom_init, .destroy_domain = csched_dom_destroy, ---- a/xen/common/softirq.c -+++ b/xen/common/softirq.c +Index: xen-4.0.1-testing/xen/common/softirq.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/common/softirq.c ++++ xen-4.0.1-testing/xen/common/softirq.c @@ -104,12 +104,15 @@ static void tasklet_schedule_list(struct { BUG_ON(!list_empty(&t->list)); @@ -99,8 +105,10 @@ } /* ---- a/xen/include/public/domctl.h -+++ b/xen/include/public/domctl.h +Index: xen-4.0.1-testing/xen/include/public/domctl.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/public/domctl.h ++++ xen-4.0.1-testing/xen/include/public/domctl.h @@ -35,7 +35,7 @@ #include "xen.h" #include "grant_table.h" @@ -110,8 +118,10 @@ struct xenctl_cpumap { XEN_GUEST_HANDLE_64(uint8) bitmap; ---- a/xen/include/xen/softirq.h -+++ b/xen/include/xen/softirq.h +Index: xen-4.0.1-testing/xen/include/xen/softirq.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/xen/softirq.h ++++ xen-4.0.1-testing/xen/include/xen/softirq.h @@ -50,15 +50,17 @@ struct tasklet bool_t is_scheduled; bool_t is_running; ++++++ cpupools-core.patch ++++++ ++++ 630 lines (skipped) ++++ between xen/cpupools-core.patch ++++ and /mounts/work_src_done/STABLE/xen/cpupools-core.patch ++++++ del_usb_xend_entry.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,8 +1,8 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -1310,8 +1310,15 @@ class XendDomainInfo: +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -1313,8 +1313,15 @@ class XendDomainInfo: frontpath = self.getDeviceController(deviceClass).frontendPath(dev) backpath = xstransact.Read(frontpath, "backend") thread.start_new_thread(self.getDeviceController(deviceClass).finishDeviceCleanup, (backpath, path)) ++++++ disable_emulated_device.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c =================================================================== ---- xen-4.0.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c -+++ xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +--- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c ++++ xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -401,6 +401,11 @@ static int __devinit platform_pci_init(s platform_mmio = mmio_addr; platform_mmiolen = mmio_len; ++++++ dom-print.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,6 +1,8 @@ ---- a/xen/arch/x86/domain.c -+++ b/xen/arch/x86/domain.c -@@ -144,14 +144,29 @@ void dump_pageframe_info(struct domain * +Index: xen-4.0.1-testing/xen/arch/x86/domain.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/domain.c ++++ xen-4.0.1-testing/xen/arch/x86/domain.c +@@ -144,15 +144,30 @@ void dump_pageframe_info(struct domain * printk("Memory pages belonging to domain %u:\n", d->domain_id); @@ -14,6 +16,7 @@ + unsigned long total[PGT_type_mask + / (PGT_type_mask & -PGT_type_mask) + 1] = {}; + + spin_lock(&d->page_alloc_lock); page_list_for_each ( page, &d->page_list ) { + unsigned int index = (page->u.inuse.type_info & PGT_type_mask) ++++++ domu-usb-controller.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendConfig.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py @@ -1861,7 +1861,14 @@ class XendConfig(dict): ports = sxp.child(dev_sxp, 'port') for port in ports[1:]: ++++++ dump-exec-state.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,6 +1,8 @@ ---- a/xen/arch/ia64/linux-xen/smp.c -+++ b/xen/arch/ia64/linux-xen/smp.c -@@ -94,6 +94,7 @@ static volatile struct call_data_struct +Index: xen-4.0.1-testing/xen/arch/ia64/linux-xen/smp.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/ia64/linux-xen/smp.c ++++ xen-4.0.1-testing/xen/arch/ia64/linux-xen/smp.c +@@ -94,6 +94,7 @@ static volatile struct call_data_struct #define IPI_CALL_FUNC 0 #define IPI_CPU_STOP 1 @@ -32,8 +34,10 @@ int __init setup_profiling_timer (unsigned int multiplier) { ---- a/xen/arch/x86/smp.c -+++ b/xen/arch/x86/smp.c +Index: xen-4.0.1-testing/xen/arch/x86/smp.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/smp.c ++++ xen-4.0.1-testing/xen/arch/x86/smp.c @@ -375,11 +375,24 @@ void smp_send_nmi_allbutself(void) send_IPI_mask(&cpu_online_map, APIC_DM_NMI); } @@ -59,8 +63,10 @@ set_irq_regs(old_regs); } ---- a/xen/common/keyhandler.c -+++ b/xen/common/keyhandler.c +Index: xen-4.0.1-testing/xen/common/keyhandler.c +=================================================================== +--- xen-4.0.1-testing.orig/xen/common/keyhandler.c ++++ xen-4.0.1-testing/xen/common/keyhandler.c @@ -71,19 +71,52 @@ static struct keyhandler show_handlers_k .desc = "show this message" }; @@ -151,8 +157,10 @@ printk("\n"); ---- a/xen/include/asm-ia64/linux-xen/asm/ptrace.h -+++ b/xen/include/asm-ia64/linux-xen/asm/ptrace.h +Index: xen-4.0.1-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/asm-ia64/linux-xen/asm/ptrace.h ++++ xen-4.0.1-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h @@ -278,7 +278,7 @@ struct switch_stack { # define ia64_task_regs(t) (((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1) # define ia64_psr(regs) ((struct ia64_psr *) &(regs)->cr_ipsr) @@ -162,8 +170,10 @@ # define guest_kernel_mode(regs) (ia64_psr(regs)->cpl == CONFIG_CPL0_EMUL) # define vmx_guest_kernel_mode(regs) (ia64_psr(regs)->cpl == 0) # define regs_increment_iip(regs) \ ---- a/xen/include/asm-x86/hardirq.h -+++ b/xen/include/asm-x86/hardirq.h +Index: xen-4.0.1-testing/xen/include/asm-x86/hardirq.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/asm-x86/hardirq.h ++++ xen-4.0.1-testing/xen/include/asm-x86/hardirq.h @@ -8,6 +8,7 @@ typedef struct { unsigned long __softirq_pending; unsigned int __local_irq_count; @@ -172,8 +182,10 @@ } __cacheline_aligned irq_cpustat_t; #include <xen/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ ---- a/xen/include/xen/irq_cpustat.h -+++ b/xen/include/xen/irq_cpustat.h +Index: xen-4.0.1-testing/xen/include/xen/irq_cpustat.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/xen/irq_cpustat.h ++++ xen-4.0.1-testing/xen/include/xen/irq_cpustat.h @@ -26,5 +26,6 @@ extern irq_cpustat_t irq_stat[]; #define softirq_pending(cpu) __IRQ_STAT((cpu), __softirq_pending) #define local_irq_count(cpu) __IRQ_STAT((cpu), __local_irq_count) @@ -181,9 +193,11 @@ +#define state_dump_pending(cpu) __IRQ_STAT((cpu), __state_dump_pending) #endif /* __irq_cpustat_h */ ---- a/xen/include/xen/lib.h -+++ b/xen/include/xen/lib.h -@@ -111,4 +111,7 @@ extern int tainted; +Index: xen-4.0.1-testing/xen/include/xen/lib.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/xen/lib.h ++++ xen-4.0.1-testing/xen/include/xen/lib.h +@@ -116,4 +116,7 @@ extern int tainted; extern char *print_tainted(char *str); extern void add_taint(unsigned); @@ -191,8 +205,10 @@ +void dump_execstate(struct cpu_user_regs *); + #endif /* __LIB_H__ */ ---- a/xen/include/xen/smp.h -+++ b/xen/include/xen/smp.h +Index: xen-4.0.1-testing/xen/include/xen/smp.h +=================================================================== +--- xen-4.0.1-testing.orig/xen/include/xen/smp.h ++++ xen-4.0.1-testing/xen/include/xen/smp.h @@ -13,6 +13,8 @@ extern void smp_send_event_check_mask(co #define smp_send_event_check_cpu(cpu) \ smp_send_event_check_mask(cpumask_of(cpu)) ++++++ enable_more_nic_pxe.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/firmware/etherboot/Config +Index: xen-4.0.1-testing/tools/firmware/etherboot/Config =================================================================== ---- xen-4.0.0-testing.orig/tools/firmware/etherboot/Config -+++ xen-4.0.0-testing/tools/firmware/etherboot/Config +--- xen-4.0.1-testing.orig/tools/firmware/etherboot/Config ++++ xen-4.0.1-testing/tools/firmware/etherboot/Config @@ -1,5 +1,5 @@ -NICS = rtl8139 eepro100 @@ -9,10 +9,10 @@ CFLAGS += -UPXE_DHCP_STRICT CFLAGS += -DPXE_DHCP_STRICT -Index: xen-4.0.0-testing/tools/firmware/etherboot/eb-roms.h +Index: xen-4.0.1-testing/tools/firmware/etherboot/eb-roms.h =================================================================== ---- xen-4.0.0-testing.orig/tools/firmware/etherboot/eb-roms.h -+++ xen-4.0.0-testing/tools/firmware/etherboot/eb-roms.h +--- xen-4.0.1-testing.orig/tools/firmware/etherboot/eb-roms.h ++++ xen-4.0.1-testing/tools/firmware/etherboot/eb-roms.h @@ -6367,5 +6367,6149 @@ unsigned etherboot[] = { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, ++++++ hibernate.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/firmware/hvmloader/acpi/dsdt.asl +Index: xen-4.0.1-testing/tools/firmware/hvmloader/acpi/dsdt.asl =================================================================== ---- xen-4.0.0-testing.orig/tools/firmware/hvmloader/acpi/dsdt.asl -+++ xen-4.0.0-testing/tools/firmware/hvmloader/acpi/dsdt.asl +--- xen-4.0.1-testing.orig/tools/firmware/hvmloader/acpi/dsdt.asl ++++ xen-4.0.1-testing/tools/firmware/hvmloader/acpi/dsdt.asl @@ -30,21 +30,9 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, /* * S3 (suspend-to-ram), S4 (suspend-to-disc) and S5 (power-off) type codes: ++++++ hv_tools.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/lowlevel/xc/xc.c +Index: xen-4.0.1-testing/tools/python/xen/lowlevel/xc/xc.c =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/lowlevel/xc/xc.c -+++ xen-4.0.0-testing/tools/python/xen/lowlevel/xc/xc.c +--- xen-4.0.1-testing.orig/tools/python/xen/lowlevel/xc/xc.c ++++ xen-4.0.1-testing/tools/python/xen/lowlevel/xc/xc.c @@ -944,16 +944,16 @@ static PyObject *pyxc_hvm_build(XcObject #endif int i; @@ -32,10 +32,10 @@ return Py_BuildValue("{}"); } -Index: xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendConfig.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py @@ -157,6 +157,7 @@ XENAPI_PLATFORM_CFG_TYPES = { 'nographic': int, 'nomigrate': int, @@ -44,10 +44,10 @@ 'rtc_timeoffset': int, 'parallel': str, 'serial': str, -Index: xen-4.0.0-testing/tools/python/xen/xend/image.py +Index: xen-4.0.1-testing/tools/python/xen/xend/image.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/image.py -+++ xen-4.0.0-testing/tools/python/xen/xend/image.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py ++++ xen-4.0.1-testing/tools/python/xen/xend/image.py @@ -839,6 +839,7 @@ class HVMImageHandler(ImageHandler): self.apic = int(vmConfig['platform'].get('apic', 0)) @@ -72,10 +72,10 @@ acpi = self.acpi, apic = self.apic) rc['notes'] = { 'SUSPEND_CANCEL': 1 } -Index: xen-4.0.0-testing/tools/python/xen/xm/create.py +Index: xen-4.0.1-testing/tools/python/xen/xm/create.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/create.py -+++ xen-4.0.0-testing/tools/python/xen/xm/create.py +--- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py ++++ xen-4.0.1-testing/tools/python/xen/xm/create.py @@ -242,6 +242,10 @@ gopts.var('viridian', val='VIRIDIAN', use="""Expose Viridian interface to x86 HVM guest? (Default is 0).""") @@ -87,7 +87,7 @@ gopts.var('acpi', val='ACPI', fn=set_int, default=1, use="Disable or enable ACPI of HVM domain.") -@@ -1083,7 +1087,7 @@ def configure_hvm(config_image, vals): +@@ -1091,7 +1095,7 @@ def configure_hvm(config_image, vals): 'timer_mode', 'usb', 'usbdevice', 'vcpus', 'vnc', 'vncconsole', 'vncdisplay', 'vnclisten', ++++++ hv_win7_eoi_bug.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c +Index: xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/hvm/hyperv/hv_intercept.c -+++ xen-4.0.0-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c +--- xen-4.0.1-testing.orig/xen/arch/x86/hvm/hyperv/hv_intercept.c ++++ xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c @@ -33,6 +33,7 @@ #include <asm/config.h> ++++++ hv_xen_base.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/xen/include/asm-x86/hvm/domain.h +Index: xen-4.0.1-testing/xen/include/asm-x86/hvm/domain.h =================================================================== ---- xen-4.0.0-testing.orig/xen/include/asm-x86/hvm/domain.h -+++ xen-4.0.0-testing/xen/include/asm-x86/hvm/domain.h +--- xen-4.0.1-testing.orig/xen/include/asm-x86/hvm/domain.h ++++ xen-4.0.1-testing/xen/include/asm-x86/hvm/domain.h @@ -96,6 +96,7 @@ struct hvm_domain { struct vmx_domain vmx; struct svm_domain svm; @@ -10,10 +10,10 @@ }; #endif /* __ASM_X86_HVM_DOMAIN_H__ */ -Index: xen-4.0.0-testing/xen/arch/x86/hvm/Makefile +Index: xen-4.0.1-testing/xen/arch/x86/hvm/Makefile =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/hvm/Makefile -+++ xen-4.0.0-testing/xen/arch/x86/hvm/Makefile +--- xen-4.0.1-testing.orig/xen/arch/x86/hvm/Makefile ++++ xen-4.0.1-testing/xen/arch/x86/hvm/Makefile @@ -1,5 +1,6 @@ subdir-y += svm subdir-y += vmx @@ -21,10 +21,10 @@ obj-y += asid.o obj-y += emulate.o -Index: xen-4.0.0-testing/xen/arch/x86/hvm/hvm.c +Index: xen-4.0.1-testing/xen/arch/x86/hvm/hvm.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/hvm/hvm.c -+++ xen-4.0.0-testing/xen/arch/x86/hvm/hvm.c +--- xen-4.0.1-testing.orig/xen/arch/x86/hvm/hvm.c ++++ xen-4.0.1-testing/xen/arch/x86/hvm/hvm.c @@ -48,6 +48,7 @@ #include <asm/mc146818rtc.h> #include <asm/spinlock.h> @@ -107,7 +107,7 @@ return hvm_funcs.msr_write_intercept(regs); } -@@ -2330,6 +2346,10 @@ int hvm_do_hypercall(struct cpu_user_reg +@@ -2344,6 +2360,10 @@ int hvm_do_hypercall(struct cpu_user_reg case 0: break; } @@ -118,7 +118,7 @@ if ( (eax & 0x80000000) && is_viridian_domain(curr->domain) ) return viridian_hypercall(regs); -@@ -2864,6 +2884,18 @@ long do_hvm_op(unsigned long op, XEN_GUE +@@ -2878,6 +2898,18 @@ long do_hvm_op(unsigned long op, XEN_GUE rc = -EINVAL; break; @@ -137,10 +137,10 @@ } if ( rc == 0 ) -Index: xen-4.0.0-testing/xen/include/public/arch-x86/hvm/save.h +Index: xen-4.0.1-testing/xen/include/public/arch-x86/hvm/save.h =================================================================== ---- xen-4.0.0-testing.orig/xen/include/public/arch-x86/hvm/save.h -+++ xen-4.0.0-testing/xen/include/public/arch-x86/hvm/save.h +--- xen-4.0.1-testing.orig/xen/include/public/arch-x86/hvm/save.h ++++ xen-4.0.1-testing/xen/include/public/arch-x86/hvm/save.h @@ -431,9 +431,24 @@ struct hvm_viridian_context { DECLARE_HVM_SAVE_TYPE(VIRIDIAN, 15, struct hvm_viridian_context); @@ -167,10 +167,10 @@ +#define HVM_SAVE_CODE_MAX 17 #endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */ -Index: xen-4.0.0-testing/xen/arch/x86/hvm/vlapic.c +Index: xen-4.0.1-testing/xen/arch/x86/hvm/vlapic.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/hvm/vlapic.c -+++ xen-4.0.0-testing/xen/arch/x86/hvm/vlapic.c +--- xen-4.0.1-testing.orig/xen/arch/x86/hvm/vlapic.c ++++ xen-4.0.1-testing/xen/arch/x86/hvm/vlapic.c @@ -34,6 +34,7 @@ #include <asm/hvm/hvm.h> #include <asm/hvm/io.h> @@ -187,11 +187,11 @@ return X86EMUL_OKAY; } -Index: xen-4.0.0-testing/xen/include/public/hvm/params.h +Index: xen-4.0.1-testing/xen/include/public/hvm/params.h =================================================================== ---- xen-4.0.0-testing.orig/xen/include/public/hvm/params.h -+++ xen-4.0.0-testing/xen/include/public/hvm/params.h -@@ -106,6 +106,8 @@ +--- xen-4.0.1-testing.orig/xen/include/public/hvm/params.h ++++ xen-4.0.1-testing/xen/include/public/hvm/params.h +@@ -109,6 +109,8 @@ /* Boolean: Enable aligning all periodic vpts to reduce interrupts */ #define HVM_PARAM_VPT_ALIGN 16 ++++++ hv_xen_extension.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,5 +1,7 @@ +Index: xen-4.0.1-testing/xen/include/asm-x86/hvm/hvm_extensions.h +=================================================================== --- /dev/null -+++ b/xen/include/asm-x86/hvm/hvm_extensions.h ++++ xen-4.0.1-testing/xen/include/asm-x86/hvm/hvm_extensions.h @@ -0,0 +1,183 @@ +/**************************************************************************** + | @@ -184,13 +186,17 @@ +int hyperx_initialize(struct domain *d); + +#endif +Index: xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/Makefile +=================================================================== --- /dev/null -+++ b/xen/arch/x86/hvm/hyperv/Makefile ++++ xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/Makefile @@ -0,0 +1,2 @@ +obj-y += hv_intercept.o +obj-y += hv_hypercall.o +Index: xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_errno.h +=================================================================== --- /dev/null -+++ b/xen/arch/x86/hvm/hyperv/hv_errno.h ++++ xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_errno.h @@ -0,0 +1,62 @@ +/**************************************************************************** + | @@ -254,8 +260,10 @@ +#define HV_STATUS_NO_MEMORY_256PAGES 0x0103 +#define HV_STATUS_NO_MEMORY_1024PAGES 0x0104 +#endif +Index: xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.c +=================================================================== --- /dev/null -+++ b/xen/arch/x86/hvm/hyperv/hv_hypercall.c ++++ xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.c @@ -0,0 +1,153 @@ +/**************************************************************************** + | @@ -410,8 +418,10 @@ + return; + } +} +Index: xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.h +=================================================================== --- /dev/null -+++ b/xen/arch/x86/hvm/hyperv/hv_hypercall.h ++++ xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_hypercall.h @@ -0,0 +1,46 @@ +/**************************************************************************** + | @@ -459,8 +469,10 @@ +#define HV_NOTIFY_LONG_SPIN_WAIT 0x0008 + +#endif /* HV_HYPERCALL_H */ +Index: xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c +=================================================================== --- /dev/null -+++ b/xen/arch/x86/hvm/hyperv/hv_intercept.c ++++ xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_intercept.c @@ -0,0 +1,1009 @@ +/**************************************************************************** + | @@ -1471,8 +1483,10 @@ + hvm_inject_exception(TRAP_gp_fault, 0, 0); + return (1); +} +Index: xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_shim.h +=================================================================== --- /dev/null -+++ b/xen/arch/x86/hvm/hyperv/hv_shim.h ++++ xen-4.0.1-testing/xen/arch/x86/hvm/hyperv/hv_shim.h @@ -0,0 +1,286 @@ +/**************************************************************************** + | ++++++ ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -17,10 +17,10 @@ Signed-off-by: Kevin Wolf <kwolf(a)redhat.com> -Index: xen-4.0.0-testing/tools/ioemu-remote/block-qcow2.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/block-qcow2.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/block-qcow2.c -+++ xen-4.0.0-testing/tools/ioemu-remote/block-qcow2.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/block-qcow2.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/block-qcow2.c @@ -916,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr goto err; ++++++ ioemu-bdrv-open-CACHE_WB.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -249,8 +249,11 @@ static int open_disk(struct td_state *s, drv = blktap_drivers[i].drv; DPRINTF("%s driver specified\n", drv ? drv->format_name : "No"); ++++++ ioemu-blktap-barriers.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -362,6 +362,15 @@ static void qemu_send_responses(void* op } ++++++ ioemu-blktap-fv-init.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_machine_fv.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_machine_fv.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_machine_fv.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_machine_fv.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c @@ -268,6 +268,7 @@ void qemu_invalidate_entry(uint8_t *buff #endif /* defined(MAPCACHE) */ ++++++ ioemu-blktap-image-format.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -15,10 +15,10 @@ hw/xen_blktap.h | 14 ++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -220,9 +220,10 @@ static int map_new_dev(struct td_state * return -1; } @@ -64,10 +64,10 @@ msglen = sizeof(msg_hdr_t); msg->type = CTLMSG_IMG_FAIL; msg->len = msglen; -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.h +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.h -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.h +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h @@ -52,4 +52,18 @@ typedef struct fd_list_entry { int init_blktap(void); ++++++ ioemu-blktap-zero-size.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -12,10 +12,10 @@ hw/xen_blktap.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -258,6 +258,12 @@ static int open_disk(struct td_state *s, s->size = bs->total_sectors; s->sector_size = 512; @@ -29,10 +29,10 @@ s->info = ((s->flags & TD_RDONLY) ? VDISK_READONLY : 0); #ifndef QEMU_TOOL -Index: xen-4.0.0-testing/tools/python/xen/xend/server/DevController.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/DevController.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/DevController.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/DevController.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py @@ -155,7 +155,7 @@ class DevController: (devid, self.deviceClass)) ++++++ ioemu-debuginfo.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/Makefile +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/Makefile -+++ xen-4.0.0-testing/tools/ioemu-remote/Makefile +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/Makefile ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/Makefile @@ -243,7 +243,7 @@ endif install: all $(if $(BUILD_DOCS),install-doc) mkdir -p "$(DESTDIR)$(bindir)" @@ -11,10 +11,10 @@ endif ifneq ($(BLOBS),) mkdir -p "$(DESTDIR)$(datadir)" -Index: xen-4.0.0-testing/tools/ioemu-remote/Makefile.target +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/Makefile.target =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/Makefile.target -+++ xen-4.0.0-testing/tools/ioemu-remote/Makefile.target +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/Makefile.target ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/Makefile.target @@ -754,7 +754,7 @@ clean: install: all install-hook ++++++ ioemu-disable-scsi.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_platform.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_platform.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_platform.c 2010-02-18 14:08:08.000000000 -0700 -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_platform.c 2010-02-18 14:28:59.000000000 -0700 +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_platform.c @@ -359,6 +359,8 @@ static void platform_ioport_write(void * case 4: fprintf(logfile, "Disconnect IDE hard disk...\n"); @@ -11,10 +11,10 @@ fprintf(logfile, "Disconnect netifs...\n"); pci_unplug_netifs(); fprintf(logfile, "Shutdown taps...\n"); -Index: xen-4.0.0-testing/tools/ioemu-remote/qemu-xen.h +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-xen.h =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/qemu-xen.h 2010-02-18 14:08:08.000000000 -0700 -+++ xen-4.0.0-testing/tools/ioemu-remote/qemu-xen.h 2010-02-18 14:44:28.000000000 -0700 +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-xen.h @@ -57,6 +57,7 @@ void unset_vram_mapping(void *opaque); #endif @@ -23,10 +23,10 @@ void destroy_hvm_domain(void); void unregister_iomem(target_phys_addr_t start); -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/pci.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/pci.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/pci.c 2010-02-18 14:49:36.000000000 -0700 -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/pci.c 2010-02-18 14:53:47.000000000 -0700 +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/pci.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/pci.c @@ -892,6 +892,50 @@ void pci_unplug_netifs(void) } } ++++++ ioemu-vnc-resize.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,8 +1,8 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/vnc.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/vnc.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/vnc.c -+++ xen-4.0.0-testing/tools/ioemu-remote/vnc.c -@@ -1713,6 +1713,31 @@ static int protocol_client_msg(VncState +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/vnc.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/vnc.c +@@ -1713,6 +1713,31 @@ static int protocol_client_msg(VncState } set_encodings(vs, (int32_t *)(data + 4), limit); ++++++ libxen_permissive.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/libxen/src/xen_common.c +Index: xen-4.0.1-testing/tools/libxen/src/xen_common.c =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/src/xen_common.c -+++ xen-4.0.0-testing/tools/libxen/src/xen_common.c +--- xen-4.0.1-testing.orig/tools/libxen/src/xen_common.c ++++ xen-4.0.1-testing/tools/libxen/src/xen_common.c @@ -904,8 +904,15 @@ static void parse_into(xen_session *s, x 0 != strcmp((char *)value_node->children->name, "struct") || value_node->children->children == NULL) ++++++ magic_ioport_compat.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -2,10 +2,10 @@ Signed-off-by: K. Y. Srinivasan <ksrinivasan(a)novell.com> -Index: xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c =================================================================== ---- xen-4.0.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c -+++ xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +--- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c ++++ xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -320,7 +320,10 @@ static int check_platform_magic(struct d if (magic != XEN_IOPORT_MAGIC_VAL) { ++++++ multi-xvdp.patch ++++++ Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py =================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/util/blkif.py +++ xen-4.0.1-testing/tools/python/xen/util/blkif.py @@ -19,10 +19,12 @@ def blkdev_name_to_number(name): devname = 'virtual-device' devnum = None + """ try: return (devname, os.stat(n).st_rdev) except Exception, ex: pass + """ scsi_major = [ 8, 65, 66, 67, 68, 69, 70, 71, 128, 129, 130, 131, 132, 133, 134, 135 ] if re.match( '/dev/sd[a-z]([1-9]|1[0-5])?$', n): Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -73,7 +73,7 @@ from xen.xend.XendPSCSI import XendPSCSI from xen.xend.XendDSCSI import XendDSCSI, XendDSCSI_HBA MIGRATE_TIMEOUT = 30.0 -BOOTLOADER_LOOPBACK_DEVICE = '/dev/xvdp' +BOOTLOADER_LOOPBACK_DEVICES = ['/dev/xvdy', '/dev/xvdx', '/dev/xvdw', '/dev/xvdv', '/dev/xvdu', '/dev/xvdt', '/dev/xvds', '/dev/xvdr', '/dev/xvdq', '/dev/xvdp', '/dev/xvdo', '/dev/xvdn', '/dev/xvdm', '/dev/xvdl', '/dev/xvdk', '/dev/xvdj', '/dev/xvdi', '/dev/xvdh', '/dev/xvdg', '/dev/xvdf', '/dev/xvde', '/dev/xvdd'] xc = xen.lowlevel.xc.xc() xoptions = XendOptions.instance() @@ -3314,20 +3314,27 @@ class XendDomainInfo: # This is a file, not a device. pygrub can cope with a # file if it's raw, but if it's QCOW or other such formats # used through blktap, then we need to mount it first. - - log.info("Mounting %s on %s." % - (fn, BOOTLOADER_LOOPBACK_DEVICE)) - - vbd = { - 'mode': 'RW', - 'device': BOOTLOADER_LOOPBACK_DEVICE, - } - - from xen.xend import XendDomain - dom0 = XendDomain.instance().privilegedDomain() - vbd_uuid = dom0.create_vbd(vbd, disk) - dom0._waitForDeviceFrontUUID(vbd_uuid) - fn = BOOTLOADER_LOOPBACK_DEVICE + # Try all possible loopback_devices + for loopback_device in BOOTLOADER_LOOPBACK_DEVICES: + log.info("Mounting %s on %s." % (fn, loopback_device)) + vbd = { 'mode' : 'RW', 'device' : loopback_device, } + try: + from xen.xend import XendDomain + dom0 = XendDomain.instance().privilegedDomain() + vbd_uuid = dom0.create_vbd(vbd, disk) + dom0._waitForDeviceFrontUUID(vbd_uuid) + fn = loopback_device + break + except VmError, e: + if str(e).find('already connected.') != -1: + continue + elif str(e).find('isn\'t accessible') != -1: + dom0.destroyDevice('vbd', loopback_device, force = True, rm_cfg = True) + continue + else: + raise + else: + raise try: blcfg = bootloader(blexec, fn, self, False, @@ -3335,11 +3342,11 @@ class XendDomainInfo: finally: if mounted: log.info("Unmounting %s from %s." % - (fn, BOOTLOADER_LOOPBACK_DEVICE)) + (fn, loopback_device)) if devtype in ['tap', 'tap2']: - dom0.destroyDevice('tap', BOOTLOADER_LOOPBACK_DEVICE, rm_cfg = True) + dom0.destroyDevice('tap', loopback_device, rm_cfg = True) else: - dom0.destroyDevice('vbd', BOOTLOADER_LOOPBACK_DEVICE, rm_cfg = True) + dom0.destroyDevice('vbd', loopback_device, rm_cfg = True) if blcfg is None: msg = "Had a bootloader specified, but can't find disk" ++++++ network-nat-open-SuSEfirewall2-FORWARD.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,9 +1,9 @@ Open SuSEfirewall2 FORWARD rule when use xen nat -Index: xen-4.0.0-testing/tools/hotplug/Linux/network-nat +Index: xen-4.0.1-testing/tools/hotplug/Linux/network-nat =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-nat -+++ xen-4.0.0-testing/tools/hotplug/Linux/network-nat +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-nat ++++ xen-4.0.1-testing/tools/hotplug/Linux/network-nat @@ -83,6 +83,7 @@ function dhcp_stop() op_start() { echo 1 >/proc/sys/net/ipv4/ip_forward ++++++ network-nat.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/network-nat +Index: xen-4.0.1-testing/tools/hotplug/Linux/network-nat =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-nat -+++ xen-4.0.0-testing/tools/hotplug/Linux/network-nat +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-nat ++++ xen-4.0.1-testing/tools/hotplug/Linux/network-nat @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/bin/bash ++++++ network-route.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/network-route +Index: xen-4.0.1-testing/tools/hotplug/Linux/network-route =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-route -+++ xen-4.0.0-testing/tools/hotplug/Linux/network-route +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-route ++++ xen-4.0.1-testing/tools/hotplug/Linux/network-route @@ -22,7 +22,7 @@ dir=$(dirname "$0") evalVariables "$@" ++++++ popen2-argument-fix.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/util/blkif.py +Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/util/blkif.py -+++ xen-4.0.0-testing/tools/python/xen/util/blkif.py +--- xen-4.0.1-testing.orig/tools/python/xen/util/blkif.py ++++ xen-4.0.1-testing/tools/python/xen/util/blkif.py @@ -81,7 +81,7 @@ def parse_uname(uname): if typ == "drbd": ++++++ pv-driver-build.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild +Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild =================================================================== ---- xen-4.0.0-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild -+++ xen-4.0.0-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild +--- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild ++++ xen-4.0.1-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild @@ -3,3 +3,4 @@ include $(M)/overrides.mk obj-m += xen-vbd.o ++++++ pvdrv-import-shared-info.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c +Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c =================================================================== ---- xen-4.0.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c -+++ xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c +--- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c ++++ xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c @@ -40,7 +40,9 @@ #include <xen/platform-compat.h> #endif @@ -12,10 +12,10 @@ #define is_valid_evtchn(x) ((x) != 0) #define evtchn_from_irq(x) (irq_evtchn[irq].evtchn) -Index: xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c =================================================================== ---- xen-4.0.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c -+++ xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c +--- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c ++++ xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c @@ -77,7 +77,6 @@ static uint64_t callback_via; static int __devinit init_xen_info(void) { @@ -44,10 +44,10 @@ return 0; } -Index: xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h +Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h =================================================================== ---- xen-4.0.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h -+++ xen-4.0.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h +--- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h ++++ xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h @@ -27,6 +27,11 @@ unsigned long alloc_xen_mmio(unsigned long len); void platform_pci_resume(void); ++++++ pvdrv_emulation_control.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_platform.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_platform.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_platform.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_platform.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_platform.c @@ -365,6 +365,19 @@ static void platform_ioport_write(void * net_tap_shutdown_all(); fprintf(logfile, "Done.\n"); ++++++ qemu-dm-segfault.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/ide.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/ide.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/ide.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/ide.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/ide.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/ide.c @@ -935,8 +935,9 @@ static inline void ide_dma_submit_check( static inline void ide_set_irq(IDEState *s) ++++++ qemu-security-etch1.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/ne2000.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/ne2000.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/ne2000.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/ne2000.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/ne2000.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/ne2000.c @@ -218,7 +218,7 @@ static int ne2000_can_receive(void *opaq NE2000State *s = opaque; @@ -11,10 +11,10 @@ return !ne2000_buffer_full(s); } -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/pc.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/pc.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/pc.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/pc.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/pc.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/pc.c @@ -409,7 +409,8 @@ static void bochs_bios_write(void *opaqu case 0x400: case 0x401: ++++++ serial-split.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/misc/serial-split/Makefile +Index: xen-4.0.1-testing/tools/misc/serial-split/Makefile =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/misc/serial-split/Makefile ++++ xen-4.0.1-testing/tools/misc/serial-split/Makefile @@ -0,0 +1,20 @@ +CC ?= gcc +CFLAGS ?= -Wall -Os @@ -23,10 +23,10 @@ + +%.o: %.c Makefile + $(CC) $(CFLAGS) -c -o $@ $< -Index: xen-4.0.0-testing/tools/misc/serial-split/serial-split.c +Index: xen-4.0.1-testing/tools/misc/serial-split/serial-split.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/misc/serial-split/serial-split.c ++++ xen-4.0.1-testing/tools/misc/serial-split/serial-split.c @@ -0,0 +1,422 @@ +/* + * serial-split.c ++++++ snapshot-ioemu-delete.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,8 +1,8 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/xenstore.c -+++ xen-4.0.0-testing/tools/ioemu-remote/xenstore.c -@@ -912,6 +912,18 @@ static void xenstore_process_dm_command_ +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c +@@ -935,6 +935,18 @@ static void xenstore_process_dm_command_ } snapshot_name = xs_read(xsh, XBT_NULL, path, &len); @@ -21,10 +21,10 @@ } else if (!strncmp(command, "continue", len)) { fprintf(logfile, "dm-command: continue after state save\n"); xen_pause_requested = 0; -Index: xen-4.0.0-testing/tools/ioemu-remote/savevm.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/savevm.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/savevm.c -+++ xen-4.0.0-testing/tools/ioemu-remote/savevm.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/savevm.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/savevm.c @@ -1096,6 +1096,35 @@ the_end: return ret; } @@ -61,10 +61,10 @@ #ifndef CONFIG_DM void do_savevm(const char *name) -Index: xen-4.0.0-testing/tools/ioemu-remote/qemu-xen.h +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-xen.h =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/qemu-xen.h -+++ xen-4.0.0-testing/tools/ioemu-remote/qemu-xen.h +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-xen.h @@ -42,6 +42,7 @@ enum { /* xen-vl-extra.c */ ++++++ snapshot-ioemu-restore.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/blktap/drivers/blktapctrl.c +Index: xen-4.0.1-testing/tools/blktap/drivers/blktapctrl.c =================================================================== ---- xen-4.0.0-testing.orig/tools/blktap/drivers/blktapctrl.c -+++ xen-4.0.0-testing/tools/blktap/drivers/blktapctrl.c +--- xen-4.0.1-testing.orig/tools/blktap/drivers/blktapctrl.c ++++ xen-4.0.1-testing/tools/blktap/drivers/blktapctrl.c @@ -348,6 +348,7 @@ static int write_msg(int fd, int msgtype msg_dev = (msg_newdev_t *)(buf + sizeof(msg_hdr_t)); msg_dev->devnum = blkif->minor; @@ -10,10 +10,10 @@ break; -Index: xen-4.0.0-testing/tools/blktap/lib/blktaplib.h +Index: xen-4.0.1-testing/tools/blktap/lib/blktaplib.h =================================================================== ---- xen-4.0.0-testing.orig/tools/blktap/lib/blktaplib.h -+++ xen-4.0.0-testing/tools/blktap/lib/blktaplib.h +--- xen-4.0.1-testing.orig/tools/blktap/lib/blktaplib.h ++++ xen-4.0.1-testing/tools/blktap/lib/blktaplib.h @@ -189,6 +189,7 @@ typedef struct msg_hdr { typedef struct msg_newdev { uint8_t devnum; @@ -22,10 +22,10 @@ } msg_newdev_t; typedef struct msg_pid { -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -67,6 +67,8 @@ int write_fd; static pid_t process; fd_list_entry_t *fd_start = NULL; @@ -87,10 +87,10 @@ memset(buf, 0x00, MSG_SIZE); msglen = sizeof(msg_hdr_t); -Index: xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/xenstore.c -+++ xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c @@ -103,6 +103,8 @@ int xenstore_watch_new_callback(const ch } @@ -100,11 +100,11 @@ static int pasprintf(char **buf, const char *fmt, ...) { va_list ap; -@@ -644,8 +646,33 @@ void xenstore_parse_domain_config(int hv - } - } - pstrcpy(bs->filename, sizeof(bs->filename), params); -- if (bdrv_open2(bs, params, BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0) +@@ -666,8 +668,33 @@ void xenstore_parse_domain_config(int hv + + fprintf(stderr, "Using file %s in read-%s mode\n", bs->filename, is_readonly ? "only" : "write"); + +- if (bdrv_open2(bs, params, flags, format) < 0) + if (bdrv_open2(bs, params, BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0) { fprintf(stderr, "qemu: could not open vbd '%s' or hard disk image '%s' (drv '%s' format '%s')\n", buf, params, drv ? drv : "?", format ? format->format_name : "0"); + } else { @@ -135,7 +135,7 @@ } #endif -@@ -779,6 +806,23 @@ int xenstore_parse_disable_pf_config () +@@ -802,6 +829,23 @@ int xenstore_parse_disable_pf_config () return disable_pf; } ++++++ snapshot-ioemu-save.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/savevm.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/savevm.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/savevm.c -+++ xen-4.0.0-testing/tools/ioemu-remote/savevm.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/savevm.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/savevm.c @@ -28,6 +28,7 @@ #include "sysemu.h" #include "qemu-timer.h" @@ -97,10 +97,10 @@ #ifndef CONFIG_DM void do_savevm(const char *name) -Index: xen-4.0.0-testing/tools/ioemu-remote/i386-dm/helper2.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/i386-dm/helper2.c -+++ xen-4.0.0-testing/tools/ioemu-remote/i386-dm/helper2.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/i386-dm/helper2.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c @@ -112,6 +112,9 @@ int send_vcpu = 0; //the evtchn port for polling the notification, evtchn_port_t *ioreq_local_port; @@ -167,10 +167,10 @@ /* Wait to be allowed to continue */ while (xen_pause_requested) { -Index: xen-4.0.0-testing/tools/ioemu-remote/qemu-xen.h +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-xen.h =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/qemu-xen.h -+++ xen-4.0.0-testing/tools/ioemu-remote/qemu-xen.h +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-xen.h @@ -34,6 +34,15 @@ void qemu_invalidate_map_cache(void) #define mapcache_lock() ((void)0) #define mapcache_unlock() ((void)0) @@ -195,10 +195,10 @@ void xenstore_check_new_media_present(int timeout); void xenstore_write_vncport(int vnc_display); void xenstore_read_vncpasswd(int domid, char *pwbuf, size_t pwbuflen); -Index: xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/xenstore.c -+++ xen-4.0.0-testing/tools/ioemu-remote/xenstore.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c @@ -17,6 +17,7 @@ #include "exec-all.h" @@ -207,7 +207,7 @@ #include "console.h" #include "hw.h" -@@ -839,6 +840,7 @@ static void xenstore_process_dm_command_ +@@ -862,6 +863,7 @@ static void xenstore_process_dm_command_ { char *path = NULL, *command = NULL, *par = NULL; unsigned int len; @@ -215,7 +215,7 @@ if (pasprintf(&path, "/local/domain/0/device-model/%u/command", domid) == -1) { -@@ -854,7 +856,18 @@ static void xenstore_process_dm_command_ +@@ -877,7 +879,18 @@ static void xenstore_process_dm_command_ if (!strncmp(command, "save", len)) { fprintf(logfile, "dm-command: pause and save state\n"); @@ -235,7 +235,7 @@ } else if (!strncmp(command, "continue", len)) { fprintf(logfile, "dm-command: continue after state save\n"); xen_pause_requested = 0; -@@ -987,6 +1000,13 @@ void xenstore_record_dm_state(const char +@@ -1010,6 +1023,13 @@ void xenstore_record_dm_state(const char xenstore_record_dm("state", state); } ++++++ snapshot-xend.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/image.py +Index: xen-4.0.1-testing/tools/python/xen/xend/image.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/image.py -+++ xen-4.0.0-testing/tools/python/xen/xend/image.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py ++++ xen-4.0.1-testing/tools/python/xen/xend/image.py @@ -490,7 +490,7 @@ class ImageHandler: domains.domains_lock.acquire() @@ -43,10 +43,10 @@ def recreate(self): if self.device_model is None: return -Index: xen-4.0.0-testing/tools/python/xen/xend/server/blkif.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/blkif.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/blkif.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/blkif.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/blkif.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/blkif.py @@ -88,6 +88,9 @@ class BlkifController(DevController): if bootable != None: back['bootable'] = str(bootable) @@ -57,10 +57,10 @@ if security.on() == xsconstants.XS_POLICY_USE: self.do_access_control(config, uname) -Index: xen-4.0.0-testing/tools/python/xen/xend/server/SrvDomain.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/SrvDomain.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/SrvDomain.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/SrvDomain.py @@ -95,6 +95,31 @@ class SrvDomain(SrvDir): def do_save(self, _, req): return self.xd.domain_save(self.dom.domid, req.args['file'][0]) @@ -102,10 +102,10 @@ return self.perform(req) # -Index: xen-4.0.0-testing/tools/python/xen/xend/XendCheckpoint.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendCheckpoint.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py @@ -65,7 +65,7 @@ def insert_after(list, pred, value): return @@ -321,10 +321,10 @@ if not paused: dominfo.unpause() -Index: xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendConfig.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py @@ -242,6 +242,7 @@ XENAPI_CFG_TYPES = { 'memory_sharing': int, 'Description': str, @@ -333,10 +333,10 @@ } # List of legacy configuration keys that have no equivalent in the -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomain.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomain.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomain.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomain.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomain.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomain.py @@ -53,6 +53,7 @@ from xen.xend.xenstore.xstransact import from xen.xend.xenstore.xswatch import xswatch from xen.util import mkdir, rwlock @@ -533,10 +533,10 @@ def domain_pincpu(self, domid, vcpu, cpumap): """Set which cpus vcpu can use -Index: xen-4.0.0-testing/tools/python/xen/xm/main.py +Index: xen-4.0.1-testing/tools/python/xen/xm/main.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/main.py -+++ xen-4.0.0-testing/tools/python/xen/xm/main.py +--- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py ++++ xen-4.0.1-testing/tools/python/xen/xm/main.py @@ -123,6 +123,14 @@ SUBCOMMAND_HELP = { 'Restore a domain from a saved state.'), 'save' : ('[-c|-f] <Domain> <CheckpointFile>', @@ -647,7 +647,7 @@ def xm_save(args): arg_check(args, "save", 2, 4) -@@ -3729,6 +3804,10 @@ commands = { +@@ -3743,6 +3818,10 @@ commands = { "restore": xm_restore, "resume": xm_resume, "save": xm_save, ++++++ supported_module.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -2,10 +2,10 @@ Signed-off-by: K. Y. Srinivasan <ksrinivasan(a)novell.com> -Index: xen-4.0.0-testing/unmodified_drivers/linux-2.6/Module.supported +Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/Module.supported =================================================================== --- /dev/null -+++ xen-4.0.0-testing/unmodified_drivers/linux-2.6/Module.supported ++++ xen-4.0.1-testing/unmodified_drivers/linux-2.6/Module.supported @@ -0,0 +1,5 @@ +xen-vbd +xen-platform-pci ++++++ tapdisk-ioemu-logfile.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -11,11 +11,11 @@ tapdisk-ioemu.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) -Index: xen-4.0.0-testing/tools/ioemu-remote/tapdisk-ioemu.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c -+++ xen-4.0.0-testing/tools/ioemu-remote/tapdisk-ioemu.c -@@ -78,15 +78,22 @@ int main(void) +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c +@@ -78,15 +78,22 @@ int main(void) struct timeval tv; void *old_fd_start = NULL; ++++++ tapdisk-ioemu-shutdown-fix.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -16,10 +16,10 @@ tapdisk-ioemu.c | 13 ++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_blktap.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c @@ -65,6 +65,7 @@ int read_fd; int write_fd; @@ -46,10 +46,10 @@ case CTLMSG_PID: memset(buf, 0x00, MSG_SIZE); -Index: xen-4.0.0-testing/tools/ioemu-remote/tapdisk-ioemu.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c -+++ xen-4.0.0-testing/tools/ioemu-remote/tapdisk-ioemu.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c @@ -14,6 +14,7 @@ extern void qemu_aio_init(void); extern void qemu_aio_poll(void); ++++++ tmp_build.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/xenstore/Makefile +Index: xen-4.0.1-testing/tools/xenstore/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/xenstore/Makefile -+++ xen-4.0.0-testing/tools/xenstore/Makefile +--- xen-4.0.1-testing.orig/tools/xenstore/Makefile ++++ xen-4.0.1-testing/tools/xenstore/Makefile @@ -61,6 +61,7 @@ $(CLIENTS_DOMU): xenstore xenstore: xenstore_client.o $(LIBXENSTORE) ++++++ tools-gdbserver-build.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in +Index: xen-4.0.1-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in =================================================================== ---- xen-4.0.0-testing.orig/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in -+++ xen-4.0.0-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in +--- xen-4.0.1-testing.orig/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in ++++ xen-4.0.1-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in @@ -90,7 +90,7 @@ INCLUDE_CFLAGS = -I. -I${srcdir} -I$(src GLOBAL_CFLAGS = ${MT_CFLAGS} ${MH_CFLAGS} #PROFILE_CFLAGS = -pg @@ -11,7 +11,7 @@ # CFLAGS is specifically reserved for setting from the command line # when running make. I.E. "make CFLAGS=-Wmissing-prototypes". -@@ -260,7 +260,7 @@ linux-low.o: linux-low.c $(linux_low_h) +@@ -260,7 +260,7 @@ linux-low.o: linux-low.c $(linux_low_h) $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< @USE_THREAD_DB@ linux-xen-low.o: linux-xen-low.c $(linux_low_h) $(server_h) ++++++ tools-kboot.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -13,10 +13,10 @@ tools/kboot/select-kernel | 59 + 9 files changed, 2111 insertions(+) -Index: xen-4.0.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_32 +Index: xen-4.0.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_32 =================================================================== --- /dev/null -+++ xen-4.0.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_32 ++++ xen-4.0.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_32 @@ -0,0 +1,874 @@ +# +# Automatically generated make config: don't edit @@ -892,10 +892,10 @@ +CONFIG_X86_NO_TSS=y +CONFIG_X86_NO_IDT=y +CONFIG_KTIME_SCALAR=y -Index: xen-4.0.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_64 +Index: xen-4.0.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_64 =================================================================== --- /dev/null -+++ xen-4.0.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_64 ++++ xen-4.0.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_64 @@ -0,0 +1,653 @@ +# +# Automatically generated make config: don't edit @@ -1550,17 +1550,17 @@ +# CONFIG_CRC32 is not set +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y -Index: xen-4.0.0-testing/buildconfigs/mk.linux-2.6-xenUboot +Index: xen-4.0.1-testing/buildconfigs/mk.linux-2.6-xenUboot =================================================================== --- /dev/null -+++ xen-4.0.0-testing/buildconfigs/mk.linux-2.6-xenUboot ++++ xen-4.0.1-testing/buildconfigs/mk.linux-2.6-xenUboot @@ -0,0 +1,2 @@ +EXTRAVERSION = xenUboot +include buildconfigs/mk.linux-2.6-xen -Index: xen-4.0.0-testing/tools/kboot/Makefile +Index: xen-4.0.1-testing/tools/kboot/Makefile =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/kboot/Makefile ++++ xen-4.0.1-testing/tools/kboot/Makefile @@ -0,0 +1,23 @@ +# +# tools/kboot/Makefile @@ -1585,10 +1585,10 @@ +kboot.initramfs: mkinitramfs init select-kernel ../xcutils/xc_kexec + sh ./mkinitramfs | tee $@ + -Index: xen-4.0.0-testing/tools/kboot/README +Index: xen-4.0.1-testing/tools/kboot/README =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/kboot/README ++++ xen-4.0.1-testing/tools/kboot/README @@ -0,0 +1,43 @@ + +This is a simple kexec-based boot loader @@ -1633,10 +1633,10 @@ + +-- +Gerd Hoffmann <kraxel(a)suse.de> -Index: xen-4.0.0-testing/tools/kboot/init +Index: xen-4.0.1-testing/tools/kboot/init =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/kboot/init ++++ xen-4.0.1-testing/tools/kboot/init @@ -0,0 +1,309 @@ +#!/bin/sh + @@ -1947,10 +1947,10 @@ +msg "bye ..." +banner "boot $guestos" +xc_kexec -e -Index: xen-4.0.0-testing/tools/kboot/mkinitramfs +Index: xen-4.0.1-testing/tools/kboot/mkinitramfs =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/kboot/mkinitramfs ++++ xen-4.0.1-testing/tools/kboot/mkinitramfs @@ -0,0 +1,111 @@ +#!/bin/sh + @@ -2063,10 +2063,10 @@ + echo "file $LIB/$(basename $lib) $lib 0755 0 0" +done +echo -Index: xen-4.0.0-testing/tools/kboot/select-kernel +Index: xen-4.0.1-testing/tools/kboot/select-kernel =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/kboot/select-kernel ++++ xen-4.0.1-testing/tools/kboot/select-kernel @@ -0,0 +1,59 @@ +#!/bin/sh + @@ -2127,10 +2127,10 @@ +msg "using $kernelname" +echo "$kernelname" + -Index: xen-4.0.0-testing/make-kboot +Index: xen-4.0.1-testing/make-kboot =================================================================== --- /dev/null -+++ xen-4.0.0-testing/make-kboot ++++ xen-4.0.1-testing/make-kboot @@ -0,0 +1,37 @@ +#!/bin/sh + ++++++ tools-xc_kexec.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -23,10 +23,10 @@ tools/xcutils/xc_kexec.c | 503 +++++++++++++++ 19 files changed, 4988 insertions(+), 2 deletions(-) -Index: xen-4.0.0-testing/tools/xcutils/Makefile +Index: xen-4.0.1-testing/tools/xcutils/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/xcutils/Makefile -+++ xen-4.0.0-testing/tools/xcutils/Makefile +--- xen-4.0.1-testing.orig/tools/xcutils/Makefile ++++ xen-4.0.1-testing/tools/xcutils/Makefile @@ -14,7 +14,7 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) @@ -55,10 +55,10 @@ + make -C helper clean -include $(DEPS) -Index: xen-4.0.0-testing/tools/xcutils/helper/Makefile +Index: xen-4.0.1-testing/tools/xcutils/helper/Makefile =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/Makefile ++++ xen-4.0.1-testing/tools/xcutils/helper/Makefile @@ -0,0 +1,39 @@ + +XEN_ROOT = ../../.. @@ -99,10 +99,10 @@ +# dependencies + +$(XEN_TARGET_ARCH)/entry.o: $(XEN_TARGET_ARCH)/entry.S $(XEN_TARGET_ARCH)/offsets.h -Index: xen-4.0.0-testing/tools/xcutils/helper/console.c +Index: xen-4.0.1-testing/tools/xcutils/helper/console.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/console.c ++++ xen-4.0.1-testing/tools/xcutils/helper/console.c @@ -0,0 +1,69 @@ +#include <inttypes.h> + @@ -173,10 +173,10 @@ + + return printed_len; +} -Index: xen-4.0.0-testing/tools/xcutils/helper/ctype.c +Index: xen-4.0.1-testing/tools/xcutils/helper/ctype.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/ctype.c ++++ xen-4.0.1-testing/tools/xcutils/helper/ctype.c @@ -0,0 +1,35 @@ +/* + * linux/lib/ctype.c @@ -213,10 +213,10 @@ +_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */ + +EXPORT_SYMBOL(_ctype); -Index: xen-4.0.0-testing/tools/xcutils/helper/ctype.h +Index: xen-4.0.1-testing/tools/xcutils/helper/ctype.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/ctype.h ++++ xen-4.0.1-testing/tools/xcutils/helper/ctype.h @@ -0,0 +1,54 @@ +#ifndef _LINUX_CTYPE_H +#define _LINUX_CTYPE_H @@ -272,10 +272,10 @@ +#define toupper(c) __toupper(c) + +#endif -Index: xen-4.0.0-testing/tools/xcutils/helper/helper.h +Index: xen-4.0.1-testing/tools/xcutils/helper/helper.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/helper.h ++++ xen-4.0.1-testing/tools/xcutils/helper/helper.h @@ -0,0 +1,107 @@ +#include <stdarg.h> +#include <stddef.h> @@ -384,10 +384,10 @@ +int sprintf(char * buf, const char *fmt, ...); +int vsscanf(const char * buf, const char * fmt, va_list args); +int sscanf(const char * buf, const char * fmt, ...); -Index: xen-4.0.0-testing/tools/xcutils/helper/main.c +Index: xen-4.0.1-testing/tools/xcutils/helper/main.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/main.c ++++ xen-4.0.1-testing/tools/xcutils/helper/main.c @@ -0,0 +1,651 @@ +#include <xenctrl.h> +#include "hypercall.h" @@ -1040,10 +1040,10 @@ + printk("\r\n"); + start_kernel(); +} -Index: xen-4.0.0-testing/tools/xcutils/helper/make-offsets.c +Index: xen-4.0.1-testing/tools/xcutils/helper/make-offsets.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/make-offsets.c ++++ xen-4.0.1-testing/tools/xcutils/helper/make-offsets.c @@ -0,0 +1,28 @@ +#include <stdio.h> +#include <xenctrl.h> @@ -1073,10 +1073,10 @@ + vcpu_off("cr3", ctrlreg[3]); + return 0; +} -Index: xen-4.0.0-testing/tools/xcutils/helper/printk.c +Index: xen-4.0.1-testing/tools/xcutils/helper/printk.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/printk.c ++++ xen-4.0.1-testing/tools/xcutils/helper/printk.c @@ -0,0 +1,1051 @@ +/* + * linux/kernel/printk.c @@ -2129,10 +2129,10 @@ + printk_ratelimit_burst); +} +EXPORT_SYMBOL(printk_ratelimit); -Index: xen-4.0.0-testing/tools/xcutils/helper/string.c +Index: xen-4.0.1-testing/tools/xcutils/helper/string.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/string.c ++++ xen-4.0.1-testing/tools/xcutils/helper/string.c @@ -0,0 +1,601 @@ +/* + * linux/lib/string.c @@ -2735,10 +2735,10 @@ +} +EXPORT_SYMBOL(memchr); +#endif -Index: xen-4.0.0-testing/tools/xcutils/helper/vsprintf.c +Index: xen-4.0.1-testing/tools/xcutils/helper/vsprintf.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/vsprintf.c ++++ xen-4.0.1-testing/tools/xcutils/helper/vsprintf.c @@ -0,0 +1,842 @@ +/* + * linux/lib/vsprintf.c @@ -3582,10 +3582,10 @@ +} + +EXPORT_SYMBOL(sscanf); -Index: xen-4.0.0-testing/tools/xcutils/helper/x86_32/div64.h +Index: xen-4.0.1-testing/tools/xcutils/helper/x86_32/div64.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/x86_32/div64.h ++++ xen-4.0.1-testing/tools/xcutils/helper/x86_32/div64.h @@ -0,0 +1,48 @@ +#ifndef __I386_DIV64 +#define __I386_DIV64 @@ -3635,10 +3635,10 @@ + +} +#endif -Index: xen-4.0.0-testing/tools/xcutils/helper/x86_32/entry.S +Index: xen-4.0.1-testing/tools/xcutils/helper/x86_32/entry.S =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/x86_32/entry.S ++++ xen-4.0.1-testing/tools/xcutils/helper/x86_32/entry.S @@ -0,0 +1,49 @@ +#include "offsets.h" + @@ -3689,10 +3689,10 @@ + nop + .align 4096 +hypercall_end: -Index: xen-4.0.0-testing/tools/xcutils/helper/x86_32/hypercall.h +Index: xen-4.0.1-testing/tools/xcutils/helper/x86_32/hypercall.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/x86_32/hypercall.h ++++ xen-4.0.1-testing/tools/xcutils/helper/x86_32/hypercall.h @@ -0,0 +1,359 @@ +/****************************************************************************** + * hypercall.h @@ -4053,10 +4053,10 @@ + + +#endif /* __HYPERCALL_H__ */ -Index: xen-4.0.0-testing/tools/xcutils/helper/x86_64/div64.h +Index: xen-4.0.1-testing/tools/xcutils/helper/x86_64/div64.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/x86_64/div64.h ++++ xen-4.0.1-testing/tools/xcutils/helper/x86_64/div64.h @@ -0,0 +1,57 @@ +#ifndef _ASM_GENERIC_DIV64_H +#define _ASM_GENERIC_DIV64_H @@ -4115,10 +4115,10 @@ +#endif /* BITS_PER_LONG */ + +#endif /* _ASM_GENERIC_DIV64_H */ -Index: xen-4.0.0-testing/tools/xcutils/helper/x86_64/entry.S +Index: xen-4.0.1-testing/tools/xcutils/helper/x86_64/entry.S =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/x86_64/entry.S ++++ xen-4.0.1-testing/tools/xcutils/helper/x86_64/entry.S @@ -0,0 +1,50 @@ +#include "offsets.h" + @@ -4170,10 +4170,10 @@ + nop + .align 4096 +hypercall_end: -Index: xen-4.0.0-testing/tools/xcutils/helper/x86_64/hypercall.h +Index: xen-4.0.1-testing/tools/xcutils/helper/x86_64/hypercall.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/helper/x86_64/hypercall.h ++++ xen-4.0.1-testing/tools/xcutils/helper/x86_64/hypercall.h @@ -0,0 +1,354 @@ +/****************************************************************************** + * hypercall.h @@ -4529,10 +4529,10 @@ +} + +#endif /* __HYPERCALL_H__ */ -Index: xen-4.0.0-testing/tools/xcutils/kexec-syscall.h +Index: xen-4.0.1-testing/tools/xcutils/kexec-syscall.h =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/kexec-syscall.h ++++ xen-4.0.1-testing/tools/xcutils/kexec-syscall.h @@ -0,0 +1,80 @@ +#ifndef KEXEC_SYSCALL_H +#define KEXEC_SYSCALL_H @@ -4614,10 +4614,10 @@ +#define KEXEC_MAX_SEGMENTS 16 + +#endif /* KEXEC_SYSCALL_H */ -Index: xen-4.0.0-testing/tools/xcutils/xc_kexec.c +Index: xen-4.0.1-testing/tools/xcutils/xc_kexec.c =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/xcutils/xc_kexec.c ++++ xen-4.0.1-testing/tools/xcutils/xc_kexec.c @@ -0,0 +1,503 @@ +#include <stdio.h> +#include <stdlib.h> ++++++ udev-rules.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,9 +1,17 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/xen-backend.rules +Index: xen-4.0.1-testing/tools/hotplug/Linux/xen-backend.rules =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/xen-backend.rules -+++ xen-4.0.0-testing/tools/hotplug/Linux/xen-backend.rules -@@ -9,3 +9,4 @@ SUBSYSTEM=="xen-backend", ACTION=="remov +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/xen-backend.rules ++++ xen-4.0.1-testing/tools/hotplug/Linux/xen-backend.rules +@@ -7,5 +7,10 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-* + SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="/etc/xen/scripts/vscsi $env{ACTION}" + SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup" KERNEL=="evtchn", NAME="xen/%k" - KERNEL=="blktap[0-9]*", NAME="xen/%k" - KERNEL=="pci_iomul", NAME="xen/%k" +-KERNEL=="blktap[0-9]*", NAME="xen/%k" +-KERNEL=="pci_iomul", NAME="xen/%k" ++SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*", NAME="xen/%k", MODE="0600" ++SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*", NAME="xen/blktap-2/%k", MODE="0600" ++KERNEL=="blktap-control", NAME="xen/blktap-2/control", MODE="0600" ++KERNEL=="gntdev", NAME="xen/%k", MODE="0600" ++KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600" ++KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600" +KERNELS=="xen", KERNEL=="xvd*", SUBSYSTEM=="block", OPTIONS+="last_rule" ++++++ usb-list.patch ++++++ "usb-hc-create" does not check usb-ver parameter. It allows 2/2.0/2.0usb/2.0aaa. While low level driver doing hc create, it gets an integer by vssanf %d from usb-ver string, so there is no problem. But 2/2.0/2.0usb/2.0aaa will be saved into VM config. After that, while doing "usb-list", it cannot handle "2.0/2.0usb/2.0aaa" and will cause error: Idx BE state usb-ver BE-path Error: Invalid argument. Usage: xm usb-list <Domain> This patch is to let "usb-list" handle all usb-ver cases as low level driver does and won't cause error. About this problem, I've submitted two patches to upstream before, but got no response. Information could be referred to: http://www.gossamer-threads.com/lists/xen/devel/178406?search_string=usb-li… http://www.gossamer-threads.com/lists/xen/devel/181021?search_string=usb-li… Index: xen-4.0.1-testing/tools/python/xen/xm/main.py =================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py +++ xen-4.0.1-testing/tools/python/xen/xm/main.py @@ -2545,10 +2545,22 @@ def xm_usb_list(args): ni = parse_dev_info(x[1]) ni['idx'] = int(x[0]) usbver = sxp.child_value(x[1], 'usb-ver') + + substr = re.search("^\d{1,}", usbver) + if substr: + usbver = substr.group() + else: + print "Unknown usb-ver" + continue + if int(usbver) == 1: ni['usb-ver'] = 'USB1.1' - else: + elif int(usbver) == 2: ni['usb-ver'] = 'USB2.0' + else: + print "Unknown usb-ver" + continue + print "%(idx)-3d %(backend-id)-3d %(state)-5d %(usb-ver)-7s %(be-path)-30s " % ni ports = sxp.child(x[1], 'port') ++++++ vif-bridge-no-iptables.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/vif-bridge +Index: xen-4.0.1-testing/tools/hotplug/Linux/vif-bridge =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/vif-bridge -+++ xen-4.0.0-testing/tools/hotplug/Linux/vif-bridge +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/vif-bridge ++++ xen-4.0.1-testing/tools/hotplug/Linux/vif-bridge @@ -91,7 +91,7 @@ case "$command" in ;; esac ++++++ vif-route-ifup.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/vif-route-ifup +Index: xen-4.0.1-testing/tools/hotplug/Linux/vif-route-ifup =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/hotplug/Linux/vif-route-ifup ++++ xen-4.0.1-testing/tools/hotplug/Linux/vif-route-ifup @@ -0,0 +1,34 @@ +#!/bin/bash +#============================================================================ @@ -37,10 +37,10 @@ +then + success +fi -Index: xen-4.0.0-testing/tools/examples/xend-config.sxp +Index: xen-4.0.1-testing/tools/examples/xend-config.sxp =================================================================== ---- xen-4.0.0-testing.orig/tools/examples/xend-config.sxp -+++ xen-4.0.0-testing/tools/examples/xend-config.sxp +--- xen-4.0.1-testing.orig/tools/examples/xend-config.sxp ++++ xen-4.0.1-testing/tools/examples/xend-config.sxp @@ -184,6 +184,26 @@ #(network-script network-route) #(vif-script vif-route) @@ -68,10 +68,10 @@ ## Use the following if network traffic is routed with NAT, as an alternative # to the settings for bridged networking given above. -Index: xen-4.0.0-testing/tools/hotplug/Linux/Makefile +Index: xen-4.0.1-testing/tools/hotplug/Linux/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/Makefile -+++ xen-4.0.0-testing/tools/hotplug/Linux/Makefile +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/Makefile ++++ xen-4.0.1-testing/tools/hotplug/Linux/Makefile @@ -9,7 +9,7 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig. # Xen script dir and scripts to go there. ++++++ x86-cpufreq-report.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/xen/arch/x86/platform_hypercall.c +Index: xen-4.0.1-testing/xen/arch/x86/platform_hypercall.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/platform_hypercall.c -+++ xen-4.0.0-testing/xen/arch/x86/platform_hypercall.c +--- xen-4.0.1-testing.orig/xen/arch/x86/platform_hypercall.c ++++ xen-4.0.1-testing/xen/arch/x86/platform_hypercall.c @@ -22,7 +22,7 @@ #include <xen/sched-if.h> #include <asm/current.h> @@ -19,7 +19,7 @@ struct xen_platform_op curop, *op = &curop; if ( !IS_PRIV(current->domain) ) -@@ -484,6 +485,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe +@@ -487,6 +488,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe op->u.mem_add.epfn, op->u.mem_add.pxm); break; @@ -44,10 +44,10 @@ default: ret = -ENOSYS; break; -Index: xen-4.0.0-testing/xen/include/public/platform.h +Index: xen-4.0.1-testing/xen/include/public/platform.h =================================================================== ---- xen-4.0.0-testing.orig/xen/include/public/platform.h -+++ xen-4.0.0-testing/xen/include/public/platform.h +--- xen-4.0.1-testing.orig/xen/include/public/platform.h ++++ xen-4.0.1-testing/xen/include/public/platform.h @@ -355,6 +355,14 @@ struct xenpf_mem_hotadd uint32_t flags; }; ++++++ x86-extra-trap-info.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,5 +1,7 @@ ---- 2010-01-06.orig/xen/arch/x86/x86_32/entry.S 2009-12-02 10:02:49.000000000 +0100 -+++ 2010-01-06/xen/arch/x86/x86_32/entry.S 2010-01-06 11:23:45.000000000 +0100 +Index: xen-4.0.1-testing/xen/arch/x86/x86_32/entry.S +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/x86_32/entry.S ++++ xen-4.0.1-testing/xen/arch/x86/x86_32/entry.S @@ -403,21 +403,33 @@ ring1: /* obtain ss/esp from oldss/olde movl %eax,UREGS_eip+4(%esp) ret @@ -44,8 +46,10 @@ domain_crash_synchronous: pushl $domain_crash_synchronous_string call printk ---- 2010-01-06.orig/xen/arch/x86/x86_64/entry.S 2009-12-02 10:02:49.000000000 +0100 -+++ 2010-01-06/xen/arch/x86/x86_64/entry.S 2010-01-06 11:23:45.000000000 +0100 +Index: xen-4.0.1-testing/xen/arch/x86/x86_64/entry.S +=================================================================== +--- xen-4.0.1-testing.orig/xen/arch/x86/x86_64/entry.S ++++ xen-4.0.1-testing/xen/arch/x86/x86_64/entry.S @@ -421,17 +421,30 @@ create_bounce_frame: movq %rax,UREGS_rip+8(%rsp) ret ++++++ x86-ioapic-ack-default.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,10 +1,10 @@ Change default IO-APIC ack mode for single IO-APIC systems to old-style. -Index: xen-4.0.0-testing/xen/arch/x86/io_apic.c +Index: xen-4.0.1-testing/xen/arch/x86/io_apic.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/io_apic.c -+++ xen-4.0.0-testing/xen/arch/x86/io_apic.c -@@ -1442,7 +1442,7 @@ static unsigned int startup_level_ioapic +--- xen-4.0.1-testing.orig/xen/arch/x86/io_apic.c ++++ xen-4.0.1-testing/xen/arch/x86/io_apic.c +@@ -1562,7 +1562,7 @@ static unsigned int startup_level_ioapic return 0; /* don't check for pending */ } @@ -13,7 +13,7 @@ static void setup_ioapic_ack(char *s) { if ( !strcmp(s, "old") ) -@@ -1946,6 +1946,8 @@ void __init setup_IO_APIC(void) +@@ -2066,6 +2066,8 @@ void __init setup_IO_APIC(void) else io_apic_irqs = ~PIC_IRQS; ++++++ x86-show-page-walk-early.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:25.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:25.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/xen/arch/x86/mm.c +Index: xen-4.0.1-testing/xen/arch/x86/mm.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/mm.c -+++ xen-4.0.0-testing/xen/arch/x86/mm.c +--- xen-4.0.1-testing.orig/xen/arch/x86/mm.c ++++ xen-4.0.1-testing/xen/arch/x86/mm.c @@ -154,6 +154,8 @@ unsigned long __read_mostly pdx_group_va int opt_allow_hugepage; boolean_param("allowhugepage", opt_allow_hugepage); @@ -11,11 +11,11 @@ #define l1_disallow_mask(d) \ ((d != dom_io) && \ (rangeset_is_empty((d)->iomem_caps) && \ -Index: xen-4.0.0-testing/xen/arch/x86/traps.c +Index: xen-4.0.1-testing/xen/arch/x86/traps.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/traps.c -+++ xen-4.0.0-testing/xen/arch/x86/traps.c -@@ -1352,6 +1352,7 @@ asmlinkage void do_early_page_fault(stru +--- xen-4.0.1-testing.orig/xen/arch/x86/traps.c ++++ xen-4.0.1-testing/xen/arch/x86/traps.c +@@ -1336,6 +1336,7 @@ asmlinkage void do_early_page_fault(stru unsigned long *stk = (unsigned long *)regs; printk("Early fatal page fault at %04x:%p (cr2=%p, ec=%04x)\n", regs->cs, _p(regs->eip), _p(cr2), regs->error_code); @@ -23,10 +23,10 @@ printk("Stack dump: "); while ( ((long)stk & ((PAGE_SIZE - 1) & ~(BYTES_PER_LONG - 1))) != 0 ) printk("%p ", _p(*stk++)); -Index: xen-4.0.0-testing/xen/arch/x86/x86_32/mm.c +Index: xen-4.0.1-testing/xen/arch/x86/x86_32/mm.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/x86_32/mm.c -+++ xen-4.0.0-testing/xen/arch/x86/x86_32/mm.c +--- xen-4.0.1-testing.orig/xen/arch/x86/x86_32/mm.c ++++ xen-4.0.1-testing/xen/arch/x86/x86_32/mm.c @@ -122,6 +122,8 @@ void __init paging_init(void) #undef CNT #undef MFN @@ -36,10 +36,10 @@ /* Create page tables for ioremap()/map_domain_page_global(). */ for ( i = 0; i < (IOREMAP_MBYTES >> (L2_PAGETABLE_SHIFT - 20)); i++ ) { -Index: xen-4.0.0-testing/xen/arch/x86/x86_32/traps.c +Index: xen-4.0.1-testing/xen/arch/x86/x86_32/traps.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/x86_32/traps.c -+++ xen-4.0.0-testing/xen/arch/x86/x86_32/traps.c +--- xen-4.0.1-testing.orig/xen/arch/x86/x86_32/traps.c ++++ xen-4.0.1-testing/xen/arch/x86/x86_32/traps.c @@ -161,7 +161,8 @@ void show_page_walk(unsigned long addr) l3t += (cr3 & 0xFE0UL) >> 3; l3e = l3t[l3_table_offset(addr)]; @@ -70,10 +70,10 @@ printk(" L1[0x%03lx] = %"PRIpte" %08lx\n", l1_table_offset(addr), l1e_get_intpte(l1e), pfn); unmap_domain_page(l1t); -Index: xen-4.0.0-testing/xen/arch/x86/x86_64/mm.c +Index: xen-4.0.1-testing/xen/arch/x86/x86_64/mm.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/x86_64/mm.c -+++ xen-4.0.0-testing/xen/arch/x86/x86_64/mm.c +--- xen-4.0.1-testing.orig/xen/arch/x86/x86_64/mm.c ++++ xen-4.0.1-testing/xen/arch/x86/x86_64/mm.c @@ -725,6 +725,8 @@ void __init paging_init(void) #undef CNT #undef MFN @@ -83,10 +83,10 @@ /* Create user-accessible L2 directory to map the MPT for compat guests. */ BUILD_BUG_ON(l4_table_offset(RDWR_MPT_VIRT_START) != l4_table_offset(HIRO_COMPAT_MPT_VIRT_START)); -Index: xen-4.0.0-testing/xen/arch/x86/x86_64/traps.c +Index: xen-4.0.1-testing/xen/arch/x86/x86_64/traps.c =================================================================== ---- xen-4.0.0-testing.orig/xen/arch/x86/x86_64/traps.c -+++ xen-4.0.0-testing/xen/arch/x86/x86_64/traps.c +--- xen-4.0.1-testing.orig/xen/arch/x86/x86_64/traps.c ++++ xen-4.0.1-testing/xen/arch/x86/x86_64/traps.c @@ -176,7 +176,8 @@ void show_page_walk(unsigned long addr) l4t = mfn_to_virt(mfn); l4e = l4t[l4_table_offset(addr)]; @@ -127,10 +127,10 @@ printk(" L1[0x%03lx] = %"PRIpte" %016lx\n", l1_table_offset(addr), l1e_get_intpte(l1e), pfn); } -Index: xen-4.0.0-testing/xen/include/asm-x86/mm.h +Index: xen-4.0.1-testing/xen/include/asm-x86/mm.h =================================================================== ---- xen-4.0.0-testing.orig/xen/include/asm-x86/mm.h -+++ xen-4.0.0-testing/xen/include/asm-x86/mm.h +--- xen-4.0.1-testing.orig/xen/include/asm-x86/mm.h ++++ xen-4.0.1-testing/xen/include/asm-x86/mm.h @@ -443,6 +443,8 @@ TYPE_SAFE(unsigned long,mfn); #define SHARED_M2P_ENTRY (~0UL - 1UL) #define SHARED_M2P(_e) ((_e) == SHARED_M2P_ENTRY) ++++++ xen-4.0.0-testing-src.tar.bz2 -> xen-4.0.1-testing-src.tar.bz2 ++++++ xen/xen-4.0.0-testing-src.tar.bz2 /mounts/work_src_done/STABLE/xen/xen-4.0.1-testing-src.tar.bz2 differ: char 11, line 1 ++++++ xen-api-auth.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/XendAuthSessions.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendAuthSessions.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendAuthSessions.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendAuthSessions.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAuthSessions.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendAuthSessions.py @@ -84,7 +84,7 @@ class XendAuthSessions: # if PAM doesn't exist, let's ignore it return False ++++++ xen-changeset.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/xen/Makefile +Index: xen-4.0.1-testing/xen/Makefile =================================================================== ---- xen-4.0.0-testing.orig/xen/Makefile -+++ xen-4.0.0-testing/xen/Makefile +--- xen-4.0.1-testing.orig/xen/Makefile ++++ xen-4.0.1-testing/xen/Makefile @@ -1,3 +1,4 @@ +export XEN_CHANGESET = unavailable # This is the correct place to edit the build version. ++++++ xen-config.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,17 +1,8 @@ -Index: xen-4.0.0-testing/Config.mk +Index: xen-4.0.1-testing/Config.mk =================================================================== ---- xen-4.0.0-testing.orig/Config.mk -+++ xen-4.0.0-testing/Config.mk -@@ -151,7 +151,7 @@ QEMU_REMOTE=http://xenbits.xensource.com - # Specify which qemu-dm to use. This may be `ioemu' to use the old - # Mercurial in-tree version, or a local directory, or a git URL. - # CONFIG_QEMU ?= ../qemu-xen.git --CONFIG_QEMU ?= $(QEMU_REMOTE) -+CONFIG_QEMU ?= ioemu-remote - - QEMU_TAG := xen-4.0.0 - #QEMU_TAG ?= f1d909f0f854194f5a40d850886d1413fb8b63c2 -@@ -167,9 +167,9 @@ CONFIG_OCAML_XENSTORED ?= n +--- xen-4.0.1-testing.orig/Config.mk ++++ xen-4.0.1-testing/Config.mk +@@ -182,9 +182,9 @@ CONFIG_OCAML_XENSTORED ?= n # Optional components XENSTAT_XENTOP ?= y VTPM_TOOLS ?= n @@ -23,10 +14,10 @@ --include $(XEN_ROOT)/.config +#-include $(XEN_ROOT)/.config -Index: xen-4.0.0-testing/tools/libxc/Makefile +Index: xen-4.0.1-testing/tools/libxc/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/libxc/Makefile -+++ xen-4.0.0-testing/tools/libxc/Makefile +--- xen-4.0.1-testing.orig/tools/libxc/Makefile ++++ xen-4.0.1-testing/tools/libxc/Makefile @@ -169,10 +169,10 @@ zlib-options = $(shell \ fi) | grep $(1)) endif ++++++ xen-destdir.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/docs/Makefile +Index: xen-4.0.1-testing/docs/Makefile =================================================================== ---- xen-4.0.0-testing.orig/docs/Makefile -+++ xen-4.0.0-testing/docs/Makefile +--- xen-4.0.1-testing.orig/docs/Makefile ++++ xen-4.0.1-testing/docs/Makefile @@ -90,7 +90,8 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(MANDIR) cp -dR man1 $(DESTDIR)$(MANDIR) @@ -22,10 +22,10 @@ + ln -sf $*.html html.done/$*/index.html + rm -rf html/ + -Index: xen-4.0.0-testing/tools/security/Makefile +Index: xen-4.0.1-testing/tools/security/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/security/Makefile -+++ xen-4.0.0-testing/tools/security/Makefile +--- xen-4.0.1-testing.orig/tools/security/Makefile ++++ xen-4.0.1-testing/tools/security/Makefile @@ -60,8 +60,8 @@ install: all $(ACM_CONFIG_FILE) $(INSTALL_DATA) $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR) $(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR) @@ -37,10 +37,10 @@ else .PHONY: all all: -Index: xen-4.0.0-testing/tools/pygrub/Makefile +Index: xen-4.0.1-testing/tools/pygrub/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/pygrub/Makefile -+++ xen-4.0.0-testing/tools/pygrub/Makefile +--- xen-4.0.1-testing.orig/tools/pygrub/Makefile ++++ xen-4.0.1-testing/tools/pygrub/Makefile @@ -11,7 +11,7 @@ build: .PHONY: install install: all @@ -50,10 +50,10 @@ $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(BINDIR)/pygrub $(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot -Index: xen-4.0.0-testing/tools/python/Makefile +Index: xen-4.0.1-testing/tools/python/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/python/Makefile -+++ xen-4.0.0-testing/tools/python/Makefile +--- xen-4.0.1-testing.orig/tools/python/Makefile ++++ xen-4.0.1-testing/tools/python/Makefile @@ -60,7 +60,7 @@ refresh-po: $(POTFILE) .PHONY: install install: install-messages install-dtd @@ -63,10 +63,10 @@ install-dtd: all $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/xen -Index: xen-4.0.0-testing/tools/xenstore/Makefile +Index: xen-4.0.1-testing/tools/xenstore/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/xenstore/Makefile -+++ xen-4.0.0-testing/tools/xenstore/Makefile +--- xen-4.0.1-testing.orig/tools/xenstore/Makefile ++++ xen-4.0.1-testing/tools/xenstore/Makefile @@ -10,6 +10,7 @@ CFLAGS += $(CFLAGS_libxenctrl) CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod @@ -121,10 +121,10 @@ $(INSTALL_DIR) $(DESTDIR)$(LIBDIR) $(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR) -Index: xen-4.0.0-testing/tools/hotplug/Linux/Makefile +Index: xen-4.0.1-testing/tools/hotplug/Linux/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/Makefile -+++ xen-4.0.0-testing/tools/hotplug/Linux/Makefile +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/Makefile ++++ xen-4.0.1-testing/tools/hotplug/Linux/Makefile @@ -38,18 +38,6 @@ endif UDEV_RULES_DIR = $(CONFIG_DIR)/udev UDEV_RULES = xen-backend.rules xend.rules ++++++ xen-disable-libxl.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/Makefile +Index: xen-4.0.1-testing/tools/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/Makefile -+++ xen-4.0.0-testing/tools/Makefile +--- xen-4.0.1-testing.orig/tools/Makefile ++++ xen-4.0.1-testing/tools/Makefile @@ -33,7 +33,7 @@ SUBDIRS-$(CONFIG_Linux) += fs-back SUBDIRS-$(CONFIG_NetBSD) += fs-back SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir @@ -10,4 +10,4 @@ +#SUBDIRS-y += libxl SUBDIRS-y += remus SUBDIRS-$(CONFIG_X86) += xenpaging - + SUBDIRS-$(CONFIG_X86) += debugger/gdbsx ++++++ xen-disable-qemu-monitor.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -5,10 +5,10 @@ commands that can read/write dom0's state. -Index: xen-4.0.0-testing/tools/ioemu-remote/monitor.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/monitor.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/monitor.c -+++ xen-4.0.0-testing/tools/ioemu-remote/monitor.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/monitor.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/monitor.c @@ -1497,6 +1497,7 @@ static const term_cmd_t term_cmds[] = { "device|all", "commit changes to the disk images (if -snapshot is used) or backing files" }, { "info", "s?", do_info, ++++++ xen-disable-xenpaging.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,13 +1,13 @@ -Index: xen-4.0.0-testing/tools/Makefile +Index: xen-4.0.1-testing/tools/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/Makefile -+++ xen-4.0.0-testing/tools/Makefile +--- xen-4.0.1-testing.orig/tools/Makefile ++++ xen-4.0.1-testing/tools/Makefile @@ -35,7 +35,7 @@ SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir SUBDIRS-y += xenpmd #SUBDIRS-y += libxl SUBDIRS-y += remus -SUBDIRS-$(CONFIG_X86) += xenpaging +#SUBDIRS-$(CONFIG_X86) += xenpaging + SUBDIRS-$(CONFIG_X86) += debugger/gdbsx # These don't cross-compile - ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH)) ++++++ xen-domUloader.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/util/blkif.py +Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/util/blkif.py -+++ xen-4.0.0-testing/tools/python/xen/util/blkif.py +--- xen-4.0.1-testing.orig/tools/python/xen/util/blkif.py ++++ xen-4.0.1-testing/tools/python/xen/util/blkif.py @@ -71,8 +71,8 @@ def blkdev_segment(name): 'type' : 'Disk' } return val @@ -35,10 +35,10 @@ def mount_mode(name): mode = None -Index: xen-4.0.0-testing/tools/python/xen/xend/server/DevController.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/DevController.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/DevController.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/DevController.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py @@ -592,6 +592,31 @@ class DevController: return (Missing, None) @@ -71,10 +71,10 @@ def backendPath(self, backdom, devid): """Construct backend path given the backend domain and device id. -Index: xen-4.0.0-testing/tools/python/xen/xend/XendBootloader.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendBootloader.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendBootloader.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendBootloader.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendBootloader.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendBootloader.py @@ -12,7 +12,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # @@ -101,21 +101,21 @@ + raise VmError(msg) + + avail = False -+ for i in xrange(1, 20): ++ for i in xrange(1, 100): + avail = os.access(disk, os.R_OK) + if avail: + break -+ time.sleep(.05) ++ time.sleep(.1) + + if not avail: + msg = "Disk '%s' isn't accessible" % disk log.error(msg) raise VmError(msg) -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -37,7 +37,7 @@ from types import StringTypes import xen.lowlevel.xc ++++++ xen-extra-fixes.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/block-vvfat.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/block-vvfat.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/block-vvfat.c -+++ xen-4.0.0-testing/tools/ioemu-remote/block-vvfat.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/block-vvfat.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/block-vvfat.c @@ -865,7 +865,8 @@ static int init_directories(BDRVVVFATSta { direntry_t* entry=array_get_next(&(s->directory)); ++++++ xen-fixme-doc.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5 +Index: xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5 =================================================================== ---- xen-4.0.0-testing.orig/docs/man/xmdomain.cfg.pod.5 -+++ xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5 +--- xen-4.0.1-testing.orig/docs/man/xmdomain.cfg.pod.5 ++++ xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5 @@ -335,16 +335,10 @@ at hda1, which is the root filesystem. =item I<NFS Root> @@ -19,10 +19,10 @@ =back =head1 SEE ALSO -Index: xen-4.0.0-testing/docs/man/xm.pod.1 +Index: xen-4.0.1-testing/docs/man/xm.pod.1 =================================================================== ---- xen-4.0.0-testing.orig/docs/man/xm.pod.1 -+++ xen-4.0.0-testing/docs/man/xm.pod.1 +--- xen-4.0.1-testing.orig/docs/man/xm.pod.1 ++++ xen-4.0.1-testing/docs/man/xm.pod.1 @@ -297,7 +297,8 @@ scheduling by the Xen hypervisor. =item B<s - shutdown> ++++++ xen-hvm-default-bridge.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/net.h +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/net.h =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/net.h -+++ xen-4.0.0-testing/tools/ioemu-remote/net.h +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/net.h ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/net.h @@ -107,8 +107,8 @@ void net_host_device_add(const char *dev void net_host_device_remove(int vlan_id, const char *device); @@ -13,10 +13,10 @@ #endif #ifdef __sun__ #define SMBD_COMMAND "/usr/sfw/sbin/smbd" -Index: xen-4.0.0-testing/tools/ioemu-remote/net.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/net.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/net.c -+++ xen-4.0.0-testing/tools/ioemu-remote/net.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/net.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/net.c @@ -1759,9 +1759,10 @@ int net_client_init(const char *device, } if (get_param_value(script_arg, sizeof(script_arg), "scriptarg", p) == 0 && @@ -30,10 +30,10 @@ } } else #endif -Index: xen-4.0.0-testing/tools/python/xen/xend/image.py +Index: xen-4.0.1-testing/tools/python/xen/xend/image.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/image.py -+++ xen-4.0.0-testing/tools/python/xen/xend/image.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py ++++ xen-4.0.1-testing/tools/python/xen/xend/image.py @@ -912,11 +912,13 @@ class HVMImageHandler(ImageHandler): mac = devinfo.get('mac') if mac is None: @@ -51,10 +51,10 @@ vifname = devinfo.get('vifname') if vifname: vifname = "tap-" + vifname -Index: xen-4.0.0-testing/tools/ioemu-remote/i386-dm/qemu-ifup-Linux +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/i386-dm/qemu-ifup-Linux -+++ xen-4.0.0-testing/tools/ioemu-remote/i386-dm/qemu-ifup-Linux +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux @@ -1,36 +1,22 @@ #!/bin/sh ++++++ xen-hvm-default-pae.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,9 +1,9 @@ PAE must be on for 64-on-64 to work at all. -Index: xen-4.0.0-testing/tools/python/xen/xend/image.py +Index: xen-4.0.1-testing/tools/python/xen/xend/image.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/image.py -+++ xen-4.0.0-testing/tools/python/xen/xend/image.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py ++++ xen-4.0.1-testing/tools/python/xen/xend/image.py @@ -1030,7 +1030,7 @@ class X86_HVM_ImageHandler(HVMImageHandl def configure(self, vmConfig): ++++++ xen-ioemu-hvm-pv-support.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/ioemu-remote/hw/xen_platform.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_platform.c =================================================================== ---- xen-4.0.0-testing.orig/tools/ioemu-remote/hw/xen_platform.c -+++ xen-4.0.0-testing/tools/ioemu-remote/hw/xen_platform.c +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_platform.c @@ -30,6 +30,8 @@ #include "qemu-xen.h" #include "net.h" ++++++ xen-max-free-mem.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/XendNode.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendNode.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendNode.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendNode.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendNode.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendNode.py @@ -916,15 +916,39 @@ class XendNode: info['cpu_mhz'] = info['cpu_khz'] / 1000 @@ -57,10 +57,10 @@ 'node_to_cpu', 'node_to_memory', 'node_to_dma32_mem', -Index: xen-4.0.0-testing/tools/python/xen/xend/balloon.py +Index: xen-4.0.1-testing/tools/python/xen/xend/balloon.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/balloon.py -+++ xen-4.0.0-testing/tools/python/xen/xend/balloon.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/balloon.py ++++ xen-4.0.1-testing/tools/python/xen/xend/balloon.py @@ -43,6 +43,8 @@ SLEEP_TIME_GROWTH = 0.1 # label actually shown in the PROC_XEN_BALLOON file. #labels = { 'current' : 'Current allocation', @@ -94,10 +94,10 @@ def free(need_mem, dominfo): """Balloon out memory from the privileged domain so that there is the specified required amount (in KiB) free. -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -1473,6 +1473,27 @@ class XendDomainInfo: pci_conf = self.info['devices'][dev_uuid][1] return map(pci_dict_to_bdf_str, pci_conf['devs']) @@ -126,10 +126,10 @@ def setMemoryTarget(self, target): """Set the memory target of this domain. @param target: In MiB. -Index: xen-4.0.0-testing/tools/python/xen/xend/server/SrvDomain.py +Index: xen-4.0.1-testing/tools/python/xen/xend/server/SrvDomain.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py -+++ xen-4.0.0-testing/tools/python/xen/xend/server/SrvDomain.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py ++++ xen-4.0.1-testing/tools/python/xen/xend/server/SrvDomain.py @@ -173,7 +173,7 @@ class SrvDomain(SrvDir): ++++++ xen-no-dummy-nfs-ip.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,8 +1,8 @@ -Index: xen-4.0.0-testing/tools/python/xen/xm/create.py +Index: xen-4.0.1-testing/tools/python/xen/xm/create.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/create.py -+++ xen-4.0.0-testing/tools/python/xen/xm/create.py -@@ -1321,9 +1321,8 @@ def preprocess_access_control(vals): +--- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py ++++ xen-4.0.1-testing/tools/python/xen/xm/create.py +@@ -1331,9 +1331,8 @@ def preprocess_access_control(vals): def preprocess_ip(vals): if vals.ip or vals.dhcp != 'off': ++++++ xen-paths.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xm/create.py +Index: xen-4.0.1-testing/tools/python/xen/xm/create.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/create.py -+++ xen-4.0.0-testing/tools/python/xen/xm/create.py +--- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py ++++ xen-4.0.1-testing/tools/python/xen/xm/create.py @@ -73,7 +73,7 @@ gopts.opt('quiet', short='q', use="Quiet.") @@ -11,10 +11,10 @@ use="Search path for configuration scripts. " "The value of PATH is a colon-separated directory list.") -Index: xen-4.0.0-testing/docs/man/xm.pod.1 +Index: xen-4.0.1-testing/docs/man/xm.pod.1 =================================================================== ---- xen-4.0.0-testing.orig/docs/man/xm.pod.1 -+++ xen-4.0.0-testing/docs/man/xm.pod.1 +--- xen-4.0.1-testing.orig/docs/man/xm.pod.1 ++++ xen-4.0.1-testing/docs/man/xm.pod.1 @@ -77,7 +77,7 @@ in the config file. See L<xmdomain.cfg> format, and possible options used in either the configfile or for I<vars>. @@ -33,10 +33,10 @@ soon as it is run. =item I<without config file> -Index: xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5 +Index: xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5 =================================================================== ---- xen-4.0.0-testing.orig/docs/man/xmdomain.cfg.pod.5 -+++ xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5 +--- xen-4.0.1-testing.orig/docs/man/xmdomain.cfg.pod.5 ++++ xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5 @@ -4,9 +4,9 @@ xmdomain.cfg - xm domain config file for =head1 SYNOPSIS ++++++ xen-qemu-iscsi-fix.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,5 +1,7 @@ ---- a/tools/ioemu-remote/xenstore.c -+++ b/tools/ioemu-remote/xenstore.c +Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c +=================================================================== +--- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c ++++ xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c @@ -399,7 +399,7 @@ void xenstore_parse_domain_config(int hv char *buf = NULL; char *fpath = NULL, *bpath = NULL, *btype = NULL, @@ -9,7 +11,7 @@ unsigned int len, num, hd_index, pci_devid = 0; BlockDriverState *bs; BlockDriver *format; -@@ -486,12 +486,7 @@ void xenstore_parse_domain_config(int hv +@@ -491,12 +491,7 @@ void xenstore_parse_domain_config(int hv continue; free(danger_type); danger_type = xs_read(xsh, XBT_NULL, danger_buf, &len); @@ -23,7 +25,7 @@ /* read the name of the device */ if (pasprintf(&buf, "%s/type", bpath) == -1) continue; -@@ -499,6 +494,35 @@ void xenstore_parse_domain_config(int hv +@@ -504,6 +499,35 @@ void xenstore_parse_domain_config(int hv drv = xs_read(xsh, XBT_NULL, buf, &len); if (drv == NULL) continue; ++++++ xen-rpmoptflags.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/blktap/drivers/Makefile +Index: xen-4.0.1-testing/tools/blktap/drivers/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/blktap/drivers/Makefile -+++ xen-4.0.0-testing/tools/blktap/drivers/Makefile +--- xen-4.0.1-testing.orig/tools/blktap/drivers/Makefile ++++ xen-4.0.1-testing/tools/blktap/drivers/Makefile @@ -6,7 +6,6 @@ QCOW_UTIL = img2qcow qcow2raw qcow-cr LIBAIO_DIR = ../../libaio/src MEMSHR_DIR = ../../memshr @@ -10,10 +10,10 @@ CFLAGS += -Wno-unused CFLAGS += -I../lib CFLAGS += $(CFLAGS_libxenctrl) -Index: xen-4.0.0-testing/Config.mk +Index: xen-4.0.1-testing/Config.mk =================================================================== ---- xen-4.0.0-testing.orig/Config.mk -+++ xen-4.0.0-testing/Config.mk +--- xen-4.0.1-testing.orig/Config.mk ++++ xen-4.0.1-testing/Config.mk @@ -14,7 +14,7 @@ SHELL ?= /bin/sh # Tools to run on system hosting the build ++++++ xen-warnings.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/misc/miniterm/miniterm.c +Index: xen-4.0.1-testing/tools/misc/miniterm/miniterm.c =================================================================== ---- xen-4.0.0-testing.orig/tools/misc/miniterm/miniterm.c -+++ xen-4.0.0-testing/tools/misc/miniterm/miniterm.c +--- xen-4.0.1-testing.orig/tools/misc/miniterm/miniterm.c ++++ xen-4.0.1-testing/tools/misc/miniterm/miniterm.c @@ -157,7 +157,7 @@ int main(int argc, char **argv) case 0: close(1); /* stdout not needed */ @@ -35,10 +35,10 @@ break; } -Index: xen-4.0.0-testing/tools/libxc/xc_dom_elfloader.c +Index: xen-4.0.1-testing/tools/libxc/xc_dom_elfloader.c =================================================================== ---- xen-4.0.0-testing.orig/tools/libxc/xc_dom_elfloader.c -+++ xen-4.0.0-testing/tools/libxc/xc_dom_elfloader.c +--- xen-4.0.1-testing.orig/tools/libxc/xc_dom_elfloader.c ++++ xen-4.0.1-testing/tools/libxc/xc_dom_elfloader.c @@ -193,8 +193,9 @@ static int xc_dom_load_elf_symtab(struct if ( load ) @@ -50,10 +50,10 @@ elf_section_start(elf, shdr2), size); } -Index: xen-4.0.0-testing/tools/xenstore/Makefile +Index: xen-4.0.1-testing/tools/xenstore/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/xenstore/Makefile -+++ xen-4.0.0-testing/tools/xenstore/Makefile +--- xen-4.0.1-testing.orig/tools/xenstore/Makefile ++++ xen-4.0.1-testing/tools/xenstore/Makefile @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk MAJOR = 3.0 MINOR = 0 @@ -63,10 +63,10 @@ CFLAGS += -I. CFLAGS += $(CFLAGS_libxenctrl) -Index: xen-4.0.0-testing/tools/xenstore/xenstored_core.c +Index: xen-4.0.1-testing/tools/xenstore/xenstored_core.c =================================================================== ---- xen-4.0.0-testing.orig/tools/xenstore/xenstored_core.c -+++ xen-4.0.0-testing/tools/xenstore/xenstored_core.c +--- xen-4.0.1-testing.orig/tools/xenstore/xenstored_core.c ++++ xen-4.0.1-testing/tools/xenstore/xenstored_core.c @@ -77,8 +77,8 @@ static void check_store(void); int quota_nb_entry_per_domain = 1000; @@ -91,10 +91,10 @@ break; case 'T': tracefile = optarg; -Index: xen-4.0.0-testing/tools/xenstore/xenstored_domain.c +Index: xen-4.0.1-testing/tools/xenstore/xenstored_domain.c =================================================================== ---- xen-4.0.0-testing.orig/tools/xenstore/xenstored_domain.c -+++ xen-4.0.0-testing/tools/xenstore/xenstored_domain.c +--- xen-4.0.1-testing.orig/tools/xenstore/xenstored_domain.c ++++ xen-4.0.1-testing/tools/xenstore/xenstored_domain.c @@ -212,7 +212,7 @@ void handle_event(void) { evtchn_port_t port; @@ -113,10 +113,10 @@ return -1; dom0 = new_domain(NULL, 0, port); -Index: xen-4.0.0-testing/tools/xenstore/xenstored_transaction.c +Index: xen-4.0.1-testing/tools/xenstore/xenstored_transaction.c =================================================================== ---- xen-4.0.0-testing.orig/tools/xenstore/xenstored_transaction.c -+++ xen-4.0.0-testing/tools/xenstore/xenstored_transaction.c +--- xen-4.0.1-testing.orig/tools/xenstore/xenstored_transaction.c ++++ xen-4.0.1-testing/tools/xenstore/xenstored_transaction.c @@ -82,7 +82,7 @@ struct transaction struct list_head changed_domains; }; @@ -126,10 +126,10 @@ static unsigned int generation; /* Return tdb context to use for this connection. */ -Index: xen-4.0.0-testing/tools/xenstore/xenstore_client.c +Index: xen-4.0.1-testing/tools/xenstore/xenstore_client.c =================================================================== ---- xen-4.0.0-testing.orig/tools/xenstore/xenstore_client.c -+++ xen-4.0.0-testing/tools/xenstore/xenstore_client.c +--- xen-4.0.1-testing.orig/tools/xenstore/xenstore_client.c ++++ xen-4.0.1-testing/tools/xenstore/xenstore_client.c @@ -251,7 +251,7 @@ do_chmod(char *path, struct xs_permissio char **xsval = xs_directory(xsh, xth, path, &xsval_n); @@ -139,10 +139,10 @@ for (i = 0; i < xsval_n; i++) { snprintf(buf, MAX_PATH_LEN, "%s/%s", path, xsval[i]); -Index: xen-4.0.0-testing/tools/libxen/src/xen_common.c +Index: xen-4.0.1-testing/tools/libxen/src/xen_common.c =================================================================== ---- xen-4.0.0-testing.orig/tools/libxen/src/xen_common.c -+++ xen-4.0.0-testing/tools/libxen/src/xen_common.c +--- xen-4.0.1-testing.orig/tools/libxen/src/xen_common.c ++++ xen-4.0.1-testing/tools/libxen/src/xen_common.c @@ -1057,6 +1057,8 @@ static size_t size_of_member(const abstr default: assert(false); @@ -161,10 +161,10 @@ } -Index: xen-4.0.0-testing/tools/blktap2/drivers/block-remus.c +Index: xen-4.0.1-testing/tools/blktap2/drivers/block-remus.c =================================================================== ---- xen-4.0.0-testing.orig/tools/blktap2/drivers/block-remus.c -+++ xen-4.0.0-testing/tools/blktap2/drivers/block-remus.c +--- xen-4.0.1-testing.orig/tools/blktap2/drivers/block-remus.c ++++ xen-4.0.1-testing/tools/blktap2/drivers/block-remus.c @@ -1579,7 +1579,7 @@ static int tdremus_open(td_driver_t *dri td_flag_t flags) { ++++++ xen-xm-top-needs-root.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,11 +1,11 @@ From: Charles Coffing <ccoffing(a)novell.com> Upstream: no -Index: xen-4.0.0-testing/tools/python/xen/xm/main.py +Index: xen-4.0.1-testing/tools/python/xen/xm/main.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/main.py -+++ xen-4.0.0-testing/tools/python/xen/xm/main.py -@@ -2052,6 +2052,10 @@ def xm_debug_keys(args): +--- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py ++++ xen-4.0.1-testing/tools/python/xen/xm/main.py +@@ -2054,6 +2054,10 @@ def xm_debug_keys(args): def xm_top(args): arg_check(args, "top", 0) ++++++ xen-xmexample-vti.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/examples/Makefile +Index: xen-4.0.1-testing/tools/examples/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/examples/Makefile -+++ xen-4.0.0-testing/tools/examples/Makefile +--- xen-4.0.1-testing.orig/tools/examples/Makefile ++++ xen-4.0.1-testing/tools/examples/Makefile @@ -18,7 +18,6 @@ XEN_CONFIGS += xmexample.hvm XEN_CONFIGS += xmexample.hvm-stubdom XEN_CONFIGS += xmexample.pv-grub ++++++ xen-xmexample.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,9 +1,9 @@ Change various example paths in the config files to match SUSE. -Index: xen-4.0.0-testing/tools/examples/xmexample1 +Index: xen-4.0.1-testing/tools/examples/xmexample1 =================================================================== ---- xen-4.0.0-testing.orig/tools/examples/xmexample1 -+++ xen-4.0.0-testing/tools/examples/xmexample1 +--- xen-4.0.1-testing.orig/tools/examples/xmexample1 ++++ xen-4.0.1-testing/tools/examples/xmexample1 @@ -7,11 +7,13 @@ #============================================================================ @@ -43,10 +43,10 @@ #---------------------------------------------------------------------------- # Configure the behaviour when a domain exits. There are three 'reasons' -Index: xen-4.0.0-testing/tools/examples/xmexample2 +Index: xen-4.0.1-testing/tools/examples/xmexample2 =================================================================== ---- xen-4.0.0-testing.orig/tools/examples/xmexample2 -+++ xen-4.0.0-testing/tools/examples/xmexample2 +--- xen-4.0.1-testing.orig/tools/examples/xmexample2 ++++ xen-4.0.1-testing/tools/examples/xmexample2 @@ -35,11 +35,13 @@ xm_vars.var('vmid', xm_vars.check() @@ -86,33 +86,32 @@ #---------------------------------------------------------------------------- # Configure the behaviour when a domain exits. There are three 'reasons' -Index: xen-4.0.0-testing/tools/examples/xmexample3 +Index: xen-4.0.1-testing/tools/examples/xmexample3 =================================================================== ---- xen-4.0.0-testing.orig/tools/examples/xmexample3 -+++ xen-4.0.0-testing/tools/examples/xmexample3 +--- xen-4.0.1-testing.orig/tools/examples/xmexample3 ++++ xen-4.0.1-testing/tools/examples/xmexample3 @@ -35,11 +35,13 @@ xm_vars.var('vmid', xm_vars.check() #---------------------------------------------------------------------------- -# Kernel image file. -kernel = "/path/to/domU/kernel" -- --# Optional ramdisk. --#ramdisk = "/boot/initrd.gz" +# Kernel image file and (optional) ramdisk (initrd). +kernel = "/boot/vmlinuz-xen" +ramdisk = "/boot/initrd-xen" -+ + +-# Optional ramdisk. +-#ramdisk = "/boot/initrd.gz" +# Or use domUloader instead of kernel/ramdisk to get kernel from domU FS +#bootloader = "/usr/lib/xen/boot/domUloader.py" +#bootentry = "hda2:/vmlinuz-xen,/initrd-xen" # The domain build function. Default is 'linux'. #builder='linux' -Index: xen-4.0.0-testing/tools/examples/xmexample.hvm +Index: xen-4.0.1-testing/tools/examples/xmexample.hvm =================================================================== ---- xen-4.0.0-testing.orig/tools/examples/xmexample.hvm -+++ xen-4.0.0-testing/tools/examples/xmexample.hvm +--- xen-4.0.1-testing.orig/tools/examples/xmexample.hvm ++++ xen-4.0.1-testing/tools/examples/xmexample.hvm @@ -78,7 +78,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ] # and MODE is r for read-only, w for read-write. @@ -122,11 +121,11 @@ #---------------------------------------------------------------------------- # Configure the behaviour when a domain exits. There are three 'reasons' -Index: xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5 +Index: xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5 =================================================================== ---- xen-4.0.0-testing.orig/docs/man/xmdomain.cfg.pod.5 -+++ xen-4.0.0-testing/docs/man/xmdomain.cfg.pod.5 -@@ -38,13 +38,13 @@ file. +--- xen-4.0.1-testing.orig/docs/man/xmdomain.cfg.pod.5 ++++ xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5 +@@ -38,13 +38,13 @@ file. The kernel image for the domain. The format of the parameter is the fully qualified path to the kernel image file, @@ -161,10 +160,10 @@ at hda1, which is the root filesystem. =item I<NFS Root> -Index: xen-4.0.0-testing/docs/man/xm.pod.1 +Index: xen-4.0.1-testing/docs/man/xm.pod.1 =================================================================== ---- xen-4.0.0-testing.orig/docs/man/xm.pod.1 -+++ xen-4.0.0-testing/docs/man/xm.pod.1 +--- xen-4.0.1-testing.orig/docs/man/xm.pod.1 ++++ xen-4.0.1-testing/docs/man/xm.pod.1 @@ -163,8 +163,8 @@ soon as it is run. =item I<without config file> ++++++ xenapi-console-protocol.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -3924,6 +3924,14 @@ class XendDomainInfo: if not config.has_key('backend'): config['backend'] = "00000000-0000-0000-0000-000000000000" ++++++ xend-config.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains +Index: xen-4.0.1-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains -+++ xen-4.0.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains ++++ xen-4.0.1-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains @@ -1,4 +1,4 @@ -## Path: System/xen +## Path: System/Virtualization @@ -27,10 +27,10 @@ ## Type: integer ## Default: 300 -Index: xen-4.0.0-testing/tools/examples/xend-config.sxp +Index: xen-4.0.1-testing/tools/examples/xend-config.sxp =================================================================== ---- xen-4.0.0-testing.orig/tools/examples/xend-config.sxp -+++ xen-4.0.0-testing/tools/examples/xend-config.sxp +--- xen-4.0.1-testing.orig/tools/examples/xend-config.sxp ++++ xen-4.0.1-testing/tools/examples/xend-config.sxp @@ -58,11 +58,12 @@ ++++++ xend-core-dump-loc.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -2317,7 +2317,7 @@ class XendDomainInfo: # To prohibit directory traversal based_name = os.path.basename(self.info['name_label']) ++++++ xend-devid-or-name.patch ++++++ # HG changeset patch # User Jim Fehlig <jfehlig(a)novell.com> # Date 1284948067 21600 # Node ID 4674ad11feef87a6a57b99313966e0e121588e1c # Parent 5393151a737b023476f4e571effc547e758cf8c8 xend: Fix device_configure The semantics of XendDomainInfo.py:device_configure() changed with xen upstream c/s 19610. Previously this method would take a devid in actual id *or* name form, e.g. it would accept '5632' or 'hdc'. This patch restores that behavior. Signed-off-by: Jim Fehlig <jfehlig(a)novell.com> Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== --- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -1218,6 +1218,9 @@ class XendDomainInfo: except ValueError: pass devid = dev_control.convertToDeviceNumber(dev) + else: + # devid could be a name, e.g. hdc + devid = dev_control.convertToDeviceNumber(devid) dev_info = self._getDeviceInfo_vbd(devid) if dev_info is None: raise VmError("Device %s not connected" % devid) ++++++ xend-domain-lock.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/examples/xend-config.sxp +Index: xen-4.0.1-testing/tools/examples/xend-config.sxp =================================================================== ---- xen-4.0.0-testing.orig/tools/examples/xend-config.sxp -+++ xen-4.0.0-testing/tools/examples/xend-config.sxp +--- xen-4.0.1-testing.orig/tools/examples/xend-config.sxp ++++ xen-4.0.1-testing/tools/examples/xend-config.sxp @@ -305,6 +305,65 @@ # device assignment could really work properly even after we do this. #(pci-passthrough-strict-check yes) @@ -68,10 +68,10 @@ # If we have a very big scsi device configuration, start of xend is slow, # because xend scans all the device paths to build its internal PSCSI device # list. If we need only a few devices for assigning to a guest, we can reduce -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomainInfo.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py @@ -32,11 +32,12 @@ import re import copy import os @@ -94,7 +94,7 @@ XendTask.log_progress(0, 30, self._constructDomain) XendTask.log_progress(31, 60, self._initDomain) -@@ -2987,6 +2989,11 @@ class XendDomainInfo: +@@ -2990,6 +2992,11 @@ class XendDomainInfo: self._stateSet(DOM_STATE_HALTED) self.domid = None # Do not push into _stateSet()! @@ -106,7 +106,7 @@ finally: self.refresh_shutdown_lock.release() -@@ -4493,6 +4500,74 @@ class XendDomainInfo: +@@ -4503,6 +4510,74 @@ class XendDomainInfo: def has_device(self, dev_class, dev_uuid): return (dev_uuid in self.info['%s_refs' % dev_class.lower()]) @@ -181,10 +181,10 @@ def __str__(self): return '<domain id=%s name=%s memory=%s state=%s>' % \ (str(self.domid), self.info['name_label'], -Index: xen-4.0.0-testing/tools/python/xen/xend/XendOptions.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendOptions.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendOptions.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendOptions.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendOptions.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendOptions.py @@ -154,6 +154,17 @@ class XendOptions: use loose check automatically if necessary.""" pci_dev_assign_strict_check_default = True @@ -228,10 +228,10 @@ def get_vnc_tls(self): return self.get_config_string('vnc-tls', self.xend_vnc_tls) -Index: xen-4.0.0-testing/tools/python/xen/xend/XendCheckpoint.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendCheckpoint.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py @@ -131,6 +131,7 @@ def save(fd, dominfo, network, live, dst dominfo.shutdown('suspend') dominfo.waitForSuspend() @@ -248,10 +248,10 @@ return dominfo except Exception, exn: dominfo.destroy() -Index: xen-4.0.0-testing/tools/hotplug/Linux/Makefile +Index: xen-4.0.1-testing/tools/hotplug/Linux/Makefile =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/Makefile -+++ xen-4.0.0-testing/tools/hotplug/Linux/Makefile +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/Makefile ++++ xen-4.0.1-testing/tools/hotplug/Linux/Makefile @@ -19,6 +19,7 @@ XEN_SCRIPTS += vtpm vtpm-delete XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate @@ -260,10 +260,10 @@ XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh -Index: xen-4.0.0-testing/tools/hotplug/Linux/domain-lock +Index: xen-4.0.1-testing/tools/hotplug/Linux/domain-lock =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/hotplug/Linux/domain-lock ++++ xen-4.0.1-testing/tools/hotplug/Linux/domain-lock @@ -0,0 +1,83 @@ +#!/bin/bash + @@ -348,10 +348,10 @@ + get_status $vm_path + ;; +esac -Index: xen-4.0.0-testing/tools/hotplug/Linux/vm-monitor +Index: xen-4.0.1-testing/tools/hotplug/Linux/vm-monitor =================================================================== --- /dev/null -+++ xen-4.0.0-testing/tools/hotplug/Linux/vm-monitor ++++ xen-4.0.1-testing/tools/hotplug/Linux/vm-monitor @@ -0,0 +1,41 @@ +#!/bin/bash + ++++++ xend-sysconfig.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/hotplug/Linux/init.d/sysconfig.xend +Index: xen-4.0.1-testing/tools/hotplug/Linux/init.d/sysconfig.xend =================================================================== ---- xen-4.0.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xend -+++ xen-4.0.0-testing/tools/hotplug/Linux/init.d/sysconfig.xend +--- xen-4.0.1-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xend ++++ xen-4.0.1-testing/tools/hotplug/Linux/init.d/sysconfig.xend @@ -1,11 +1,27 @@ +## Path: System/Virtualization +## Type: string(none,guest,hv,all) ++++++ xm-create-xflag.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xm/create.py +Index: xen-4.0.1-testing/tools/python/xen/xm/create.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/create.py -+++ xen-4.0.0-testing/tools/python/xen/xm/create.py +--- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py ++++ xen-4.0.1-testing/tools/python/xen/xm/create.py @@ -36,7 +36,7 @@ from xen.xend.server.DevConstants import from xen.util import blkif from xen.util import vscsi_util @@ -11,7 +11,7 @@ from xen.util import utils, auxbin from xen.util.pci import dev_dict_to_sxp, \ parse_pci_name_extended, PciDeviceParseError -@@ -1514,7 +1514,7 @@ def main(argv): +@@ -1522,7 +1522,7 @@ def main(argv): except IOError, exn: raise OptionError("Cannot read file %s: %s" % (config, exn[1])) @@ -20,7 +20,7 @@ from xen.xm.xenapi_create import sxp2xml sxp2xml_inst = sxp2xml() doc = sxp2xml_inst.convert_sxp_to_xml(config, transient=True) -@@ -1522,7 +1522,7 @@ def main(argv): +@@ -1530,7 +1530,7 @@ def main(argv): if opts.vals.dryrun and not opts.is_xml: SXPPrettyPrint.prettyprint(config) @@ -29,10 +29,10 @@ from xml.dom.ext import PrettyPrint as XMLPrettyPrint XMLPrettyPrint(doc) -Index: xen-4.0.0-testing/tools/python/xen/xend/XendAPIConstants.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPIConstants.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendAPIConstants.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendAPIConstants.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPIConstants.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendAPIConstants.py @@ -45,8 +45,10 @@ XEN_API_ON_NORMAL_EXIT = [ XEN_API_ON_CRASH_BEHAVIOUR = [ 'destroy', ++++++ xm-save-check-file.patch ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/python/xen/xend/XendAPI.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPI.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendAPI.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendAPI.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPI.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendAPI.py @@ -1923,10 +1923,10 @@ class XendAPI(object): bool(live), port, node, ssl, bool(chs)) return xen_api_success_void() @@ -15,10 +15,10 @@ return xen_api_success_void() def VM_restore(self, _, src, paused): -Index: xen-4.0.0-testing/tools/python/xen/xend/XendDomain.py +Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomain.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xend/XendDomain.py -+++ xen-4.0.0-testing/tools/python/xen/xend/XendDomain.py +--- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomain.py ++++ xen-4.0.1-testing/tools/python/xen/xend/XendDomain.py @@ -1496,7 +1496,7 @@ class XendDomain: pass sock.close() @@ -38,10 +38,10 @@ if dominfo.getDomid() == DOM0_ID: raise XendError("Cannot save privileged domain %s" % str(domid)) if dominfo._stateGet() != DOM_STATE_RUNNING: -Index: xen-4.0.0-testing/tools/python/xen/xm/main.py +Index: xen-4.0.1-testing/tools/python/xen/xm/main.py =================================================================== ---- xen-4.0.0-testing.orig/tools/python/xen/xm/main.py -+++ xen-4.0.0-testing/tools/python/xen/xm/main.py +--- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py ++++ xen-4.0.1-testing/tools/python/xen/xm/main.py @@ -120,7 +120,7 @@ SUBCOMMAND_HELP = { 'reset' : ('<Domain>', 'Reset a domain.'), 'restore' : ('<CheckpointFile> [-p]', ++++++ xm-test-cleanup.diff ++++++ --- /var/tmp/diff_new_pack.qe8qnd/_old 2010-09-28 00:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.qe8qnd/_new 2010-09-28 00:06:26.000000000 +0200 @@ -1,7 +1,7 @@ -Index: xen-4.0.0-testing/tools/xm-test/tests/save/01_save_basic_pos.py +Index: xen-4.0.1-testing/tools/xm-test/tests/save/01_save_basic_pos.py =================================================================== ---- xen-4.0.0-testing.orig/tools/xm-test/tests/save/01_save_basic_pos.py -+++ xen-4.0.0-testing/tools/xm-test/tests/save/01_save_basic_pos.py +--- xen-4.0.1-testing.orig/tools/xm-test/tests/save/01_save_basic_pos.py ++++ xen-4.0.1-testing/tools/xm-test/tests/save/01_save_basic_pos.py @@ -35,3 +35,9 @@ if s != 0: # Make sure it's gone if isDomainRunning(domain.getName()): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virt-viewer for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package virt-viewer for openSUSE:Factory checked in at Tue Sep 28 00:06:04 CEST 2010. -------- --- virt-viewer/virt-viewer.changes 2010-05-07 20:51:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/virt-viewer/virt-viewer.changes 2010-08-27 01:08:53.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 27 01:07:40 CEST 2010 - ro(a)suse.de + +- change buildreq to libpixman-1-0-devel + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-viewer.spec ++++++ --- /var/tmp/diff_new_pack.6KCoTd/_old 2010-09-28 00:05:35.000000000 +0200 +++ /var/tmp/diff_new_pack.6KCoTd/_new 2010-09-28 00:05:35.000000000 +0200 @@ -19,7 +19,7 @@ Name: virt-viewer Version: 0.2.1 -Release: 1 +Release: 4 Summary: Virtual Machine Viewer Group: System/Monitoring License: GPLv2+ @@ -38,7 +38,11 @@ BuildRequires: libxml2-devel BuildRequires: gtk-vnc-devel >= 0.3.8 BuildRequires: libglade2-devel +%if %suse_version > 1130 +BuildRequires: libpixman-1-0-devel +%else BuildRequires: libpixman +%endif BuildRequires: intltool #our build requirements BuildRequires: xen-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virt-manager for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package virt-manager for openSUSE:Factory checked in at Tue Sep 28 00:05:24 CEST 2010. -------- --- virt-manager/virt-manager.changes 2010-06-25 18:07:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2010-09-27 22:46:56.000000000 +0200 @@ -1,0 +2,35 @@ +Mon Sep 27 11:10:48 UTC 2010 - seife(a)opensuse.org + +- fix instant segfault with python 2.7, bnc#641981, patch taken + from https://bugzilla.redhat.com/show_bug.cgi?id=620216 + +------------------------------------------------------------------- +Tue Sep 14 08:26:13 UTC 2010 - seife(a)opensuse.org + +- fix build on FACTORY after gconf2 and python changes + +------------------------------------------------------------------- +Tue Aug 31 14:13:14 MDT 2010 - carnold(a)novell.com + +- Update to virt-manager 0.8.5 + * Improved save/restore support + * Option to view and change disk cache mode + * Configurable VNC keygrab sequence (Michal Novotny) +- Update to virtinst 0.500.4 + * New virt-install --console option for specifying virtio console + device + * New virt-install --channel option for specifying guest + communication channel + * New virt-install --boot option. Allows setting post-install boot + order, direct kernel/initrd boot, and enabling boot device menu. + * New virt-install --initrd-inject option, which enables + installation using a _local_ kickstart file (Colin Walters) + +------------------------------------------------------------------- +Wed Jul 28 16:06:55 MDT 2010 - carnold(a)novell.com + +- bnc#624250 - L3: virt-manager doesn't update "Autostart" setting + in vm configuration correctly + virtman-autorestart.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 1660-custom-icon-fix.patch virt-manager-0.8.4.tar.bz2 virtinst-0.500.3.tar.bz2 New: ---- virt-manager-0.8.5.tar.bz2 virt-manager-fix-python27.diff virtinst-0.500.4.tar.bz2 virtman-autorestart.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:06.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package virt-manager (Version 0.8.4) +# spec file for package virt-manager (Version 0.8.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,21 +22,23 @@ %define gconftool /usr/bin/gconftool-2 %define virtinst_maj 0 %define virtinst_min 500 -%define virtinst_rel 3 +%define virtinst_rel 4 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} %define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") Name: virt-manager Summary: Virtual Machine Manager -Version: 0.8.4 -Release: 4 +Version: 0.8.5 +Release: 1 Group: System/Monitoring License: LGPLv2.1+ Url: http://virt-manager.et.redhat.com Source0: virt-manager-%{version}.tar.bz2 Source1: %{virtinst_name}.tar.bz2 -Patch1: 1660-custom-icon-fix.patch +# see https://bugzilla.redhat.com/show_bug.cgi?id=620216, +# https://bugzilla.novell.com/show_bug.cgi?id=641981 +Patch1: virt-manager-fix-python27.diff Patch50: virtman-desktop.diff Patch51: virtman-vminstall.diff Patch52: virtman-pointer.diff @@ -48,6 +50,7 @@ Patch58: virtman-keycombo.diff Patch59: virtman-autoconnect.diff Patch60: virtman-device-flags.diff +Patch61: virtman-autorestart.diff Patch81: virtinst-cdrom.diff Patch82: virtinst-storage-ocfs2.diff ExclusiveArch: %{ix86} x86_64 @@ -134,10 +137,11 @@ %patch54 -p1 #%patch55 -p1 #%patch56 -p1 -%patch57 -p1 +#%patch57 -p1 %patch58 -p1 %patch59 -p1 %patch60 -p1 +%patch61 -p1 pushd $RPM_BUILD_DIR/%{virtinst_name} %patch81 -p1 %patch82 -p1 @@ -193,15 +197,6 @@ %files -f %{name}.lst %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog -%if 0%{?suse_version} <= 1110 -%dir %{gsysconfdir}/gconf -%dir %{gsysconfdir}/gconf/schemas -%config %{gsysconfdir}/gconf/schemas/%{name}.schemas -%else -%dir %{_datadir}/gconf -%dir %{_datadir}/gconf/schemas -%config %{_datadir}/gconf/schemas/%{name}.schemas -%endif %{_bindir}/%{name} %{_bindir}/virt-clone %{_bindir}/virt-convert @@ -226,9 +221,9 @@ # %dir %attr(775,root,root) %{_datadir}/locale/or # %dir %attr(775,root,root) %{_datadir}/locale/or/LC_MESSAGES # %{_datadir}/locale/or/LC_MESSAGES/* -%{_datadir}/omf/%{name} -%dir %attr(775,root,root) %{_datadir}/gnome -%{_datadir}/gnome/help +#%{_datadir}/omf/%{name} +#%dir %attr(775,root,root) %{_datadir}/gnome +#%{_datadir}/gnome/help %{_datadir}/applications/YaST2/%{name}.desktop %{_datadir}/dbus-1/services/%{name}.service %{_mandir}/man1/%{name}.1* @@ -244,9 +239,9 @@ %dir %{pysite}/virtconv/parsers %{pysite}/virtconv/parsers/*.py %{pysite}/virtconv/parsers/*.pyc -%{pysite}/%{virtinst_name}-py2.6.egg-info -%doc %{_datadir}/gnome/help/%{name}/C/figures/*.png -%doc %{_datadir}/gnome/help/%{name}/C/*.xml +%{pysite}/%{virtinst_name}-py2.?.egg-info +#%doc %{_datadir}/gnome/help/%{name}/C/figures/*.png +#%doc %{_datadir}/gnome/help/%{name}/C/*.xml # FIXME: autobuild complains that these are unowned (not true...) %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/services ++++++ virt-manager-0.8.4.tar.bz2 -> virt-manager-0.8.5.tar.bz2 ++++++ ++++ 174266 lines of diff (skipped) ++++++ virt-manager-fix-python27.diff ++++++ Index: b/src/virt-manager.py.in =================================================================== --- a/src/virt-manager.py.in +++ b/src/virt-manager.py.in @@ -271,11 +271,11 @@ def main(): # Urgh, pygtk merely logs a warning when failing to open # the X11 display connection, and lets everything carry # on as if all were fine. Ultimately bad stuff happens, # so lets catch it here & get the hell out... import warnings - warnings.filterwarnings('error', module='gtk') + warnings.filterwarnings('error', module='gtk', append=True) try: import gobject # Set program name for gnome shell (before importing gtk, which # seems to call set_prgname on its own) ++++++ virtinst-0.500.3.tar.bz2 -> virtinst-0.500.4.tar.bz2 ++++++ ++++ 33583 lines of diff (skipped) ++++++ virtinst-cdrom.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:07.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virtinst-0.500.3/virtinst/VirtualDisk.py +Index: virtinst-0.500.4/virtinst/VirtualDisk.py =================================================================== ---- virtinst-0.500.3.orig/virtinst/VirtualDisk.py -+++ virtinst-0.500.3/virtinst/VirtualDisk.py -@@ -1441,14 +1441,18 @@ class VirtualDisk(VirtualDevice): +--- virtinst-0.500.4.orig/virtinst/VirtualDisk.py ++++ virtinst-0.500.4/virtinst/VirtualDisk.py +@@ -1444,14 +1444,18 @@ class VirtualDisk(VirtualDevice): self.target = "hdc" return self.target ++++++ virtinst-storage-ocfs2.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:07.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virtinst-0.500.3/virtinst/Storage.py +Index: virtinst-0.500.4/virtinst/Storage.py =================================================================== ---- virtinst-0.500.3.orig/virtinst/Storage.py -+++ virtinst-0.500.3/virtinst/Storage.py -@@ -522,7 +522,7 @@ class FilesystemPool(StoragePool): +--- virtinst-0.500.4.orig/virtinst/Storage.py ++++ virtinst-0.500.4/virtinst/Storage.py +@@ -523,7 +523,7 @@ class FilesystemPool(StoragePool): get_volume_class = staticmethod(get_volume_class) formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf", ++++++ virtman-autoconnect.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:07.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.4/src/virtManager/engine.py +Index: virt-manager-0.8.5/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/engine.py -+++ virt-manager-0.8.4/src/virtManager/engine.py -@@ -689,7 +689,7 @@ class vmmEngine(gobject.GObject): +--- virt-manager-0.8.5.orig/src/virtManager/engine.py ++++ virt-manager-0.8.5/src/virtManager/engine.py +@@ -704,7 +704,7 @@ class vmmEngine(gobject.GObject): self.emit("connection-added", conn) self.config.add_connection(conn.get_uri()) if autoconnect: ++++++ virtman-autorestart.diff ++++++ Index: virt-manager-0.8.5/src/virtManager/details.py =================================================================== --- virt-manager-0.8.5.orig/src/virtManager/details.py +++ virt-manager-0.8.5/src/virtManager/details.py @@ -1397,8 +1397,15 @@ class vmmDetails(gobject.GObject): self.vm.hotplug_both_mem, (curmem, maxmem)) - # Boot device / Autostart + # Boot device def config_boot_options_apply(self): + bootdevs = self.get_config_boot_devs() + return self._change_config_helper(self.vm.set_boot_device, + (bootdevs,)) + + # Autostart - See bnc#624250 - L3: virt-manager doesn't update + # "Autostart" setting in vm configuration correctly + def update_on_xend_start(self): auto = self.window.get_widget("config-autostart") if auto.get_property("sensitive"): @@ -1407,11 +1414,6 @@ class vmmDetails(gobject.GObject): except Exception, e: self.err.show_err((_("Error changing autostart value: %s") % str(e)), "".join(traceback.format_exc())) - return False - - bootdevs = self.get_config_boot_devs() - return self._change_config_helper(self.vm.set_boot_device, - (bootdevs,)) # CDROM def change_storage_media(self, dev_id_info, newpath, _type=None): @@ -1570,6 +1572,9 @@ class vmmDetails(gobject.GObject): else: self.err.show_info(_("These changes will take effect after " "the next guest reboot.")) + + self.update_on_xend_start() + return True ######################## ++++++ virtman-cdrom.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:07.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.4/src/virtManager/addhardware.py +Index: virt-manager-0.8.5/src/virtManager/addhardware.py =================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/addhardware.py -+++ virt-manager-0.8.4/src/virtManager/addhardware.py -@@ -464,6 +464,7 @@ class vmmAddHardware(gobject.GObject): +--- virt-manager-0.8.5.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.5/src/virtManager/addhardware.py +@@ -468,6 +468,7 @@ class vmmAddHardware(gobject.GObject): if self.vm.get_hv_type() == "kvm": add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk") if self.vm.get_connection().is_xen(): ++++++ virtman-desktop.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.4/src/Makefile.am +Index: virt-manager-0.8.5/src/Makefile.am =================================================================== ---- virt-manager-0.8.4.orig/src/Makefile.am -+++ virt-manager-0.8.4/src/Makefile.am +--- virt-manager-0.8.5.orig/src/Makefile.am ++++ virt-manager-0.8.5/src/Makefile.am @@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) @@ -11,11 +11,11 @@ desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop -Index: virt-manager-0.8.4/src/Makefile.in +Index: virt-manager-0.8.5/src/Makefile.in =================================================================== ---- virt-manager-0.8.4.orig/src/Makefile.in -+++ virt-manager-0.8.4/src/Makefile.in -@@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in +--- virt-manager-0.8.5.orig/src/Makefile.in ++++ virt-manager-0.8.5/src/Makefile.in +@@ -239,7 +239,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) @@ -24,10 +24,10 @@ desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop dbusdir = $(datadir)/dbus-1/services -Index: virt-manager-0.8.4/src/virt-manager.desktop.in.in +Index: virt-manager-0.8.5/src/virt-manager.desktop.in.in =================================================================== ---- virt-manager-0.8.4.orig/src/virt-manager.desktop.in.in -+++ virt-manager-0.8.4/src/virt-manager.desktop.in.in +--- virt-manager-0.8.5.orig/src/virt-manager.desktop.in.in ++++ virt-manager-0.8.5/src/virt-manager.desktop.in.in @@ -1,9 +1,20 @@ [Desktop Entry] _Name=Virtual Machine Manager ++++++ virtman-device-flags.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:07.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.4/src/virtManager/addhardware.py +Index: virt-manager-0.8.5/src/virtManager/addhardware.py =================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/addhardware.py -+++ virt-manager-0.8.4/src/virtManager/addhardware.py -@@ -1010,6 +1010,18 @@ class vmmAddHardware(gobject.GObject): +--- virt-manager-0.8.5.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.5/src/virtManager/addhardware.py +@@ -1022,6 +1022,18 @@ class vmmAddHardware(gobject.GObject): self._dev.get_xml_config() logging.debug("Adding device:\n" + self._dev.get_xml_config()) @@ -21,11 +21,11 @@ # Hotplug device attach_err = False try: -Index: virt-manager-0.8.4/src/virtManager/details.py +Index: virt-manager-0.8.5/src/virtManager/details.py =================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/details.py -+++ virt-manager-0.8.4/src/virtManager/details.py -@@ -1414,6 +1414,17 @@ class vmmDetails(gobject.GObject): +--- virt-manager-0.8.5.orig/src/virtManager/details.py ++++ virt-manager-0.8.5/src/virtManager/details.py +@@ -1479,6 +1479,17 @@ class vmmDetails(gobject.GObject): return self.config.set_confirm_removedev(not skip_prompt) @@ -43,11 +43,11 @@ # Define the change try: self.vm.remove_device(dev_type, dev_id_info) -Index: virt-manager-0.8.4/src/virtManager/domain.py +Index: virt-manager-0.8.5/src/virtManager/domain.py =================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/domain.py -+++ virt-manager-0.8.4/src/virtManager/domain.py -@@ -1370,6 +1370,10 @@ class vmmDomain(vmmDomainBase): +--- virt-manager-0.8.5.orig/src/virtManager/domain.py ++++ virt-manager-0.8.5/src/virtManager/domain.py +@@ -1413,6 +1413,10 @@ class vmmDomain(vmmDomainBase): self._backend.attachDevice(devxml) @@ -58,7 +58,7 @@ def detach_device(self, devtype, dev_id_info): """ Hotunplug device from running guest -@@ -1378,6 +1382,10 @@ class vmmDomain(vmmDomainBase): +@@ -1421,6 +1425,10 @@ class vmmDomain(vmmDomainBase): if self.is_active(): self._backend.detachDevice(xml) ++++++ virtman-help.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:07.000000000 +0200 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml +Index: virt-manager-0.8.5/help/virt-manager/C/virt-manager.xml =================================================================== ---- virt-manager-0.8.4.orig/help/virt-manager/C/virt-manager.xml -+++ virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml +--- virt-manager-0.8.5.orig/help/virt-manager/C/virt-manager.xml ++++ virt-manager-0.8.5/help/virt-manager/C/virt-manager.xml @@ -821,218 +821,9 @@ <title>The Create Wizard</title> <para>The Create Wizard helps you gather the information necessary to create ++++++ virtman-keycombo.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:08.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:08.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.8.4/src/vmm-details.glade +Index: virt-manager-0.8.5/src/vmm-details.glade =================================================================== ---- virt-manager-0.8.4.orig/src/vmm-details.glade -+++ virt-manager-0.8.4/src/vmm-details.glade -@@ -339,11 +339,93 @@ +--- virt-manager-0.8.5.orig/src/vmm-details.glade ++++ virt-manager-0.8.5/src/vmm-details.glade +@@ -351,11 +351,93 @@ </widget> </child> <child> @@ -96,7 +96,7 @@ <widget class="GtkMenuItem" id="details-menu-send-caf1"> <property name="visible">True</property> <property name="label">Ctrl+Alt+F_1</property> -@@ -440,7 +522,7 @@ +@@ -452,7 +534,7 @@ </widget> </child> <child> @@ -105,11 +105,11 @@ <property name="visible">True</property> </widget> </child> -Index: virt-manager-0.8.4/src/virtManager/details.py +Index: virt-manager-0.8.5/src/virtManager/details.py =================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/details.py -+++ virt-manager-0.8.4/src/virtManager/details.py -@@ -288,6 +288,15 @@ class vmmDetails(gobject.GObject): +--- virt-manager-0.8.5.orig/src/virtManager/details.py ++++ virt-manager-0.8.5/src/virtManager/details.py +@@ -291,6 +291,15 @@ class vmmDetails(gobject.GObject): "on_details_menu_send_cad_activate": self.console.send_key, "on_details_menu_send_cab_activate": self.console.send_key, @@ -125,11 +125,11 @@ "on_details_menu_send_caf1_activate": self.console.send_key, "on_details_menu_send_caf2_activate": self.console.send_key, "on_details_menu_send_caf3_activate": self.console.send_key, -Index: virt-manager-0.8.4/src/virtManager/console.py +Index: virt-manager-0.8.5/src/virtManager/console.py =================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/console.py -+++ virt-manager-0.8.4/src/virtManager/console.py -@@ -325,6 +325,24 @@ class vmmConsolePages(gobject.GObject): +--- virt-manager-0.8.5.orig/src/virtManager/console.py ++++ virt-manager-0.8.5/src/virtManager/console.py +@@ -359,6 +359,24 @@ class vmmConsolePages(gobject.GObject): keys = ["Control_L", "Alt_L", "Delete"] elif src.get_name() == "details-menu-send-cab": keys = ["Control_L", "Alt_L", "BackSpace"] ++++++ virtman-kvm.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:08.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:08.000000000 +0200 @@ -1,14 +1,12 @@ -Index: virt-manager-0.8.4/src/virtManager/engine.py +Index: virt-manager-0.8.5/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/engine.py -+++ virt-manager-0.8.4/src/virtManager/engine.py -@@ -69,7 +69,8 @@ def default_uri(): - tryuri = "xen:///" - elif (os.path.exists("/usr/bin/qemu") or +--- virt-manager-0.8.5.orig/src/virtManager/engine.py ++++ virt-manager-0.8.5/src/virtManager/engine.py +@@ -71,6 +71,7 @@ def default_uri(): + os.path.exists("/usr/bin/qemu") or os.path.exists("/usr/bin/qemu-kvm") or -- os.path.exists("/usr/bin/kvm")): -+ os.path.exists("/usr/bin/kvm") or -+ os.path.exists("/dev/kvm") ): + os.path.exists("/usr/bin/kvm") or ++ os.path.exists("/dev/kvm") or + os.path.exists("/usr/libexec/qemu-kvm")): tryuri = "qemu:///system" - return tryuri ++++++ virtman-vminstall.diff ++++++ --- /var/tmp/diff_new_pack.R51ski/_old 2010-09-28 00:05:08.000000000 +0200 +++ /var/tmp/diff_new_pack.R51ski/_new 2010-09-28 00:05:08.000000000 +0200 @@ -1,7 +1,7 @@ -Index: virt-manager-0.8.4/src/virtManager/engine.py +Index: virt-manager-0.8.5/src/virtManager/engine.py =================================================================== ---- virt-manager-0.8.4.orig/src/virtManager/engine.py -+++ virt-manager-0.8.4/src/virtManager/engine.py +--- virt-manager-0.8.5.orig/src/virtManager/engine.py ++++ virt-manager-0.8.5/src/virtManager/engine.py @@ -40,7 +40,8 @@ from virtManager.manager import vmmManag from virtManager.migrate import vmmMigrateDialog from virtManager.details import vmmDetails @@ -12,7 +12,7 @@ from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog from virtManager.systray import vmmSystray -@@ -650,13 +651,27 @@ class vmmEngine(gobject.GObject): +@@ -665,13 +666,27 @@ class vmmEngine(gobject.GObject): return False return True ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-gdata for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package python-gdata for openSUSE:Factory checked in at Tue Sep 28 00:04:54 CEST 2010. -------- --- python-gdata/python-gdata.changes 2010-09-06 15:25:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-gdata/python-gdata.changes 2010-09-27 19:03:34.000000000 +0200 @@ -1,0 +2,38 @@ +Mon Sep 27 18:55:30 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 2.0.12: + + Bug Fixes: + - PATCH request generates incorrect Content-Type + - get_blog_name() does not correctly handle blog URLs + containing hyphens + - Packages should contain gdata.apps.audit in setup.py + - Lots of memory usage when uploading big video files + - gdata.contacts.client.ContactsClient.get_profiles_feed() + broken + + Turn on SSL be default for the spreadsheet API + + Added support for new Analytics feeds + + All V3 code and development has been out of this project and + into http://code.google.com/p/google-api-python-client/ + + Added partial support for the YouTube API in v2 +- Changes from version 2.0.11: + + Added the following new APIs: + - Apps Audit APIs + - Apps Organization + - Added Email Settings API client library v2.0 + + Fixes to file permissions for samples. + + Fixing a broken calendar resource client from r983, removing a + superfluous call to MakeResourceFeedUri(), adding regression + tests for edit links. + + Abstracting out AppsProperty so that it's usable by other libs. + + Added optional change_password parameter to + AppsService.CreateUser + + Fixing minor bugs in analytics samples + + Switch default connection type back to non-SSL connections. + + Added OAuth test cases + + Many APIs now use SSL, and some require it, so the following + APIs now default to using HTTPS: + - Spreadsheets + - Sites + - Calendar Resource + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gdata-2.0.10.tar.bz2 New: ---- gdata-2.0.12.tar.bz2 rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gdata.spec ++++++ --- /var/tmp/diff_new_pack.BfCIAS/_old 2010-09-28 00:04:41.000000000 +0200 +++ /var/tmp/diff_new_pack.BfCIAS/_new 2010-09-28 00:04:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-gdata (Version 2.0.10) +# spec file for package python-gdata (Version 2.0.12) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,18 +20,18 @@ Name: python-gdata BuildRequires: python-devel python-setuptools -License: Apache Software License .. +License: Apache Software License 2.0 (ASL2) Group: Development/Libraries/Python -Version: 2.0.10 -Release: 2 +Version: 2.0.12 +Release: 1 Summary: Python library to access data through Google Data APIs Url: http://code.google.com/p/gdata-python-client +# http://gdata-python-client.googlecode.com/files/gdata-%{version}.tar.gz Source: gdata-%{version}.tar.bz2 +Source99: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires -%if %suse_version <= 1110 -%define python_sitelib %{py_sitedir} -%else +%if 0%{?suse_version} >= 1120 BuildArch: noarch %endif @@ -42,20 +42,28 @@ %prep %setup -q -n gdata-%{version} +# replace python shebangs with %__python +find . -type f -exec %__sed -i -r '1s|^#! *(.+)/python(.*)$|#!%__python|' {} \; +find . -type f -exec %__sed -i -r '1s|^#! */usr/bin/env +python.*$|#!%__python|' {} \; + +# remove executable perms on samples +find ./samples/ -type f -exec %__chmod 0644 {} \; + %build -%{__python} setup.py build +%__python ./setup.py build %install -%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} +%__python ./setup.py install \ + --prefix="%{_prefix}" \ + --root="%{buildroot}" \ + --record-rpm=files.lst %clean -%{__rm} -rf %{buildroot} +%{?buildroot:%__rm -rf "%{buildroot}"} -%files +%files -f files.lst %defattr(-,root,root) -%{python_sitelib}/gdata-%{version}-py%{python_version}.egg-info -%defattr(0755,root,root) -%{python_sitelib}/gdata -%{python_sitelib}/atom +%doc README.txt RELEASE_NOTES.txt +%doc samples/ %changelog ++++++ gdata-2.0.10.tar.bz2 -> gdata-2.0.12.tar.bz2 ++++++ ++++ 29613 lines of diff (skipped) ++++++ rpmlintrc ++++++ addFilter("non-executable-script .* 0644L /usr/bin/python") addFilter("files-duplicate .*/index.yaml") addFilter("files-duplicate .*/__init__.py") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at Tue Sep 28 00:04:09 CEST 2010. -------- --- Mesa/Mesa.changes 2010-09-15 06:19:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/Mesa/Mesa.changes 2010-09-27 21:26:52.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Sep 27 18:28:46 UTC 2010 - sndirsch(a)novell.com + +- updated to MesaLib 7.9-RC1 + +------------------------------------------------------------------- +Wed Sep 15 12:29:11 UTC 2010 - sndirsch(a)novell.com + +- Mesa git master #83f5f50 (2010-09-14) +- obsoletes commit-4ebf07a.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- MesaLib-7.8.2-afd328a.tar.bz2 commit-4ebf07a.diff New: ---- MesaLib-7.9-rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.uSUm2X/_old 2010-09-28 00:03:37.000000000 +0200 +++ /var/tmp/diff_new_pack.uSUm2X/_new 2010-09-28 00:03:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package Mesa (Version 7.8.2) +# spec file for package Mesa (Version 7.9) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ %define enable_nouveau 1 -%define _version 7.8.2 +%define _version 7.9 -Version: 7.8.2 -Release: 7 +Version: 7.9 +Release: 1 Name: Mesa BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel @@ -43,8 +43,8 @@ %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}-afd328a.tar.bz2 -Source1: MesaDemos-%{_version}.tar.bz2 +Source: MesaLib-%{_version}-rc1.tar.bz2 +Source1: MesaDemos-7.8.2.tar.bz2 Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 @@ -55,7 +55,6 @@ Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff # already upstream -Patch10: commit-4ebf07a.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -135,7 +134,7 @@ Francisco Jerez %prep -%setup -n %{name}-%{_version} -b1 -b4 -q +%setup -n %{name}-%{_version}-rc1 -a1 -b4 -q # no need to build (GLUT-)Demos rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl} # we use freeglut @@ -147,7 +146,6 @@ sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile %patch8 %patch9 -p0 -%patch10 -p1 %build ++++++ MesaDemos-7.8.2.tar.bz2 ++++++ Mesa/MesaDemos-7.8.2.tar.bz2 /mounts/work_src_done/STABLE/Mesa/MesaDemos-7.8.2.tar.bz2 differ: char 11, line 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

drop kcall from openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, FYI: Package kcall was dropped from openSUSE:Factory at Mon Sep 27 17:42:11 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=kc… 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

drop decibel from openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, FYI: Package decibel was dropped from openSUSE:Factory at Mon Sep 27 17:41:51 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=de… 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

drop gpsdrive from openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, FYI: Package gpsdrive was dropped from openSUSE:Factory at Mon Sep 27 17:41:34 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=gp… 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

drop cron from openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, FYI: Package cron was dropped from openSUSE:Factory at Mon Sep 27 17:41:17 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=cr… Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gst-rtsp for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package gst-rtsp for openSUSE:Factory checked in at Mon Sep 27 17:40:43 CEST 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/gst-rtsp/gst-rtsp.changes 2010-09-03 15:38:23.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Sep 3 10:31:59 CEST 2010 - vuntz(a)opensuse.org + +- Initial package (version 0.10.5). + calling whatdependson for head-i586 New: ---- gst-rtsp-0.10.5.tar.bz2 gst-rtsp-fix-vala-detection.patch gst-rtsp.changes gst-rtsp.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gst-rtsp.spec ++++++ # # spec file for package gst-rtsp (Version 0.10.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: gst-rtsp Version: 0.10.5 Release: 1 License: LGPLv2+ Summary: GStreamer based RTSP server library Url: http://gstreamer.freedesktop.org/ Group: Productivity/Multimedia/Other Source0: http://www.gstreamer.net/src/gst-rtsp/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM gst-rtsp-fix-vala-detection.patch bgo#628676 vuntz(a)opensuse.org -- Fix vala detection Patch0: gst-rtsp-fix-vala-detection.patch BuildRequires: python-devel BuildRequires: vala-devel BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(gst-python-0.10) BuildRequires: pkgconfig(pygobject-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GstRTSP is a RTSP server library using the GStreamer framework. %package -n libgstrtspserver-0_10-0 License: LGPLv2+ Summary: GStreamer based RTSP server library Group: System/Libraries %description -n libgstrtspserver-0_10-0 GstRTSP is a RTSP server library using the GStreamer framework. %package -n libgstrtspserver-0_10-devel License: LGPLv2+ Summary: GStreamer based RTSP server library -- Development Files Group: Development/Libraries/C and C++ Requires: libgstrtspserver-0_10-0 = %{version} %description -n libgstrtspserver-0_10-devel GstRTSP is a RTSP server library using the GStreamer framework. %package -n python-gstreamer-0_10-plugin-rtspserver License: LGPLv2+ Summary: GStreamer based RTSP server library -- Python Bindings Group: Development/Languages/Python Requires: python-gstreamer-0_10 %py_requires %description -n python-gstreamer-0_10-plugin-rtspserver GstRTSP is a RTSP server library using the GStreamer framework. %prep %setup -q %patch0 -p1 %build autoreconf -fi %configure --disable-static %__make %{?_smp_mflags} V=1 %install %makeinstall find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %clean rm -rf %{buildroot} %post -n libgstrtspserver-0_10-0 -p /sbin/ldconfig %postun -n libgstrtspserver-0_10-0 -p /sbin/ldconfig %files -n libgstrtspserver-0_10-0 %defattr(-, root, root) %doc AUTHORS COPYING README docs/design/gst-rtp-server-design %{_libdir}/libgstrtspserver-0.10.so.* %files -n libgstrtspserver-0_10-devel %defattr(-, root, root) %{_includedir}/gstreamer-0.10/gst/rtsp-server %{_libdir}/libgstrtspserver-0.10.so %{_libdir}/pkgconfig/gst-rtsp-server-0.10.pc %dir %{_datadir}/gst-rtsp/ %dir %{_datadir}/gst-rtsp/0.10/ # defs for python bindings %{_datadir}/gst-rtsp/0.10/defs/ %{_datadir}/vala/vapi/gst-rtsp-server-0.10.* %files -n python-gstreamer-0_10-plugin-rtspserver %defattr(-, root, root) %{python_sitearch}/gst-0.10/gst/rtspserver.so %changelog ++++++ gst-rtsp-fix-vala-detection.patch ++++++ Index: gst-rtsp-0.10.5/configure.ac =================================================================== --- gst-rtsp-0.10.5.orig/configure.ac +++ gst-rtsp-0.10.5/configure.ac @@ -118,7 +118,12 @@ fi AM_CONDITIONAL(WITH_PYTHON, [test "x$HAVE_PYTHON_BINDINGS" = "xyes"]) dnl Check for vala -PKG_CHECK_EXISTS([vala-1.0], [HAVE_VALA="yes"], [HAVE_VALA="no"]) +AM_PROG_VALAC() +if test "x$VALAC" != "x"; then + HAVE_VALA="yes" +else + HAVE_VALA="no" +fi AM_CONDITIONAL(WITH_VALA, [test "x$HAVE_VALA" = "xyes"]) @@ -127,7 +132,7 @@ AC_ARG_WITH([vapidir], if test "x$HAVE_VALA" = "xyes"; then if test "x$with_vapidir" = "x"; then - VAPIDIR="`pkg-config --variable vapidir vala-1.0`" + VAPIDIR="${datadir}/vala/vapi" else VAPIDIR="$with_vapidir" fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cronie for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package cronie for openSUSE:Factory checked in at Mon Sep 27 17:40:08 CEST 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/cronie/cronie.changes 2010-08-26 03:40:00.000000000 +0200 @@ -0,0 +1,870 @@ +------------------------------------------------------------------- +Thu Aug 26 01:34:34 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Update to cronie 1.4.5 +- drop upstreamed patches in particular minuslog and pam_conv. +- cronie can work without sendmail now, if absent syslog is used. + +------------------------------------------------------------------- +Wed Apr 7 18:50:23 UTC 2010 - mseben(a)novell.com + +- added crond_pid.diff to finaly fix cron.pid issue which breaks + init script + +------------------------------------------------------------------- +Thu Mar 25 14:28:30 UTC 2010 - mseben(a)novell.com + +- updated to version 1.4.4 + * src/crontab.c: CVE-2010-0424 -- crontab -e crontab file timestamp + race condition + * configure.ac: Dynamic shared libraries -laudit There is need to + add -laudit into gcc options because now it's no found automatically. + * man/anacrontab.5: Make man page more readable based on #564206. + * crond.sysconfig, cronie.init: CRON_VALIDATE_MAILRCPTS was removed, + because it was not used anyway. + * src/do_command.c, src/funcs.h, src/security.c: With NFS homes + can't be job executed, because root can't access this directory. + * man/cron.8, src/do_command.c: Disable mailing output. + * man/cron.8, src/cron.c, src/do_command.c, src/globals.h: Output + could be redirectered to syslog. + * src/security.c: Cron doesn't use environment values from + /etc/security/pam_env.conf. This was fixed by moving pam_setcred + into first part of authentication of pam. + * cronie.init: Initscript: if unprivileged user stop deamon, it + should return 4. + * cronie.init: Initscript: if unprivileged user restart deamon, it + should return 4. + * src/security.c: This function will be probably removed from + libselinux, so it is added into source code here. + * pam/crond: One line was missing in pam authentication. rhbz#533189 + * Makefile.am, configure.ac: Autotools - Makefile includes + dailyjobs, configure has new version. + +------------------------------------------------------------------- +Fri Feb 19 13:58:34 UTC 2010 - mseben(a)novell.com + +- added race-mtime_new.patch : to fix crontab -e crontab file + timestamp race condition (bnc#580800) (CVE-2010-0424) + +------------------------------------------------------------------- +Wed Feb 3 22:03:53 UTC 2010 - mseben(a)novell.com + +- added nheader_lines.diff : ignore top three lines of comments in + crontab file when user use crontab -e +- added $RPM_OPT_FLAGS to build stage + +------------------------------------------------------------------- +Sat Dec 19 18:13:04 CET 2009 - jengelh(a)medozas.de + +- enable parallel build + +------------------------------------------------------------------- +Thu Dec 17 07:28:54 UTC 2009 - mseben(a)novell.com + +- added subpackage cronie-anacron + +------------------------------------------------------------------- +Wed Dec 9 12:24:49 UTC 2009 - mseben(a)novell.com + +- added pam_conv.diff to add pam conversationfrom function +- added pam_config.diff to add pam config file from old cron +- added Provides: cron = 4.2, Obsoletes: cron <= 4.1 +- added SPOOL_DIR="/var/spool/cron/tabs" to build section to correct + tabs dir for users + +------------------------------------------------------------------- +Tue Dec 8 17:03:14 UTC 2009 - mseben(a)novell.com + +- added minuslog.diff and remove_old_system.diff + from cron package + +------------------------------------------------------------------- +Mon Dec 7 22:49:49 UTC 2009 - crrodriguez(a)opensuse.org + +- enable anacron build +- enable audit support +- cleanup spec file a bit + +------------------------------------------------------------------- +Sat Dec 5 21:36:57 UTC 2009 - mseben(a)novell.com + +- switch to cronie 1.4.3, see project page : + https://fedorahosted.org/cronie/ +- anacron and audit support disabled for now +- /usr/sbin/cron renamed to /usr/sbin/crond + +------------------------------------------------------------------- +Fri Nov 27 10:08:49 UTC 2009 - mseben(a)novell.com + +- added initgroups_check.patch : verify return value of + initgroups (bnc#537178) (CVE-2006-2607) + +------------------------------------------------------------------- +Wed Nov 18 17:18:44 UTC 2009 - mseben(a)novell.com + +- added pam conversion function (reworked pam.diff) fate#306386 + +------------------------------------------------------------------- +Wed Nov 18 14:39:49 UTC 2009 - mseben(a)novell.com + +- modified run-crons script : added support for new SEND_OUTPUT_ON_NO_ERROR + sysconfig option to block status mails from cron jobs with empty + output (fate#305279) + +------------------------------------------------------------------- +Tue Nov 3 19:09:11 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Wed Oct 14 18:28:22 CEST 2009 - ro(a)suse.de + +- init script: remove "-p $PIDFILE" from startproc call + (until startproc does allow to combine -f and -p again) + +------------------------------------------------------------------- +Fri Aug 22 16:42:20 CEST 2008 - prusnak(a)suse.cz + +- added -DWITH_SELINUX to DEFS + +------------------------------------------------------------------- +Thu Aug 21 01:52:40 CEST 2008 - ro(a)suse.de + +- remove outdated options from fillup_and_insserv call + +------------------------------------------------------------------- +Wed Aug 20 15:20:06 CEST 2008 - mkoenig(a)suse.de + +- enable SELinux support [fate#303662] + +------------------------------------------------------------------- +Wed Aug 13 15:25:44 CEST 2008 - mkoenig(a)suse.de + +- fix init script tags + +------------------------------------------------------------------- +Wed Jan 16 10:46:36 CET 2008 - mskibbe(a)suse.de + +- Fate #301837: CRON XLM Service Description Document + +------------------------------------------------------------------- +Tue Jan 8 13:16:38 CET 2008 - coolo(a)suse.de + +- let cron recommend postfix, so that the package solver knows + that one of the smtp_daemons is preferred by the distribution + in case the user has no further input on this (#351027) + +------------------------------------------------------------------- +Wed Dec 12 10:56:51 CET 2007 - mkoenig(a)suse.de + +- remove old *system* entries before database reload to avoid + comparing wrong mtimes. [#344667] + +------------------------------------------------------------------- +Mon Dec 10 13:19:01 CET 2007 - mkoenig(a)suse.de + +- prevent cron.monthly running twice in a month [#338474] + +------------------------------------------------------------------- +Wed Dec 5 15:47:53 CET 2007 - mkoenig(a)suse.de + +- revert last change, it was wrong [#346150] + +------------------------------------------------------------------- +Wed Nov 28 12:10:12 CET 2007 - mkoenig(a)suse.de + +- fix calculation of time difference in run-crons script + +------------------------------------------------------------------- +Tue Nov 27 17:03:55 CET 2007 - mkoenig(a)suse.de + +- fix problem with DAILY_TIME set to 00:00 + +------------------------------------------------------------------- +Wed Nov 7 10:57:07 CET 2007 - mkoenig(a)suse.de + +- add %fillup_prereq and %insserv_prereq to Prereq + +------------------------------------------------------------------- +Tue Oct 16 14:17:35 CEST 2007 - mkoenig(a)suse.de + +- move ac power test to the beginning of the run_crons script, + to avoid creation of the tmpdir [#333751] + +------------------------------------------------------------------- +Tue Jun 19 18:48:21 CEST 2007 - dmueller(a)suse.de + +- cron should depend on smtp ++++ 673 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/cronie/cronie.changes calling whatdependson for head-i586 New: ---- cron.init cron.xml cronie-1.4.5_git201007091204.tar.bz2 cronie-crond_pid.diff cronie-nheader_lines.diff cronie-pam_config.diff cronie-rpmlintrc cronie.changes cronie.spec cronie.xml deny.sample run-crons sample.root ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cronie.spec ++++++ # # spec file for package cronie (Version 1.4.5_git201007091204) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: cronie BuildRequires: audit-devel libselinux-devel pam-devel Url: https://fedorahosted.org/cronie/ License: MIT and BSD and GPLv2 Group: System/Daemons Requires: smtp_daemon Recommends: postfix AutoReqProv: on PreReq: permissions %fillup_prereq %insserv_prereq Version: 1.4.5_git201007091204 Release: 1 Summary: Cron Daemon Source0: %name-%version.tar.bz2 Source1: cron.init Source2: run-crons Source3: sample.root Source4: deny.sample Source5: cron.xml Source6: cronie-rpmlintrc # PATCH-FEATURE-OPENSUSE cronie-pam_config.diff added pam config file from old cron Patch3: %name-pam_config.diff # openSUSE set NHEADER_LINES to 3 - old openSUSE cron put three lines of comments # in top of crontab file, so we want to hide this junk comments if user edit # crontab file with crontab -e command, patch grabbed from old openSUSE cron Patch4: %name-nheader_lines.diff # we use cron.pid instead of crond.pid Patch5: %name-crond_pid.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: cron = 4.2 Obsoletes: cron <= 4.1 %description cron automatically starts programs at specific times. Add new entries with "crontab -e". (See "man 5 crontab" and "man 1 crontab" for documentation.) Under /etc, find the directories cron.hourly, cron.daily, cron.weekly, and cron.monthly. Scripts and programs that are located there are started automatically. %package anacron License: MIT and BSD and GPLv2 Summary: Utility for running regular jobs Group: System Environment/Base Requires: %{name} = %{version} %description anacron Anacron becames part of cronie. Anacron is used only for running regular jobs. The default settings execute regular jobs by anacron, however this could be overloaded in settings. %prep %setup -q %patch3 -p1 %patch4 -p1 %patch5 -p1 %build autoreconf -fiv # fill macro CRON_VERSION it is used in top three lines of crontab file,should be reworked CFLAGS="$RPM_OPT_FLAGS -DCRON_VERSION=\\\"%{version}\\\"" %configure --with-audit --enable-anacron --with-pam --with-selinux --with-inotify --enable-pie SPOOL_DIR="/var/spool/cron/tabs" %{__make} %{?jobs:-j%jobs} %install %makeinstall %{__mkdir_p} -v %{buildroot}%{_localstatedir}/spool/cron/{tabs,lastrun} %{__mkdir_p} -v %{buildroot}%{_sysconfdir}/cron.{d,hourly,daily,weekly,monthly} %{__install} -v -m 600 %{SOURCE3} %{buildroot}/etc/crontab %{__install} -v -m 600 %{SOURCE4} %{buildroot}/etc/cron.deny %{__install} -v -d %{buildroot}/usr/lib/cron %{__install} -v %{SOURCE2} %{buildroot}/usr/lib/cron %{__install} -v -d %{buildroot}%{_sysconfdir}/init.d/ %{__install} -v -m744 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/cron %{__ln_s} -f ../../etc/init.d/cron %{buildroot}/usr/sbin/rccron %{__install} -m 644 contrib/anacrontab $RPM_BUILD_ROOT%{_sysconfdir}/anacrontab %{__install} -c -m755 contrib/0anacron $RPM_BUILD_ROOT%{_sysconfdir}/cron.hourly/0anacron %{__mkdir_p} $RPM_BUILD_ROOT/var/spool/anacron %{__mv} %{buildroot}%{_sbindir}/crond %{buildroot}%{_sbindir}/cron touch $RPM_BUILD_ROOT/var/spool/anacron/cron.daily touch $RPM_BUILD_ROOT/var/spool/anacron/cron.weekly touch $RPM_BUILD_ROOT/var/spool/anacron/cron.monthly # service xml %{__install} -v -d %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ %{__install} -v -m644 %{S:5} %{buildroot}%{_sysconfdir}/omc/srvinfo.d/ %post %{fillup_and_insserv -y cron} %run_permissions %verifyscript %verify_permissions -e /etc/crontab -e /usr/bin/crontab %preun %stop_on_removal cron %postun %restart_on_update cron %{insserv_cleanup} %post anacron [ -e /var/spool/anacron/cron.daily ] || touch /var/spool/anacron/cron.daily [ -e /var/spool/anacron/cron.weekly ] || touch /var/spool/anacron/cron.weekly [ -e /var/spool/anacron/cron.monthly ] || touch /var/spool/anacron/cron.monthly %files %defattr(-,root,root) %doc AUTHORS COPYING INSTALL README ChangeLog %dir %attr(700,root,root) /var/spool/cron %dir %attr(700,root,root) /var/spool/cron/tabs %dir /var/spool/cron/lastrun %config /etc/init.d/cron %config /etc/pam.d/crond %verify(not mode) %config(noreplace) /etc/crontab %config(noreplace) /etc/cron.deny %{_mandir}/man1/crontab.1.gz %{_mandir}/man5/crontab.5.gz %{_mandir}/man8/cron.8.gz %{_mandir}/man8/crond.8.gz %verify(not mode) %attr (4750,root,trusted) /usr/bin/crontab %attr (755,root,root) %{_sbindir}/cron %{_sbindir}/rccron /usr/lib/cron %config %{_sysconfdir}/omc/srvinfo.d/cron.xml %dir %{_sysconfdir}/omc/srvinfo.d/ %dir %{_sysconfdir}/omc/ %files anacron %defattr(-,root,root,-) %{_sbindir}/anacron %attr(0755,root,root) %{_sysconfdir}/cron.hourly/0anacron %config(noreplace) %{_sysconfdir}/anacrontab %dir /var/spool/anacron %ghost %verify(not md5 size mtime) /var/spool/anacron/cron.daily %ghost %verify(not md5 size mtime) /var/spool/anacron/cron.weekly %ghost %verify(not md5 size mtime) /var/spool/anacron/cron.monthly %{_mandir}/man5/anacrontab.* %{_mandir}/man8/anacron.* %changelog ++++++ cron.init ++++++ #! /bin/sh # Copyright (c) 1995-2000 SuSE GmbH Nuernberg, Germany. # # Author: Werner Fink <werner(a)suse.de>, 1996-2001 # # /etc/init.d/cron # # and symbolic its link # # /usr/sbin/rccron # # System startup script for the cron daemon # ### BEGIN INIT INFO # Provides: cron # Required-Start: $remote_fs $syslog $time # Should-Start: $network smtp # Required-Stop: $remote_fs $syslog # Should-Stop: $network smtp # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Short-Description: Cron job service # Description: Cron job service ### END INIT INFO CRON_BIN=/usr/sbin/cron test -x $CRON_BIN || exit 5 PIDFILE=/var/run/cron.pid # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. allow_deny_move_info() { echo "WARNING: /var/spool/cron/allow and /var/spool/cron/deny have moved" echo "to /etc/cron.allow and /etc/cron.deny." echo "Please merge or move these files to get cron access rules restored." } case "$1" in start) for al_de in {allow,deny}{,.rpmsave,.rpmorig} ; do if [ -f /var/spool/cron/$al_de ] ; then allow_deny_move_info break fi done echo -n "Starting CRON daemon" ## Start daemon with startproc(8). If this fails ## the echo return value is set appropriate. # NOTE: startproc return 0, even if service is # already running to match LSB spec. startproc -p $PIDFILE $CRON_BIN #startproc -f $CRON_BIN # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down CRON daemon" ## Stop daemon with killproc(8) and if this fails ## set echo the echo return value. killproc -TERM -p $PIDFILE $CRON_BIN # Remember status and be verbose rc_status -v ;; try-restart) ## Stop the service and if this succeeds (i.e. the ## service was running before), start it again. ## Note: try-restart is not (yet) part of LSB (as of 0.7.5) $0 status >/dev/null && $0 restart # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. echo -n "Reload service Cron" ## if it supports it: ## cron monitors /etc/crontab anyway checkproc $CRON_BIN rc_status -v ## Otherwise: #$0 stop && $0 start #rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signalling, do nothing (!) ## Otherwise if it does not support reload: rc_status -v ;; status) echo -n "Checking for Cron: " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Status has a slightly different for the status command: # 0 - service running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running # NOTE: checkproc returns LSB compliant status values. checkproc $CRON_BIN rc_status -v ;; probe) ## Optional: Probe for the necessity of a reload, ## give out the argument which is required for a reload. ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ cronie-crond_pid.diff ++++++ Index: cronie-1.4.4/src/pathnames.h =================================================================== --- cronie-1.4.4.orig/src/pathnames.h +++ cronie-1.4.4/src/pathnames.h @@ -41,7 +41,7 @@ #else # define PIDDIR SYSCONFDIR "/" #endif -#define PIDFILE "crond.pid" +#define PIDFILE "cron.pid" #define _PATH_CRON_PID PIDDIR PIDFILE #define REBOOT_LOCK PIDDIR "cron.reboot" ++++++ cronie-nheader_lines.diff ++++++ Index: cronie-1.4.3/src/crontab.c =================================================================== --- cronie-1.4.3.orig/src/crontab.c +++ cronie-1.4.3/src/crontab.c @@ -33,7 +33,7 @@ # include <selinux/av_permissions.h> #endif -#define NHEADER_LINES 0 +#define NHEADER_LINES 3 enum opt_t {opt_unknown, opt_list, opt_delete, opt_edit, opt_replace}; @@ -347,7 +347,7 @@ static char *tmp_path() { static void edit_cmd(void) { char n[MAX_FNAME], q[MAX_TEMPSTR], *editor; FILE *f; - int ch = '\0', t; + int ch = '\0', t, x; struct stat statbuf; struct utimbuf utimebuf; WAIT_T waiter; @@ -399,13 +399,25 @@ static void edit_cmd(void) { } Set_LineNum(1) - /* - * NHEADER_LINES processing removed for clarity - * (NHEADER_LINES == 0 in all Red Hat crontabs) - */ - /* copy the rest of the crontab (if any) to the temp file. - */ - if (EOF != ch) + + /* ignore the top few comments since we probably put them there. + */ + x = 0; + while (EOF != (ch = get_char(f))) { + if ('#' != ch) { + putc(ch, NewCrontab); + break; + } + while (EOF != (ch = get_char(f))) + if (ch == '\n') + break; + if (++x >= NHEADER_LINES) + break; + } + + /* copy the rest of the crontab (if any) to the temp file. + */ + if (EOF != ch) while (EOF != (ch = get_char(f))) putc(ch, NewCrontab); @@ -605,6 +617,7 @@ static int replace_cmd(void) { int error = 0; entry *e; uid_t file_owner; + time_t now = time(NULL); char **envp = env_init(); if (envp == NULL) { @@ -636,10 +649,10 @@ static int replace_cmd(void) { * * VERY IMPORTANT: make sure NHEADER_LINES agrees with this code. */ - /*fprintf(tmp, "# DO NOT EDIT THIS FILE - edit the master and reinstall.\n"); - *fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now)); - *fprintf(tmp, "# (Cron version %s)\n", CRON_VERSION); - */ + fprintf(tmp, "# DO NOT EDIT THIS FILE - edit the master and reinstall.\n"); + fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now)); + fprintf(tmp, "# (Cronie version %s)\n", CRON_VERSION); + #ifdef WITH_SELINUX if (selinux_context) fprintf(tmp, "SELINUX_ROLE_TYPE=%s\n", selinux_context); ++++++ cronie-pam_config.diff ++++++ w Index: cronie-1.4.4/pam/crond =================================================================== --- cronie-1.4.4.orig/pam/crond +++ cronie-1.4.4/pam/crond @@ -3,8 +3,9 @@ # # # No PAM authentication called, auth modules not needed -account required pam_access.so -account include password-auth -session required pam_loginuid.so -session include password-auth -auth include password-auth +auth sufficient pam_rootok.so +auth include common-auth +account include common-account +password include common-password +session required pam_loginuid.so +session include common-session ++++++ cronie-rpmlintrc ++++++ # This line is mandatory to access the configuration functions from Config import * addFilter("cronie.* incoherent-init-script-name")++++++ deny.sample ++++++ guest ++++++ run-crons ++++++ #!/bin/bash # # /usr/lib/cron/run-crons # # Copyright (c) 1998-2001 SuSE GmbH Nuernberg, Germany. All rights reserved. # # this script looks into /etc/cron.{hourly,daily,weekly,monthly} for # scripts to be executed. The info about last run is stored in # /var/spool/cron/lastrun # # concept similar to debian and redhat # # Changes: # 1998 - Burchard Steinbild <bs(a)suse.de>, 1998 # initial version # before 2001 - va(a)org.chemie.uni-frankfurt.de # send an email with name of date-script instead of cron entry # "Subject: cronjob@www - daily - FAILURE" # (better one script for each date-sub-script) # requires changes to /etc/crontab # append > /dev/null 2>&1 to the line calling run-cons # 2001-09-11 # updated to Suse 7.2 merged # 2001-09-12 # changed FAILURE detection, until now all scripts with output # had "failed", now only scripts with error status != 0 # have failed. # 2001-09-13 - ro(a)suse.de # merged with 7.3: call logger with exit value for scripts # respect MAILTO as cron does # use mktemp -d for all tmpfiles # add variable to disable mail if all jobs returned 0 # # # Don't run jobs on laptops, that are AC-offline # if test -x /usr/bin/on_ac_power ; then on_ac_power -q if [ "$?" = "1" ]; then exit 0 fi fi if [ -f /etc/sysconfig/cron ]; then . /etc/sysconfig/cron fi BASENAME=`/usr/bin/basename $0` LOGGER="/bin/logger -t $BASENAME[$$]" export LC_TIME=POSIX TMPDIR=`mktemp -d /tmp/run-crons.XXXXXX` trap "rm -rf $TMPDIR" 0 1 2 3 13 15 # We will force to run cron.daily after 14 days, even # if you set MAX_NOT_RUN in /etc/sysconfig/cron # value is in minutes MAX_NOT_RUN_FORCE="20160" # Priority change for sub scripts. # range: highest -20 ... 19 lowest prioriy # default processes start in level 10 CRON_SCRIPT_NICE_VALUE=15 SPOOL=/var/spool/cron/lastrun # CRON Result EMail is sent to if test -z "$MAILTO" ; then SEND_TO="root" else SEND_TO="$MAILTO" fi mkdir -p $SPOOL #set verbose ## stage 1, search directories/scripts to run RUN="" for CRONDIR in /etc/cron.{hourly,daily,weekly,monthly} ; do test -d $CRONDIR || continue BASE=${CRONDIR##*/} TIME_EXT=${BASE##cron.} test -e $SPOOL/$BASE && { case $BASE in cron.hourly) TIME="-cmin +60 -or -cmin 60" ;; cron.daily) # if DAILY_TIME set, run only at a fixed time of day if [ "$DAILY_TIME" != "" ] ; then DAILY_TIME_NEW="`echo $DAILY_TIME | sed s,:,, | sed s,^0\*,, `" test -z "$DAILY_TIME_NEW" && DAILY_TIME_NEW=0 if [ "$DAILY_TIME_NEW" -gt "2359" ] ; then echo "wrong time format in /etc/sysconfig/cron DAILY_TIME, value is $DAILY_TIME" | logger fi NOW_H=`date +%H%M| sed s,^0\*,,` test -z "$NOW_H" && NOW_H=0 if [ $DAILY_TIME_NEW -gt $(($NOW_H-15)) ] && [ $DAILY_TIME_NEW -le $NOW_H ]; then TIME="" else # take care of MAX_NOT_RUN, default is 7 days if [ "$MAX_NOT_RUN" != "0" ] ; then TIME="-cmin +$((1440*$MAX_NOT_RUN)) -or -cmin $((1440*$MAX_NOT_RUN))" else TIME="-cmin +$MAX_NOT_RUN_FORCE -or -cmin $MAX_NOT_RUN_FORCE" fi fi # run as usual else TIME="-cmin +1440 -or -cmin 1440" fi ;; cron.weekly) TIME="-cmin +10080 -or -cmin 10080" ;; cron.monthly) DAYOFMONTH=`date '+%d'` DAYSLASTMONTH=`date -d "-$DAYOFMONTH days" '+%d'` if [ $DAYOFMONTH -gt $DAYSLASTMONTH ] ; then LASTMONTHSTR="-$DAYOFMONTH days" else LASTMONTHSTR="last month" fi NOW=`date +%s` LASTMONTH=`date -d "$LASTMONTHSTR" +%s` DIFF=`expr '(' $NOW - $LASTMONTH ')' / 86400` TIME="-ctime +$DIFF" ;; esac # remove all lock files for scripts that are due to run eval find $SPOOL/$BASE $TIME | \ xargs --no-run-if-empty rm } if test ! -e $SPOOL/$BASE ; then # accept this dir, if it isn't empty LIST=`find $CRONDIR ! -type d` if [ ! -z "$LIST" ] ; then RUN="${RUN} ${TIME_EXT}" fi fi done ## STATUS communication variable between # function run_scripts () # and loop-over-all-scripts # set in run_scripts to FAILURE if this script failed! # else it is empty # because it is never reset to empty after the initialization # it implements an OR like logic over all scripts ## STATUS="" # helper, run all scripts in one cron directory function run_scripts (){ local CRONDIR=$1 local TIME_EXT=$2 local TEMP_MSG=$TMPDIR/run-crons.${TIME_EXT}.$$ rm -r $TMPDIR/run-crons.${TIME_EXT}.* >/dev/null 2>&1 # keep going when something fails set +e for SCRIPT in $CRONDIR/* ; do test -d $SCRIPT && continue case "$SCRIPT" in .svn) continue ;; *.rpm*) continue ;; *.swap) continue ;; *.bak) continue ;; *.orig) continue ;; \#*) continue ;; *~) continue ;; esac /sbin/checkproc $SCRIPT && continue if test -x $SCRIPT ; then BASESCRIPT=`/usr/bin/basename $SCRIPT` nice -n ${CRON_SCRIPT_NICE_VALUE} $SCRIPT >$TEMP_MSG 2>&1 local ERRNO=$? if [ 0 -eq $ERRNO ] ; then if [ "$SYSLOG_ON_NO_ERROR" = "yes" ]; then echo "$BASESCRIPT: OK" | $LOGGER -p info fi else echo "$BASESCRIPT returned $ERRNO" | $LOGGER -p warn echo "SCRIPT: $BASESCRIPT exited with RETURNCODE = $ERRNO." STATUS="FAILURE" fi # write some wrapper text around the original output if [ -s "$TEMP_MSG" ] ; then echo "SCRIPT: output (stdout && stderr) follows" echo "" cat $TEMP_MSG echo -e "SCRIPT: $BASESCRIPT\n------- END OF OUTPUT" echo "" echo "" fi rm -f $TEMP_MSG > /dev/null 2>&1 else echo "WARNING: $SCRIPT is not executable, script is ignored !" fi done } # stage 2: # run all scripts and collect output into one mail # for each TIME_EXT with a meaningfull subject. # if [ ! -z "${RUN}" ] ; then for EXT in ${RUN} ; do CRONDIR="/etc/cron."${EXT} test -d $CRONDIR || continue BASE=`/usr/bin/basename $CRONDIR` TIME_EXT=${BASE##cron.} STATUS="" if test ! -e $SPOOL/$BASE ; then CONTROL_MAIL=$TMPDIR/run-crons_mail.$$ JOB_OUTPUT=$TMPDIR/run-crons_output.$$ echo "running ${TIME_EXT} cronjob scripts" >> ${CONTROL_MAIL} echo "" >> ${CONTROL_MAIL} touch $SPOOL/$BASE run_scripts ${CRONDIR} ${TIME_EXT} >> ${JOB_OUTPUT} 2>&1 TITLE="cronjob@$HOSTNAME - ${TIME_EXT}" if [ -n "${STATUS}" ] ; then TITLE="${TITLE} - ${STATUS}" else TITLE="${TITLE} - OK" fi if [ -n "${STATUS}" -o "$SEND_MAIL_ON_NO_ERROR" = "yes" ] ; then cat ${CONTROL_MAIL} ${JOB_OUTPUT} | mail ${SEND_TO} -s "${TITLE}" elif [ -s ${JOB_OUTPUT} -a "$SEND_OUTPUT_ON_NO_ERROR" = "yes" ] ; then cat ${CONTROL_MAIL} ${JOB_OUTPUT} | mail ${SEND_TO} -s "${TITLE}" fi rm -f ${CONTROL_MAIL} ${JOB_OUTPUT} fi done fi # # now make sure, we have no lastrun files dated to future # touch $SPOOL NOW=`date -u +%s` for i in `find $SPOOL -type f` do FILEDATE=`date -u -r $i +%s` # allow for up to one hour in the future because of summer/wintertime if [ $((FILEDATE - NOW)) -gt 3600 ] then rm $i fi done ++++++ sample.root ++++++ SHELL=/bin/sh PATH=/usr/bin:/usr/sbin:/sbin:/bin:/usr/lib/news/bin MAILTO=root # # check scripts in cron.hourly, cron.daily, cron.weekly, and cron.monthly # -*/15 * * * * root test -x /usr/lib/cron/run-crons && /usr/lib/cron/run-crons >/dev/null 2>&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

commit rfc for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Mon Sep 27 17:39:09 CEST 2010. -------- --- AUTO/all/rfc/rfc.changes 2010-09-26 15:44:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2010-09-27 13:43:17.000000000 +0200 @@ -2 +2 @@ -Sun Sep 26 15:44:28 CEST 2010 - autobuild(a)suse.de +Mon Sep 27 13:43:16 CEST 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-09-26 +- automated update on 2010-09-27 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.8vsFUK/_old 2010-09-27 17:39:04.000000000 +0200 +++ /var/tmp/diff_new_pack.8vsFUK/_new 2010-09-27 17:39:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rfc (Version 2010.9.26) +# spec file for package rfc (Version 2010.9.27) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2010.9.26 +Version: 2010.9.27 Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, line 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

commit opensuse-manuals_de for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package opensuse-manuals_de for openSUSE:Factory checked in at Mon Sep 27 17:38:51 CEST 2010. -------- --- opensuse-manuals_de/opensuse-manuals_de.changes 2009-11-09 13:13:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/opensuse-manuals_de/opensuse-manuals_de.changes 2010-09-22 14:52:20.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Sep 22 14:45:30 CEST 2010 - ke(a)suse.de + +- Add more Provides/Obsoletes: opensuse-apparmor-admin_de-pdf, + opensuse-kdeuser_de-pdf, opensuse-gnomeuser_de-pdf, + opensuse-apps_de-pdf, opensuse-security_de-pdf. + +------------------------------------------------------------------- +Tue Sep 21 14:10:06 CEST 2010 - ke(a)suse.de + +- Update text and image files; bnc#639823. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- LICENSE.txt opensuse-gnomequick-LICENSE.txt opensuse-installquick-LICENSE.txt opensuse-kdequick-LICENSE.txt opensuse-reference-LICENSE.txt opensuse-startup-LICENSE.txt pre_checkin.sh update_spec.pl New: ---- doc_pre_checkin.sh opensuse-gnomequick_de-pdf-yelp.tar.bz2 opensuse-installquick_de-pdf-yelp.tar.bz2 opensuse-kdequick_de-pdf-yelp.tar.bz2 opensuse-reference_de-pdf-yelp.tar.bz2 opensuse-startup_de-pdf-yelp.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_de.spec ++++++ --- /var/tmp/diff_new_pack.6b2Vhi/_old 2010-09-27 17:38:38.000000000 +0200 +++ /var/tmp/diff_new_pack.6b2Vhi/_new 2010-09-27 17:38:38.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package opensuse-manuals_de (Version 11.2) +# spec file for package opensuse-manuals_de (Version 11.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,17 +20,26 @@ Name: opensuse-manuals_de %define my_lang de -%define my_prov_obs suselinux-adminguide_%{my_lang} suselinux-userguide_%{my_lang} suselinux-manual_%{my_lang} %define my_book opensuse-html -Version: 11.2 -Release: 2 -Obsoletes: %{my_prov_obs} -Provides: %{my_prov_obs} +Version: 11.3 +Release: 1 Provides: locale(desktop-data-openSUSE:de) -Obsoletes: opensuse-manual_de opensuse-quickstart_de opensuse-kdequick_de opensuse-gnomequick_de opensuse-gnomeuser_de opensuse-kdeuser_de opensuse-kde3user_de apparmor-admin_de -Provides: opensuse-manual_de opensuse-quickstart_de opensuse-kdequick_de opensuse-gnomequick_de opensuse-gnomeuser_de opensuse-kdeuser_de opensuse-kde3user_de apparmor-admin_de +Obsoletes: opensuse-manual_de < 11.2 opensuse-kdequick_de < 11.1 opensuse-gnomequick_de < 11.1 opensuse-gnomeuser_de < 11.1 opensuse-kdeuser_de < 11. opensuse-kde3user_de < 11.1 apparmor-admin_de < 11.1 +Provides: opensuse-manual_de = %{version}-%{release} opensuse-kdequick_de = %{version}-%{release} opensuse-gnomequick_de = %{version}-%{release} opensuse-gnomeuser_de = %{version}-%{release} opensuse-kdeuser_de = %{version}-%{release} opensuse-kde3user_de = %{version}-%{release} apparmor-admin_de = %{version}-%{release} +Obsoletes: opensuse-manual_de-pdf < 11.2 opensuse-kde3user_de-pdf < 11.1 opensuse-manuals_de-pdf < 11.3 +Provides: opensuse-manual_de-pdf = %{version}-%{release} opensuse-kde3user_de-pdf = %{version}-%{release} opensuse-manuals_de-pdf = %{version}-%{release} +Obsoletes: opensuse-apparmor-admin_de-pdf < 11.2 +Obsoletes: opensuse-apps_de-pdf < 11.3 +Obsoletes: opensuse-gnomeuser_de-pdf < 11.3 +Obsoletes: opensuse-kdeuser_de-pdf < 11.3 +Obsoletes: opensuse-security_de-pdf < 11.3 +Provides: opensuse-apparmor-admin_de-pdf = %{version}-%{release} +Provides: opensuse-apps_de-pdf = %{version}-%{release} +Provides: opensuse-gnomeuser_de-pdf = %{version}-%{release} +Provides: opensuse-kdeuser_de-pdf = %{version}-%{release} +Provides: opensuse-security_de-pdf = %{version}-%{release} + #OBS -Source09: LICENSE.txt Source00: opensuse-html_de-html.tar.bz2 Source01: opensuse-html_de-desktop.tar.bz2 Source02: opensuse-html_de-graphics.tar.bz2 @@ -38,112 +47,130 @@ Source10: opensuse-installquick_de.pdf #Source11: opensuse-installquick_de-graphics.tar.bz2 #Source12: opensuse-installquick_de.tar.bz2 -Source13: opensuse-installquick-LICENSE.txt +Source13: opensuse-installquick_de-pdf-yelp.tar.bz2 Source20: opensuse-gnomequick_de.pdf #Source21: opensuse-gnomequick_de-graphics.tar.bz2 #Source22: opensuse-gnomequick_de.tar.bz2 -Source23: opensuse-gnomequick-LICENSE.txt +Source23: opensuse-gnomequick_de-pdf-yelp.tar.bz2 Source30: opensuse-kdequick_de.pdf #Source31: opensuse-kdequick_de-graphics.tar.bz2 #Source32: opensuse-kdequick_de.tar.bz2 -Source33: opensuse-kdequick-LICENSE.txt +Source33: opensuse-kdequick_de-pdf-yelp.tar.bz2 Source40: opensuse-reference_de.pdf #Source41: opensuse-reference_de-graphics.tar.bz2 #Source42: opensuse-reference_de.tar.bz2 -Source43: opensuse-reference-LICENSE.txt +Source43: opensuse-reference_de-pdf-yelp.tar.bz2 Source50: opensuse-startup_de.pdf #Source51: opensuse-startup_de-graphics.tar.bz2 #Source52: opensuse-startup_de.tar.bz2 -Source53: opensuse-startup-LICENSE.txt +Source53: opensuse-startup_de-pdf-yelp.tar.bz2 #SOURCES -Source901: pre_checkin.sh -Source902: update_spec.pl +Source901: doc_pre_checkin.sh Source903: attributes BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: update-desktop-files Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE Manual (German) +License: GFDLv1.2 +Summary: Complete set of openSUSE Manuals (HTML, German) %define _defaultdocdir %{_datadir}/doc/manual %define _docdir %{_datadir}/doc/manual -%define PDFDOC %{_defaultdocdir}/%{name}-pdf %description -The openSUSE manual package contains the Start-Up, Reference, AppArmor -Quick Start (English) , AppArmor Administration Guide (English), GNOME -and KDE Quick Start, GNOME and KDE User Guide (English), and the -Application Guide (English). +Contains the complete official openSUSE documentation in HTML +format. It can be accessed via the Desktop's help centers. +The following manuals are included: + +* Installation Quick Start + +* Start-Up + +* GNOME Quick Start + +* GNOME User Guide (English) + +* KDE Quick Start + +* KDE User Guide (English) + +* Application Guide (English) + +* Reference + +* Security Guide (English) + +* AppArmor Quick Start (English) %package -n opensuse-installquick_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE Install Quickstart (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: Installation Quick Start (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-installquick_de-pdf -PDF of the openSUSE Install Quickstart (German). +A quick start guide providing a walk-through to the default installation. %package -n opensuse-gnomequick_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE GNOME Quickstart (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: GNOME Quick Start (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-gnomequick_de-pdf -PDF of the openSUSE GNOME Quickstart (German). +A quick start guide to the GNOME desktop. %package -n opensuse-kdequick_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE KDE Quickstart (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: KDE Quick Start (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-kdequick_de-pdf -PDF of the openSUSE KDE Quickstart (German). +A quick start guide to the KDE desktop. %package -n opensuse-reference_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE Manual (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: Reference (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-reference_de-pdf -PDF of the openSUSE Manual (German). +This guide gives you a general understanding of your system and +covers advanced system administration tasks. It is intended +mainly for system administrators and home users with basic system +administration knowledge. It provides detailed information about +advanced deployment scenarios, administration of your system, +the interaction of key system components and the set-up of +various network and file services. %package -n opensuse-startup_de-pdf Group: Documentation/SUSE -License: GFDL v1.2 -Summary: openSUSE Manual (German) as PDF +License: GFDLv1.2 +Summary: openSUSE manual: Start-Up (PDF, German) #Provides: locale(desktop-data-openSUSE:de) ###PDFOBS %description -n opensuse-startup_de-pdf -PDF of the openSUSE Manual (German). - -%package pdf -Group: Documentation/SuSE -License: GFDL -Summary: SUSE LINUX Adminguide (english) -Provides: locale(desktop-data-openSUSE:de) -Obsoletes: opensuse-manual_de-pdf opensuse-quickstart_de-pdf opensuse-kde3user_de-pdf -Provides: opensuse-manual_de-pdf opensuse-quickstart_de-pdf opensuse-kde3user_de-pdf -#PDFOBS - -%description pdf -- +Guides you through the installation and basic configuration of your +system. For newcomers, the manual also introduces basic Linux concepts +such as the file system, the user concept and access permissions and +gives an overview of the features the system offers to support +mobile computing. Provides help and advice in troubleshooting. %prep #%setup -c -q %setup -c -q -a 01 -echo "This PDF package is empty. Find the PDFs in sub-packages." >README-pdf +#echo "This PDF package is empty. Find the PDFs in sub-packages." >README-pdf #PREP -cp %{S:9} . find -name '*.png' -o -name '*.svg' | xargs chmod 644 || : +tar xvf %{S:13} +tar xvf %{S:23} +tar xvf %{S:33} +tar xvf %{S:43} +tar xvf %{S:53} #PDFPREP %build @@ -157,17 +184,15 @@ %install mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} # is set for sles or sled as /sles or /sled -%define my_desktopdir /usr/share/susehelp/meta -echo %{my_desktopdir} | sed 's:$\|xyzy$::' >filelist # mkdir -p desktop/{startup,reference,application,apparmor-admin-guide} ### -install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name} # product is name without language code %define gnome_dir %{_datadir}/gnome/help/opensuse-manuals install -d $RPM_BUILD_ROOT%{gnome_dir} # if [ -d html/%my_book ]; then mv html/%my_book html/manual +### handle desktop files pushd desktop # problem writing desktop files on 10.3 ### CHECKIT: still necessary on 11.0? @@ -188,17 +213,6 @@ rmdir $dir fi fi -for f in $(find . -type f -name '*desktop'); do - # /usr/share/doc/manual/suselinux-manual_en/manual - sed -i "/^X-DOC-Identifier.*/d -s|@PATH@|%{_defaultdocdir}/%{name}/manual| -s/\[\]//" $f - if ! grep -q -e '^Name *=' $f; then - # requiered if no "Name=" is present - sed -i "s|^Name\[.*\]$=.*$|Name\1\\ -&|" $f - fi -done for d in $(find . -maxdepth 1 -type d -name 'book*'); do id=${d//\./} id=${id//\//}%{my_lang} @@ -215,6 +229,8 @@ done popd done +### remove it, only keep yelp and kde4 -- they depend on top-level +### .directory files... # Probably useful for stand-alone books for f in $(find . -name '*.directory'); do id=%{name} @@ -226,6 +242,7 @@ if [ $f = ./.directory ]; then sed -i 's:$^DocPath.*/$.*:\1index.html: s/^$Name\|Comment$$.*$/\1\2 (%{my_lang})/' $f + # write yelp / rarian file sed " # remove useless comments and search settings @@ -241,10 +258,12 @@ s/^X-DOC-Identifier=/DocIdentifier=com.novell./ s/^X-DOC-Weight/DocWeight/ " $f > ../%{name}.document - my_title=$(echo "%{summary}" | sed 's/[Pp][Dd][Ff]//;s/(.*)//') - #if grep -s -q '^Name *= *$' ../%{name}.document; then - sed -i " -s/^$Name.*$=$.*$/\1=$my_title \2/" ../%{name}.document +# %{summary} is unreliable +# my_title=$(echo "%{summary}" \ +# | sed 's/$as $*[Pp][Dd][Ff]//;s/ *(.*)//') +# #if grep -s -q '^Name *= *$' ../%{name}.document; then +# sed -i " +# s/^$Name.*$=$.*$/\1=$my_title \2/" ../%{name}.document # fi # if Name contains just "Documentation", add product info # FIXME: check this properly @@ -253,23 +272,52 @@ s/^$Name.*$=$.*$/\1=openSUSE \2/" ../%{name}.document fi fi - # make sure to sort startup guide first + # make sure to sort sles-startup guide first case %name in sles-startup*) [ $f = "./.directory" ] \ && sed -i "s|^$X-DOC-Weight$.*|\1=-2000|" $f ;; esac done -cp -a . $RPM_BUILD_ROOT%{my_desktopdir}/%{name} -cp %{S:100} $RPM_BUILD_ROOT%{my_desktopdir}/.directory || : +popd +if [ -d yelp ]; then + pushd yelp + for f in *.document; do + dir=${f%.document} + pdf_file=${dir/-pdf/.pdf} + dir=$(echo $dir | tr [:upper:] [:lower:]) + sed -i "s|^$DocPath=$.*|\1/usr/share/doc/manual/$dir/$pdf_file| +s|^Categories=.*|Categories=System;Core;Translation;Documentation| +s|^$Name.*$|\1 (PDF)|" $f + done +fi popd if [ %{my_lang} = "en" ]; then mkdir -p $RPM_BUILD_ROOT%{_datadir}/help - cp %{name}.document $RPM_BUILD_ROOT%{_datadir}/help/%{name}.document + for f in yelp/*.document; do + file=$(echo $f | tr [:upper:] [:lower:]) + cp $f $RPM_BUILD_ROOT%{_datadir}/help/${file#*/} + done + sed "s/Documentation *$Documentation$/\1/" %{name}.document \ + > $RPM_BUILD_ROOT%{_datadir}/help/%{name}.document + # KDE4 + %define kdedir %{_datadir}/kde4/apps/khelpcenter/plugins + mkdir -p $RPM_BUILD_ROOT/%kdedir + pushd $RPM_BUILD_ROOT%{_datadir}/help + for doc in *.document; do + sed "\ +s/\[Document\]/[Desktop Entry]/ +" $doc >$RPM_BUILD_ROOT/%kdedir/${doc%\.document}.desktop + done + popd else mkdir -p $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang} - cp %{name}.document \ - $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/%{name}.document + for f in yelp/*.document; do + file=$(echo $f | tr [:upper:] [:lower:]) + cp $f $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/${file#*/} + done + sed "s/Documentation *$Documentation$/\1/" %{name}.document \ + > $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/%{name}.document fi # old stuff # Link it into the Gnome help system (must be found by calling @@ -290,74 +338,68 @@ install -d html/manual echo PDF only > html/manual/%{name} fi -if [ -f $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory ]; then - %suse_update_desktop_file $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory -fi cp %{S:10} . mkdir opensuse-installquick -cp %{S:13} opensuse-installquick/LICENSE.txt + cp %{S:20} . mkdir opensuse-gnomequick -cp %{S:23} opensuse-gnomequick/LICENSE.txt + cp %{S:30} . mkdir opensuse-kdequick -cp %{S:33} opensuse-kdequick/LICENSE.txt + cp %{S:40} . mkdir opensuse-reference -cp %{S:43} opensuse-reference/LICENSE.txt + cp %{S:50} . mkdir opensuse-startup -cp %{S:53} opensuse-startup/LICENSE.txt + #PDFINST %clean rm -fr ${RPM_BUILD_ROOT} -%files pdf -%defattr(-, root, root) -%dir %{_defaultdocdir} -# we ship opensuse-manual_$LL-pdf just because of the provides/obsoletes -%doc LICENSE.txt -# %doc *.pdf -%doc README-pdf #PDFXXX %files -n opensuse-installquick_de-pdf %defattr(-, root, root) %doc opensuse-installquick_de.pdf -%doc opensuse-installquick/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-installquick_de-pdf.document %files -n opensuse-gnomequick_de-pdf %defattr(-, root, root) %doc opensuse-gnomequick_de.pdf -%doc opensuse-gnomequick/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-gnomequick_de-pdf.document %files -n opensuse-kdequick_de-pdf %defattr(-, root, root) %doc opensuse-kdequick_de.pdf -%doc opensuse-kdequick/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-kdequick_de-pdf.document %files -n opensuse-reference_de-pdf %defattr(-, root, root) %doc opensuse-reference_de.pdf -%doc opensuse-reference/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-reference_de-pdf.document %files -n opensuse-startup_de-pdf %defattr(-, root, root) %doc opensuse-startup_de.pdf -%doc opensuse-startup/LICENSE.txt +%{_datadir}/help/LOCALE/de/opensuse-startup_de-pdf.document + #PDFFILES %files %defattr(-, root, root) %dir %{_defaultdocdir} %doc html/manual -%{my_desktopdir} -%dir %{_datadir}/susehelp -%dir %{_datadir}/susehelp/meta +#GNOME -- probably obsolete now %{gnome_dir} %dir /usr/share/gnome %dir /usr/share/gnome/help +#recent GNOME %dir %{_datadir}/help -%{_datadir}/help/* +%dir %{_datadir}/help/LOCALE +%dir %{_datadir}/help/LOCALE/de +%{_datadir}/help/LOCALE/de/%{name}.document +#KDE4 + %changelog ++++++ attributes ++++++ --- /var/tmp/diff_new_pack.6b2Vhi/_old 2010-09-27 17:38:38.000000000 +0200 +++ /var/tmp/diff_new_pack.6b2Vhi/_new 2010-09-27 17:38:38.000000000 +0200 @@ -1,89 +1,119 @@ -group.opensuse-manuals_de Documentation/SUSE -license.opensuse-manuals_de GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-manuals_de openSUSE Manual (German) +group.opensuse-manuals_de Documentation/SUSE +license.opensuse-manuals_de GFDL v1.2 +summary.opensuse-manuals_de Complete set of openSUSE Manuals (HTML, German) +description.opensuse-manuals_de -The openSUSE manual package contains the Start-Up, Reference, AppArmor -Quick Start (English) , AppArmor Administration Guide (English), GNOME -and KDE Quick Start, GNOME and KDE User Guide (English), and the -Application Guide (English). +Contains the complete official openSUSE documentation in HTML +format. It can be accessed via the Desktop's help centers. +The following manuals are included: --description.opensuse-manuals_de -group.opensuse-installquick_de-pdf Documentation/SUSE -license.opensuse-installquick_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-installquick_de-pdf openSUSE Install Quickstart (German) as PDF -+description.opensuse-installquick_de-pdf -PDF of the openSUSE Install Quickstart (German). +* Installation Quick Start --description.opensuse-installquick_de-pdf -group.opensuse-gnomequick_de-pdf Documentation/SUSE -license.opensuse-gnomequick_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-gnomequick_de-pdf openSUSE GNOME Quickstart (German) as PDF -+description.opensuse-gnomequick_de-pdf -PDF of the openSUSE GNOME Quickstart (German). +* Start-Up + +* GNOME Quick Start + +* GNOME User Guide (English) +* KDE Quick Start + +* KDE User Guide (English) + +* Application Guide (English) + +* Reference + +* Security Guide (English) + +* AppArmor Quick Start (English) +-description.opensuse-manuals_de +group.opensuse-gnomequick_de-pdf Documentation/SUSE +license.opensuse-gnomequick_de-pdf GFDL v1.2 +summary.opensuse-gnomequick_de-pdf openSUSE manual: GNOME Quick Start (PDF, German) ++description.opensuse-gnomequick_de-pdf +A quick start guide to the GNOME desktop. -description.opensuse-gnomequick_de-pdf -group.opensuse-kdequick_de-pdf Documentation/SUSE -license.opensuse-kdequick_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-kdequick_de-pdf openSUSE KDE Quickstart (German) as PDF +group.opensuse-kdequick_de-pdf Documentation/SUSE +license.opensuse-kdequick_de-pdf GFDL v1.2 +summary.opensuse-kdequick_de-pdf openSUSE manual: KDE Quick Start (PDF, German) +description.opensuse-kdequick_de-pdf -PDF of the openSUSE KDE Quickstart (German). - +A quick start guide to the KDE desktop. -description.opensuse-kdequick_de-pdf -group.opensuse-kdeuser_de-pdf Documentation/SUSE -license.opensuse-kdeuser_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-kdeuser_de-pdf openSUSE Manual (German) as PDF +group.opensuse-kdeuser_de-pdf Documentation/SUSE +license.opensuse-kdeuser_de-pdf GFDL v1.2 +summary.opensuse-kdeuser_de-pdf openSUSE manual KDE User Guide (PDF, German) +description.opensuse-kdeuser_de-pdf -PDF of the openSUSE Manual (German). - +This manual introduces the KDE desktop. It guides you through +using and configuring the desktop and helps you perform key +tasks. It is intended mainly for users who want to make +efficient use of KDE as their default desktop. -description.opensuse-kdeuser_de-pdf -group.opensuse-gnomeuser_de-pdf Documentation/SUSE -license.opensuse-gnomeuser_de-pdf GNU Free Documentation License, Version 1.1 (GFDL 1.1) -summary.opensuse-gnomeuser_de-pdf openSUSE GNOME User Guide (German) +group.opensuse-gnomeuser_de-pdf Documentation/SUSE +license.opensuse-gnomeuser_de-pdf GFDL v1.2 +summary.opensuse-gnomeuser_de-pdf openSUSE manual: GNOME User Guide (PDF, German) +description.opensuse-gnomeuser_de-pdf -This package contains the openSUSE GNOME User Guide (German). The KDE -User Guide is packaged together with the other openSUSE manuals as -opensuse-manual_de. - +This manual introduces the GNOME desktop. It guides you through +using and configuring the desktop and helps you perform key tasks. +It is intended mainly for end users who want to make efficient use +of GNOME desktop as their default desktop. -description.opensuse-gnomeuser_de-pdf -group.opensuse-apps_de-pdf Documentation/SUSE -license.opensuse-apps_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-apps_de-pdf openSUSE Manual (German) as PDF +group.opensuse-apps_de-pdf Documentation/SUSE +license.opensuse-apps_de-pdf GFDL v1.2 +summary.opensuse-apps_de-pdf openSUSE manual: Application Guide (PDF, German) +description.opensuse-apps_de-pdf -PDF of the openSUSE Manual (German). - +Learn how to use and configure key desktop applications. This +guide introduces browsers and e-mail clients as well as office +applications and collaboration tools. It also covers graphics +and multimedia applications. -description.opensuse-apps_de-pdf -group.opensuse-reference_de-pdf Documentation/SUSE -license.opensuse-reference_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-reference_de-pdf openSUSE Manual (German) as PDF +group.opensuse-reference_de-pdf Documentation/SUSE +license.opensuse-reference_de-pdf GFDL v1.2 +summary.opensuse-reference_de-pdf openSUSE manual: Reference (PDF, German) +description.opensuse-reference_de-pdf -PDF of the openSUSE Manual (German). - +This guide gives you a general understanding of your system and +covers advanced system administration tasks. It is intended +mainly for system administrators and home users with basic system +administration knowledge. It provides detailed information about +advanced deployment scenarios, administration of your system, +the interaction of key system components and the set-up of +various network and file services. -description.opensuse-reference_de-pdf -group.opensuse-startup_de-pdf Documentation/SUSE -license.opensuse-startup_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-startup_de-pdf openSUSE Manual (German) as PDF +group.opensuse-startup_de-pdf Documentation/SUSE +license.opensuse-startup_de-pdf GFDL v1.2 +summary.opensuse-startup_de-pdf openSUSE manual: Start-Up (PDF, German) +description.opensuse-startup_de-pdf -PDF of the openSUSE Manual (German). - +Guides you through the installation and basic configuration of your +system. For newcomers, the manual also introduces basic Linux concepts +such as the file system, the user concept and access permissions and +gives an overview of the features the system offers to support +mobile computing. Provides help and advice in troubleshooting. -description.opensuse-startup_de-pdf -group.opensuse-apparmor-quick_de-pdf Documentation/SUSE -license.opensuse-apparmor-quick_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-apparmor-quick_de-pdf openSUSE Manual (German) as PDF +group.opensuse-apparmor-quick_de-pdf Documentation/SUSE +license.opensuse-apparmor-quick_de-pdf GFDL v1.2 +summary.opensuse-apparmor-quick_de-pdf openSUSE manual: AppArmor Quick Start +(PDF, German) +description.opensuse-apparmor-quick_de-pdf -PDF of the openSUSE Manual (German). - +A quick start guide to AppArmor, a security software. -description.opensuse-apparmor-quick_de-pdf -group.opensuse-apparmor-admin_de-pdf Documentation/SUSE -license.opensuse-apparmor-admin_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-apparmor-admin_de-pdf openSUSE Manual (German) as PDF -+description.opensuse-apparmor-admin_de-pdf -PDF of the openSUSE Manual (German). - --description.opensuse-apparmor-admin_de-pdf -group.opensuse-manual_de-pdf Documentation/SUSE -license.opensuse-manual_de-pdf GNU Free Documentation License, Version 1.2 (GFDL 1.2) -summary.opensuse-manual_de-pdf openSUSE Manual (German) as PDF -+description.opensuse-manual_de-pdf -PDF of the openSUSE Manual (German). - --description.opensuse-manual_de-pdf +group.opensuse-manuals_de-pdf Documentation/SUSE +license.opensuse-manuals_de-pdf GFDL v1.2 +summary.opensuse-manuals_de-pdf ?????????????????? ++description.opensuse-manuals_de-pdf +?????????????????????????????????????? +-description.opensuse-manuals_de-pdf +group.opensuse-security_de Documentation/SUSE +license.opensuse-security_de-pdf GFDL v1.2 +summary.opensuse-security_de-pdf openSUSE manual: Security Guide (PDF, German) ++description.opensuse-security_de-pdf +This guide introduces basic concepts of system security, covering +both local and network security aspects. Shows how to make use of +the product inherent security software like AppArmor (which lets +you specify per program which files the program may read, write, +and execute) or the auditing system that reliably collects +information about any security-relevant events. +-description.opensuse-security_de-pdf +group.opensuse-installquick_de-pdf Documentation/SUSE +license.opensuse-installquick_de-pdf GFDL v1.2 +summary.opensuse-installquick_de-pdf openSUSE manual: Installation Quick Start (PDF, German) ++description.opensuse-installquick_de-pdf +A quick start guide providing a walk-through to the default installation. +-description.opensuse-installquick_de-pdf ++++++ doc_pre_checkin.sh ++++++ #!/bin/bash filename=$(echo *.spec) perl /usr/bin/update_spec $filename attributes > $filename.new mv $filename.new $filename exit 0 ++++++ opensuse-gnomequick_de.pdf ++++++ (binary differes) ++++++ opensuse-html_de-desktop.tar.bz2 ++++++ ++++ 2341 lines of diff (skipped) ++++++ opensuse-html_de-graphics.tar.bz2 ++++++ opensuse-manuals_de/opensuse-html_de-graphics.tar.bz2 /mounts/work_src_done/STABLE/opensuse-manuals_de/opensuse-html_de-graphics.tar.bz2 differ: char 11, line 1 ++++++ opensuse-html_de-html.tar.bz2 ++++++ opensuse-manuals_de/opensuse-html_de-html.tar.bz2 /mounts/work_src_done/STABLE/opensuse-manuals_de/opensuse-html_de-html.tar.bz2 differ: char 11, line 1 ++++++ opensuse-html_de.tar.bz2 ++++++ ++++ 36749 lines of diff (skipped) ++++++ opensuse-installquick_de.pdf ++++++ (binary differes) ++++++ opensuse-kdequick_de.pdf ++++++ (binary differes) ++++++ opensuse-reference_de.pdf ++++++ (binary differes) ++++++ opensuse-startup_de.pdf ++++++ (binary differes) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mercurial for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at Mon Sep 27 17:38:25 CEST 2010. -------- --- mercurial/mercurial.changes 2010-07-19 07:55:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/mercurial/mercurial.changes 2010-09-06 10:25:29.000000000 +0200 @@ -1,0 +2,81 @@ +Mon Sep 6 07:03:47 UTC 2010 - wr(a)rosenauer.org + +- update to 1.6.3: + * alias: make shadowing behavior more consistent (issue2054) + * bisect: better message for unrelated starting revisions + * bookmarks: Check if the bookmark to delete exists on the remote + * bookmarks: guard against listing bookmarks on unsupported repos + * chunkbuffer: use += rather than cStringIO to reduce memory footprint + * convert: Using --dest-type svn crashed, if the source repo used tags + * convert: properly set encoding for gnuarch converter + * convert: use encoding.encoding instead of locale.getpreferredencoding() + * graphlog: mark --branch as incompatible with --graph + * http basic auth: reset redirect counter on new requests (issue2255) + * httprepo: decompress stream incrementally to reduce memory usage + * log: fix the bug 'hg log --stat -p == hg log --stat' + * merge: drop reference to file contents after write + * merge: move reverse-merge logic out of filemerge (issue2342) + * merge: fix detection of conflict markers with checkconflicts enabled + * mq: don't inherit default and default-push paths with --mq (issue2333) + * resolve: updated help documentation for improved clarity + * revlog: drop cache after use to save memory footprint + * templatefilters: unnest uescape() + * templates: add filenolink to raw style (issue2332) + * url: expand vars in all [auth] settings (issue2328) + * url: limit expansion to safe auth keys (Issue2328) + * util: avoid using hashlib on Python < 2.5 (issue2278) + * verify: initialize rp variable in case we hit out of memory + * verify: reduce memory footprint when unpacking files + * verify: report exceptions that don't have a str() method +- in case of !with_doc copy the man pages from the source tarball + +------------------------------------------------------------------- +Wed Aug 4 09:09:51 UTC 2010 - pascal.bleser(a)opensuse.org + +- split out localization of messages into its own -lang subpackage, which reduces the size of the mercurial package by around 400kb +- the locale files are moved into the arch-independent %{python_sitelib} instead of %{python_sitearch} in order to have a noarch -lang subpackage +- use --record-rpm for the list of files + +- update to 1.6.2: + * fixes a regression in the color extension + +- changes from 1.6.1: + * alias: ensure checksignature() is applied directly to the command (issue2286) + * bash/zsh completion: use HGPLAIN when invoking hg (issue2297) + * bookmarks: don't allow name to contain whitespaces only + * bookmarks: ensure current bookmark is updated when specified with -r . + * bundle: lookup revisions after addbranchrevs + * color/progress: subclass ui instead of using wrapfunction (issue2096) + * commit: only warn when reopening the workdir's branch + * dispatch: give better error message when cwd doesn't exist (issue2293) + * doc: make sure we use our own code for generating man pages + * filelog: cmp: don't read data if hashes are identical (issue2273) + * filelog: test behaviour for data starting with "\1\n" + * hg.clone: fix branch value when passing a repo object (issue2267) + * hgweb.wsgi: add a URL to the corresponding wiki documentation + * hgwebdir: allow pure relative globs in paths + * hgwebdir: use template paths configured in the hgrc (issue2281) + * init: create target directory recursively + * inotify: check all components of filenames against hgignore (issue884) + * keyword: move collecting of [keyword] patterns to reposetup (issue2303) + * log: fix missing diff output for hg log -p in subdirectory + * log: follow filenames through renames (issue647) + * mail: ensure that Python2.4 to 2.7 use the same header format + * mq: clarify the fact that qimport is trying to read a file + * mq: cleanup status if applied mq is stripped (issue1881) + * mq: fixed ENOENT when qrename to new/directory.patch + * mq: reset self.added after the mq transaction instead of inside qimport + * qpush --move: move the right patch even with comment lines + * rebase: re-add patches to mq repo after rebase + * revert: rename original to .orig instead of copying (issue2282) + * revset: fix ancestor subset handling (issue2298) + * runrst: try to be more helpful if docutils is not installed + * tag: do not allow tag names to consist solely of whitespace (issue2307) + * transplant: crash if repo.commit() finds nothing to commit + +------------------------------------------------------------------- +Thu Jul 29 23:00:35 CEST 2010 - wr(a)rosenauer.org + +- install bash_completion file + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mercurial-1.6.tar.bz2 New: ---- mercurial-1.6.3.tar.bz2 rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.T4V3gw/_old 2010-09-27 17:38:12.000000000 +0200 +++ /var/tmp/diff_new_pack.T4V3gw/_new 2010-09-27 17:38:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mercurial (Version 1.6) +# spec file for package mercurial (Version 1.6.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,24 +17,42 @@ # norootforbuild +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} + +%if 0%{?suse_version} >= 1100 +%define with_doc 1 +%endif +%if 0%{?suse_version} >= 1110 +%define with_lang 1 +%endif Name: mercurial -BuildRequires: asciidoc gcc python-devel sgml-skel xmlto -%if %suse_version > 1020 +BuildRequires: gcc python-devel +%if 0%{?with_doc} +BuildRequires: asciidoc sgml-skel xmlto +%endif +BuildRequires: perl +%if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif Summary: Scalable Distributed SCM -Version: 1.6 +Version: 1.6.3 Release: 1 License: GPLv2+ Group: Development/Tools/Version Control BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.selenic.com/mercurial/ +# http://mercurial.selenic.com/release/mercurial-%{version}.tar.gz Source: %{name}-%{version}.tar.bz2 +Source99: rpmlintrc Patch: mercurial-hgk-path-fix.diff Patch1: mercurial-sle10-inotify-fixes.diff # require rcs for 3-way "merge" command. Requires: rcs +%if 0%{?with_lang} +Recommends: %{name}-lang +%endif %py_requires %description @@ -42,6 +60,7 @@ designed for efficient handling of very large distributed projects. +%lang_package %prep %setup -q # %setup -n %{name}-%{version}-mq @@ -52,44 +71,92 @@ %patch1 -p1 %build -make all PREFIX=/usr +%__make \ + build \ +%if 0%{?with_doc} + doc \ +%endif + PREFIX="{_prefix}" %install -python setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" -make -C doc DESTDIR=$RPM_BUILD_ROOT PREFIX=/usr install +%__python setup.py install --prefix=%{_prefix} --root="$RPM_BUILD_ROOT" \ + --record-rpm=files.lst + +%if 0%{?with_doc} +%__make -C doc DESTDIR="%{buildroot}" PREFIX="%{_prefix}" install +%else +pushd doc +for f in hg.1 hgrc.5 hgignore.5 ; do + %__gzip $f && f=$f.gz + ff="${f##*/}" + n="${ff%.gz}" + n="${n##*.}" + %__install -D -m0644 "$f" "%{buildroot}%{_mandir}/man$n/$ff" +done +popd +%endif # install programs in contrib install -c -m 0755 contrib/hgk $RPM_BUILD_ROOT%{_bindir} install -c -m 0755 contrib/convert-repo $RPM_BUILD_ROOT%{_bindir} install -c -m 0755 contrib/shrink-revlog.py $RPM_BUILD_ROOT%{_bindir} -python%{py_ver} %{py_libdir}/compileall.py -d %{py_site}/ \ - $RPM_BUILD_ROOT/%{py_sitedir} -# FIXME: the file seems buggy on mercurial-0.7 -# mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d -# install -c -m 0644 contrib/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/mercurial.sh + +%__python -c 'import compileall; compileall.compile_dir("%{buildroot}%{python_sitearch}/",ddir="%{python_sitearch}/",force=True)' + +mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d +install -c -m 0644 contrib/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/mercurial.sh mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp mkdir -p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp mkdir -p $RPM_BUILD_ROOT/etc/mercurial/hgrc.d -%if %suse_version > 1020 -%fdupes -s $RPM_BUILD_ROOT +%if 0%{?suse_version} > 1020 +%fdupes -s "%{buildroot}%{_datadir}" +%endif + +if [ "%{python_sitelib}" != "%{python_sitearch}" ]; then + %__install -d "%{buildroot}%{python_sitelib}/mercurial" + %__mv "%{buildroot}%{python_sitearch}/mercurial/locale" \ + "%{buildroot}%{python_sitelib}/mercurial/locale" +fi + +%__perl -n -i -e 'print unless m,/mercurial/locale(/?|/.+)$,' files.lst +LANGFILES="$PWD/%{name}.lang" +>"$LANGFILES" +pushd "%{buildroot}%{python_sitelib}/mercurial/locale" +/bin/ls -1 | while read lang; do + echo "%lang($lang) %{python_sitelib}/mercurial/locale/$lang" >>"$LANGFILES" +done +popd #%python_sitelib/mercurial/locale + +%if ! 0%{?with_lang} +%__mv files.lst files.lst.orig +cat files.lst.orig "%{name}.lang" > files.lst +%__rm files.lst.orig %endif %clean -rm -rf $RPM_BUILD_ROOT +%{?buildroot:%__rm -rf "%{buildroot}"} -%files +%files -f files.lst %defattr(-, root, root) %doc README CONTRIBUTORS COPYING hgweb.cgi -%{_mandir}/man?/* %doc contrib/sample.hgrc %{_bindir}/* -%{py_sitedir}/* -# FIXME: buggy file -# /etc/bash_completion.d/* +#%{python_sitelib} +/etc/bash_completion.d/* %dir /etc/mercurial %dir /etc/mercurial/hgrc.d %{_datadir}/emacs %{_datadir}/xemacs +%{_mandir}/man1/hg.1%{ext_man} +%{_mandir}/man5/hgignore.5%{ext_man} +%{_mandir}/man5/hgrc.5%{ext_man} +%if 0%{?with_lang} + +%files lang -f %{name}.lang +%defattr(-, root, root) +%endif +%dir %{python_sitelib}/mercurial +%dir %{python_sitelib}/mercurial/locale %changelog ++++++ mercurial-1.6.tar.bz2 -> mercurial-1.6.3.tar.bz2 ++++++ ++++ 13093 lines of diff (skipped) ++++++ rpmlintrc ++++++ addFilter("python-naming-policy-not-applied") addFilter("non-conffile-in-etc /etc/bash_completion.d/mercurial.sh") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4 for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Mon Sep 27 17:37:49 CEST 2010. -------- --- libqt4/libqt4-devel-doc-data.changes 2010-09-06 10:35:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.changes 2010-09-27 00:30:12.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 27 00:29:25 CEST 2010 - dmueller(a)suse.de + +- add patch to avoid jumps in QTreeViews when deleting the + current item + +------------------------------------------------------------------- +Wed Sep 22 10:25:53 CEST 2010 - dmueller(a)suse.de + +- update to 4.7.0 (final): + * minor bugfixes over 4.7.0 RC1 + +------------------------------------------------------------------- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 Old: ---- ignore-global-advance-width-in-fonts.diff minimal-toc-for-webkit.diff qt-everywhere-opensource-src-4.7.0-rc1.tar.bz2 New: ---- 6da6b7099d4e0b49329793e4b90703ec3d868048.diff qt-everywhere-opensource-src-4.7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.jkZELt/_old 2010-09-27 17:36:32.000000000 +0200 +++ /var/tmp/diff_new_pack.jkZELt/_new 2010-09-27 17:36:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.6.95+4.7.0rc1) +# spec file for package libqt4-devel-doc-data (Version 4.7.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,11 +27,11 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.6.95+4.7.0rc1 -Release: 2 +Version: 4.7.0 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.7.0-rc1 +%define rversion %version # COMMON-VERSION-END # COMMON-VERSION-END Url: http://www.trolltech.com @@ -63,7 +63,6 @@ Patch40: 0188-fix-moc-parser-same-name-header.diff Patch41: konsole-nvidia-font-speed.diff Patch43: 0195-compositing-properties.diff -Patch55: ignore-global-advance-width-in-fonts.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch @@ -72,13 +71,13 @@ Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff Patch107: webkit-ia64_s390x.patch -Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff Patch113: ppc64-webkit-link-fix.diff Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff +Patch122: 6da6b7099d4e0b49329793e4b90703ec3d868048.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -116,8 +115,6 @@ %patch41 %patch43 # ### 47 rediff -#%patch55 -# ### 47 rediff # %patch60 # bnc#374073 comment #8 # %patch61 @@ -129,16 +126,14 @@ # %patch102 # ### 47 rediff # %patch107 -# ### 47 rediff -#%patch108 %patch109 -# ### 47 rediff -#%patch113 +%patch113 %patch118 -p1 %ifarch hppa %patch119 %patch120 %endif +%patch122 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them libqt4-devel-doc.spec: same change libqt4-sql-plugins.spec: same change ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.jkZELt/_old 2010-09-27 17:36:32.000000000 +0200 +++ /var/tmp/diff_new_pack.jkZELt/_new 2010-09-27 17:36:32.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.6.95+4.7.0rc1) +# spec file for package libqt4 (Version 4.7.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -53,11 +53,11 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version: 4.6.95+4.7.0rc1 -Release: 2 +Version: 4.7.0 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.7.0-rc1 +%define rversion %version # COMMON-VERSION-END # COMMON-BEGIN Source: qt%x11_free%rversion.tar.bz2 @@ -80,7 +80,6 @@ Patch40: 0188-fix-moc-parser-same-name-header.diff Patch41: konsole-nvidia-font-speed.diff Patch43: 0195-compositing-properties.diff -Patch55: ignore-global-advance-width-in-fonts.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch @@ -89,13 +88,13 @@ Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff Patch107: webkit-ia64_s390x.patch -Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff Patch113: ppc64-webkit-link-fix.diff Patch118: rcc-stable-dirlisting.diff Patch119: hppa_ldcw_fix.diff Patch120: hppa_unaligned_access_fix_458133.diff Patch121: webkit-sparc64.diff +Patch122: 6da6b7099d4e0b49329793e4b90703ec3d868048.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle %define check_config \ @@ -133,8 +132,6 @@ %patch41 %patch43 # ### 47 rediff -#%patch55 -# ### 47 rediff # %patch60 # bnc#374073 comment #8 # %patch61 @@ -146,16 +143,14 @@ # %patch102 # ### 47 rediff # %patch107 -# ### 47 rediff -#%patch108 %patch109 -# ### 47 rediff -#%patch113 +%patch113 %patch118 -p1 %ifarch hppa %patch119 %patch120 %endif +%patch122 -p1 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ 6da6b7099d4e0b49329793e4b90703ec3d868048.diff ++++++ commit 6da6b7099d4e0b49329793e4b90703ec3d868048 Author: Frank Reininghaus <frank78ac(a)googlemail.com> Date: Wed Sep 22 10:19:59 2010 +0200 QTreeView: do not scroll to top if last item is removed When the last item is the current item and is removed, QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's viewItems member is cleared. This commit makes sure that viewItems is restored by calling QTreeView::doItemsLayout() in this case, preventing that the scroll bar range is set to zero temporarily and the view is scrolled to the top unexpectedly (this was a regression in 4.7.0: QTBUG-13567). Merge-request: 2481 Reviewed-by: Olivier Goffart <olivier.goffart(a)nokia.com> diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index b797776..40b51fe 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -3435,6 +3435,10 @@ void QTreeViewPrivate::updateScrollBars() if (!viewportSize.isValid()) viewportSize = QSize(0, 0); + if (viewItems.isEmpty()) { + q->doItemsLayout(); + } + int itemsInViewport = 0; if (uniformRowHeights) { if (defaultItemHeight <= 0) ++++++ ppc64-webkit-link-fix.diff ++++++ --- /var/tmp/diff_new_pack.jkZELt/_old 2010-09-27 17:36:32.000000000 +0200 +++ /var/tmp/diff_new_pack.jkZELt/_new 2010-09-27 17:36:32.000000000 +0200 @@ -1,10 +1,10 @@ --- src/3rdparty/webkit/WebCore/WebCore.pro +++ src/3rdparty/webkit/WebCore/WebCore.pro -@@ -60,7 +60,6 @@ +@@ -90,7 +90,6 @@ } unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections + linux*-g++*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF - CONFIG(release):!CONFIG(QTDIR_build) { - contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols + CONFIG(release):!CONFIG(standalone_package) { ++++++ qt-everywhere-opensource-src-4.7.0-rc1.tar.bz2 -> qt-everywhere-opensource-src-4.7.0.tar.bz2 ++++++ libqt4/qt-everywhere-opensource-src-4.7.0-rc1.tar.bz2 /mounts/work_src_done/STABLE/libqt4/qt-everywhere-opensource-src-4.7.0.tar.bz2 differ: char 11, line 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

commit ca-certificates-mozilla for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package ca-certificates-mozilla for openSUSE:Factory checked in at Mon Sep 27 17:33:58 CEST 2010. -------- --- ca-certificates-mozilla/ca-certificates-mozilla.changes 2010-05-21 14:31:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/ca-certificates-mozilla/ca-certificates-mozilla.changes 2010-09-27 16:43:59.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 27 14:27:52 UTC 2010 - lnussel(a)suse.de + +- update certificates to revision 1.65 + * new: E_Guven_Kok_Elektronik_Sertifika_Hizmet_Saglayicisi.pem + * new: GlobalSign_Root_CA_R3.pem + * new: Microsec_e_Szigno_Root_CA_2009.pem + * new: Verisign_Class_1_Public_Primary_Certification_Authority.1.pem + * new: Verisign_Class_3_Public_Primary_Certification_Authority.1.pem + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- certdata.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ca-certificates-mozilla.spec ++++++ --- /var/tmp/diff_new_pack.J1gA5f/_old 2010-09-27 17:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.J1gA5f/_new 2010-09-27 17:33:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package ca-certificates-mozilla (Version 1.64) +# spec file for package ca-certificates-mozilla (Version 1.65) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ License: BSD3c(or similar) ; MPL 1.1/GPL 2.0/LGPL 2.1 Group: Productivity/Networking/Security AutoReqProv: on -Version: 1.64 +Version: 1.65 Release: 1 Summary: CA certificates for OpenSSL Url: http://www.mozilla.org @@ -44,6 +44,7 @@ Source1: extractcerts.pl Source2: %{name}.COPYING Source3: compareoldnew +Patch0: certdata.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch # for update-ca-certificates @@ -61,10 +62,12 @@ %prep %setup -qcT +/bin/cp %{SOURCE0} . +%patch0 -p1 install -m 644 %{S:1} COPYING %build -perl %{SOURCE1} --trustbits < %{SOURCE0} +perl %{SOURCE1} --trustbits < certdata.txt %install mkdir -p %{buildroot}/%{sslusrdir}/mozilla ++++++ certdata.diff ++++++ Index: ca-certificates-mozilla/certdata.txt =================================================================== --- ca-certificates-mozilla.orig/certdata.txt +++ ca-certificates-mozilla/certdata.txt @@ -4646,7 +4646,7 @@ CKA_ISSUER MULTILINE_OCTAL \144\040\103\101\040\122\157\157\164 END CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\001\001 +\001 END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++++++ certdata.txt ++++++ --- /var/tmp/diff_new_pack.J1gA5f/_old 2010-09-27 17:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.J1gA5f/_new 2010-09-27 17:33:51.000000000 +0200 @@ -34,7 +34,7 @@ # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64 $ $Date: 2010/04/08 14:28:59 $" +CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.65 $ $Date: 2010/08/27 15:45:14 $" # # certdata.txt @@ -20924,5 +20924,587 @@ END CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + + +# +# Certificate "Verisign Class 1 Public Primary Certification Authority" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Verisign Class 1 Public Primary Certification Authority" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242 +\344\335 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\074\060\202\001\245\002\020\077\151\036\201\234\360 +\232\112\363\163\377\271\110\242\344\335\060\015\006\011\052\206 +\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006 +\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163 +\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155\141 +\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156 +\040\101\165\164\150\157\162\151\164\171\060\036\027\015\071\066 +\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060 +\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011 +\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141 +\163\163\040\061\040\120\165\142\154\151\143\040\120\162\151\155 +\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157 +\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060\015 +\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215 +\000\060\201\211\002\201\201\000\345\031\277\155\243\126\141\055 +\231\110\161\366\147\336\271\215\353\267\236\206\200\012\221\016 +\372\070\045\257\106\210\202\345\163\250\240\233\044\135\015\037 +\314\145\156\014\260\320\126\204\030\207\232\006\233\020\241\163 +\337\264\130\071\153\156\301\366\025\325\250\250\077\252\022\006 +\215\061\254\177\260\064\327\217\064\147\210\011\315\024\021\342 +\116\105\126\151\037\170\002\200\332\334\107\221\051\273\066\311 +\143\134\305\340\327\055\207\173\241\267\062\260\173\060\272\052 +\057\061\252\356\243\147\332\333\002\003\001\000\001\060\015\006 +\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000 +\130\025\051\071\074\167\243\332\134\045\003\174\140\372\356\011 +\231\074\047\020\160\310\014\011\346\263\207\317\012\342\030\226 +\065\142\314\277\233\047\171\211\137\311\304\011\364\316\265\035 +\337\052\275\345\333\206\234\150\045\345\060\174\266\211\025\376 +\147\321\255\341\120\254\074\174\142\113\217\272\204\327\022\025 +\033\037\312\135\017\301\122\224\052\021\231\332\173\317\014\066 +\023\325\065\334\020\031\131\352\224\301\000\277\165\217\331\372 +\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133 +END + +# Trust for Certificate "Verisign Class 1 Public Primary Certification Authority" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Verisign Class 1 Public Primary Certification Authority" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\316\152\144\243\011\344\057\273\331\205\034\105\076\144\011\352 +\350\175\140\361 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\206\254\336\053\305\155\303\331\214\050\210\323\215\026\023\036 +END +CKA_ISSUER MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\061\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\077\151\036\201\234\360\232\112\363\163\377\271\110\242 +\344\335 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "Verisign Class 3 Public Primary Certification Authority" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Verisign Class 3 Public Primary Certification Authority" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 +\022\276 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\002\074\060\202\001\245\002\020\074\221\061\313\037\366 +\320\033\016\232\270\320\104\277\022\276\060\015\006\011\052\206 +\110\206\367\015\001\001\005\005\000\060\137\061\013\060\011\006 +\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125\004 +\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156\143 +\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141\163 +\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155\141 +\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157\156 +\040\101\165\164\150\157\162\151\164\171\060\036\027\015\071\066 +\060\061\062\071\060\060\060\060\060\060\132\027\015\062\070\060 +\070\060\062\062\063\065\071\065\071\132\060\137\061\013\060\011 +\006\003\125\004\006\023\002\125\123\061\027\060\025\006\003\125 +\004\012\023\016\126\145\162\151\123\151\147\156\054\040\111\156 +\143\056\061\067\060\065\006\003\125\004\013\023\056\103\154\141 +\163\163\040\063\040\120\165\142\154\151\143\040\120\162\151\155 +\141\162\171\040\103\145\162\164\151\146\151\143\141\164\151\157 +\156\040\101\165\164\150\157\162\151\164\171\060\201\237\060\015 +\006\011\052\206\110\206\367\015\001\001\001\005\000\003\201\215 +\000\060\201\211\002\201\201\000\311\134\131\236\362\033\212\001 +\024\264\020\337\004\100\333\343\127\257\152\105\100\217\204\014 +\013\321\063\331\331\021\317\356\002\130\037\045\367\052\250\104 +\005\252\354\003\037\170\177\236\223\271\232\000\252\043\175\326 +\254\205\242\143\105\307\162\047\314\364\114\306\165\161\322\071 +\357\117\102\360\165\337\012\220\306\216\040\157\230\017\370\254 +\043\137\160\051\066\244\311\206\347\261\232\040\313\123\245\205 +\347\075\276\175\232\376\044\105\063\334\166\025\355\017\242\161 +\144\114\145\056\201\150\105\247\002\003\001\000\001\060\015\006 +\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201\000 +\020\162\122\251\005\024\031\062\010\101\360\305\153\012\314\176 +\017\041\031\315\344\147\334\137\251\033\346\312\350\163\235\042 +\330\230\156\163\003\141\221\305\174\260\105\100\156\104\235\215 +\260\261\226\164\141\055\015\251\105\322\244\222\052\326\232\165 +\227\156\077\123\375\105\231\140\035\250\053\114\371\136\247\011 +\330\165\060\327\322\145\140\075\147\326\110\125\165\151\077\221 +\365\110\013\107\151\042\151\202\226\276\311\310\070\206\112\172 +\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220 +END + +# Trust for Certificate "Verisign Class 3 Public Primary Certification Authority" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Verisign Class 3 Public Primary Certification Authority" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\241\333\143\223\221\157\027\344\030\125\011\100\004\025\307\002 +\100\260\256\153 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\357\132\361\063\357\361\315\273\121\002\356\022\024\113\226\304 +END +CKA_ISSUER MULTILINE_OCTAL +\060\137\061\013\060\011\006\003\125\004\006\023\002\125\123\061 +\027\060\025\006\003\125\004\012\023\016\126\145\162\151\123\151 +\147\156\054\040\111\156\143\056\061\067\060\065\006\003\125\004 +\013\023\056\103\154\141\163\163\040\063\040\120\165\142\154\151 +\143\040\120\162\151\155\141\162\171\040\103\145\162\164\151\146 +\151\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164 +\171 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\074\221\061\313\037\366\320\033\016\232\270\320\104\277 +\022\276 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "Microsec e-Szigno Root CA 2009" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Microsec e-Szigno Root CA 2009" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +\156\157\056\150\165 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +\156\157\056\150\165 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\011\000\302\176\103\004\116\107\077\031 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\004\012\060\202\002\362\240\003\002\001\002\002\011\000 +\302\176\103\004\116\107\077\031\060\015\006\011\052\206\110\206 +\367\015\001\001\013\005\000\060\201\202\061\013\060\011\006\003 +\125\004\006\023\002\110\125\061\021\060\017\006\003\125\004\007 +\014\010\102\165\144\141\160\145\163\164\061\026\060\024\006\003 +\125\004\012\014\015\115\151\143\162\157\163\145\143\040\114\164 +\144\056\061\047\060\045\006\003\125\004\003\014\036\115\151\143 +\162\157\163\145\143\040\145\055\123\172\151\147\156\157\040\122 +\157\157\164\040\103\101\040\062\060\060\071\061\037\060\035\006 +\011\052\206\110\206\367\015\001\011\001\026\020\151\156\146\157 +\100\145\055\163\172\151\147\156\157\056\150\165\060\036\027\015 +\060\071\060\066\061\066\061\061\063\060\061\070\132\027\015\062 +\071\061\062\063\060\061\061\063\060\061\070\132\060\201\202\061 +\013\060\011\006\003\125\004\006\023\002\110\125\061\021\060\017 +\006\003\125\004\007\014\010\102\165\144\141\160\145\163\164\061 +\026\060\024\006\003\125\004\012\014\015\115\151\143\162\157\163 +\145\143\040\114\164\144\056\061\047\060\045\006\003\125\004\003 +\014\036\115\151\143\162\157\163\145\143\040\145\055\123\172\151 +\147\156\157\040\122\157\157\164\040\103\101\040\062\060\060\071 +\061\037\060\035\006\011\052\206\110\206\367\015\001\011\001\026 +\020\151\156\146\157\100\145\055\163\172\151\147\156\157\056\150 +\165\060\202\001\042\060\015\006\011\052\206\110\206\367\015\001 +\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202\001 +\001\000\351\370\217\363\143\255\332\206\330\247\340\102\373\317 +\221\336\246\046\370\231\245\143\160\255\233\256\312\063\100\175 +\155\226\156\241\016\104\356\341\023\235\224\102\122\232\275\165 +\205\164\054\250\016\035\223\266\030\267\214\054\250\317\373\134 +\161\271\332\354\376\350\176\217\344\057\035\262\250\165\207\330 +\267\241\345\073\317\231\112\106\320\203\031\175\300\241\022\034 +\225\155\112\364\330\307\245\115\063\056\205\071\100\165\176\024 +\174\200\022\230\120\307\101\147\270\240\200\141\124\246\154\116 +\037\340\235\016\007\351\311\272\063\347\376\300\125\050\054\002 +\200\247\031\365\236\334\125\123\003\227\173\007\110\377\231\373 +\067\212\044\304\131\314\120\020\143\216\252\251\032\260\204\032 +\206\371\137\273\261\120\156\244\321\012\314\325\161\176\037\247 +\033\174\365\123\156\042\137\313\053\346\324\174\135\256\326\302 +\306\114\345\005\001\331\355\127\374\301\043\171\374\372\310\044 +\203\225\363\265\152\121\001\320\167\326\351\022\241\371\032\203 +\373\202\033\271\260\227\364\166\006\063\103\111\240\377\013\265 +\372\265\002\003\001\000\001\243\201\200\060\176\060\017\006\003 +\125\035\023\001\001\377\004\005\060\003\001\001\377\060\016\006 +\003\125\035\017\001\001\377\004\004\003\002\001\006\060\035\006 +\003\125\035\016\004\026\004\024\313\017\306\337\102\103\314\075 +\313\265\110\043\241\032\172\246\052\273\064\150\060\037\006\003 +\125\035\043\004\030\060\026\200\024\313\017\306\337\102\103\314 +\075\313\265\110\043\241\032\172\246\052\273\064\150\060\033\006 +\003\125\035\021\004\024\060\022\201\020\151\156\146\157\100\145 +\055\163\172\151\147\156\157\056\150\165\060\015\006\011\052\206 +\110\206\367\015\001\001\013\005\000\003\202\001\001\000\311\321 +\016\136\056\325\314\263\174\076\313\374\075\377\015\050\225\223 +\004\310\277\332\315\171\270\103\220\360\244\276\357\362\357\041 +\230\274\324\324\135\006\366\356\102\354\060\154\240\252\251\312 +\361\257\212\372\077\013\163\152\076\352\056\100\176\037\256\124 +\141\171\353\056\010\067\327\043\363\214\237\276\035\261\341\244 +\165\333\240\342\124\024\261\272\034\051\244\030\366\022\272\242 +\024\024\343\061\065\310\100\377\267\340\005\166\127\301\034\131 +\362\370\277\344\355\045\142\134\204\360\176\176\037\263\276\371 +\267\041\021\314\003\001\126\160\247\020\222\036\033\064\201\036 +\255\234\032\303\004\074\355\002\141\326\036\006\363\137\072\207 +\362\053\361\105\207\345\075\254\321\307\127\204\275\153\256\334 +\330\371\266\033\142\160\013\075\066\311\102\362\062\327\172\141 +\346\322\333\075\317\310\251\311\233\334\333\130\104\327\157\070 +\257\177\170\323\243\255\032\165\272\034\301\066\174\217\036\155 +\034\303\165\106\256\065\005\246\366\134\075\041\356\126\360\311 +\202\042\055\172\124\253\160\303\175\042\145\202\160\226 +END + +# Trust for Certificate "Microsec e-Szigno Root CA 2009" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "Microsec e-Szigno Root CA 2009" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\211\337\164\376\134\364\017\112\200\371\343\067\175\124\332\221 +\341\001\061\216 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\370\111\364\003\274\104\055\203\276\110\151\175\051\144\374\261 +END +CKA_ISSUER MULTILINE_OCTAL +\060\201\202\061\013\060\011\006\003\125\004\006\023\002\110\125 +\061\021\060\017\006\003\125\004\007\014\010\102\165\144\141\160 +\145\163\164\061\026\060\024\006\003\125\004\012\014\015\115\151 +\143\162\157\163\145\143\040\114\164\144\056\061\047\060\045\006 +\003\125\004\003\014\036\115\151\143\162\157\163\145\143\040\145 +\055\123\172\151\147\156\157\040\122\157\157\164\040\103\101\040 +\062\060\060\071\061\037\060\035\006\011\052\206\110\206\367\015 +\001\011\001\026\020\151\156\146\157\100\145\055\163\172\151\147 +\156\157\056\150\165 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\011\000\302\176\103\004\116\107\077\031 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +\141\171\151\143\151\163\151 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +\141\171\151\143\151\163\151 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333 +\254\265 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\003\266\060\202\002\236\240\003\002\001\002\002\020\104 +\231\215\074\300\003\047\275\234\166\225\271\352\333\254\265\060 +\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\165 +\061\013\060\011\006\003\125\004\006\023\002\124\122\061\050\060 +\046\006\003\125\004\012\023\037\105\154\145\153\164\162\157\156 +\151\153\040\102\151\154\147\151\040\107\165\166\145\156\154\151 +\147\151\040\101\056\123\056\061\074\060\072\006\003\125\004\003 +\023\063\145\055\107\165\166\145\156\040\113\157\153\040\105\154 +\145\153\164\162\157\156\151\153\040\123\145\162\164\151\146\151 +\153\141\040\110\151\172\155\145\164\040\123\141\147\154\141\171 +\151\143\151\163\151\060\036\027\015\060\067\060\061\060\064\061 +\061\063\062\064\070\132\027\015\061\067\060\061\060\064\061\061 +\063\062\064\070\132\060\165\061\013\060\011\006\003\125\004\006 +\023\002\124\122\061\050\060\046\006\003\125\004\012\023\037\105 +\154\145\153\164\162\157\156\151\153\040\102\151\154\147\151\040 +\107\165\166\145\156\154\151\147\151\040\101\056\123\056\061\074 +\060\072\006\003\125\004\003\023\063\145\055\107\165\166\145\156 +\040\113\157\153\040\105\154\145\153\164\162\157\156\151\153\040 +\123\145\162\164\151\146\151\153\141\040\110\151\172\155\145\164 +\040\123\141\147\154\141\171\151\143\151\163\151\060\202\001\042 +\060\015\006\011\052\206\110\206\367\015\001\001\001\005\000\003 +\202\001\017\000\060\202\001\012\002\202\001\001\000\303\022\040 +\236\260\136\000\145\215\116\106\273\200\134\351\054\006\227\325 +\363\162\311\160\271\347\113\145\200\301\113\276\176\074\327\124 +\061\224\336\325\022\272\123\026\002\352\130\143\357\133\330\363 +\355\052\032\252\161\110\243\334\020\055\137\137\353\134\113\234 +\226\010\102\045\050\021\314\212\132\142\001\120\325\353\011\123 +\057\370\303\217\376\263\374\375\235\242\343\137\175\276\355\013 +\340\140\353\151\354\063\355\330\215\373\022\111\203\000\311\213 +\227\214\073\163\052\062\263\022\367\271\115\362\364\115\155\307 +\346\326\046\067\010\362\331\375\153\134\243\345\110\134\130\274 +\102\276\003\132\201\272\034\065\014\000\323\365\043\176\161\060 +\010\046\070\334\045\021\107\055\363\272\043\020\245\277\274\002 +\367\103\136\307\376\260\067\120\231\173\017\223\316\346\103\054 +\303\176\015\362\034\103\146\140\313\141\061\107\207\243\117\256 +\275\126\154\114\274\274\370\005\312\144\364\351\064\241\054\265 +\163\341\302\076\350\310\311\064\045\010\134\363\355\246\307\224 +\237\255\210\103\045\327\341\071\140\376\254\071\131\002\003\001 +\000\001\243\102\060\100\060\016\006\003\125\035\017\001\001\377 +\004\004\003\002\001\006\060\017\006\003\125\035\023\001\001\377 +\004\005\060\003\001\001\377\060\035\006\003\125\035\016\004\026 +\004\024\237\356\104\263\224\325\372\221\117\056\331\125\232\004 +\126\333\055\304\333\245\060\015\006\011\052\206\110\206\367\015 +\001\001\005\005\000\003\202\001\001\000\177\137\271\123\133\143 +\075\165\062\347\372\304\164\032\313\106\337\106\151\034\122\317 +\252\117\302\150\353\377\200\251\121\350\075\142\167\211\075\012 +\165\071\361\156\135\027\207\157\150\005\301\224\154\331\135\337 +\332\262\131\313\245\020\212\312\314\071\315\237\353\116\336\122 +\377\014\360\364\222\251\362\154\123\253\233\322\107\240\037\164 +\367\233\232\361\057\025\237\172\144\060\030\007\074\052\017\147 +\312\374\017\211\141\235\145\245\074\345\274\023\133\010\333\343 +\377\355\273\006\273\152\006\261\172\117\145\306\202\375\036\234 +\213\265\015\356\110\273\270\275\252\010\264\373\243\174\313\237 +\315\220\166\134\206\226\170\127\012\146\371\130\032\235\375\227 +\051\140\336\021\246\220\034\031\034\356\001\226\042\064\064\056 +\221\371\267\304\047\321\173\346\277\373\200\104\132\026\345\353 +\340\324\012\070\274\344\221\343\325\353\134\301\254\337\033\152 +\174\236\345\165\322\266\227\207\333\314\207\053\103\072\204\010 +\257\253\074\333\367\074\146\061\206\260\235\123\171\355\370\043 +\336\102\343\055\202\361\017\345\372\227 +END + +# Trust for Certificate "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\335\341\322\251\001\200\056\035\207\136\204\263\200\176\113\261 +\375\231\101\064 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\075\101\051\313\036\252\021\164\315\135\260\142\257\260\103\133 +END +CKA_ISSUER MULTILINE_OCTAL +\060\165\061\013\060\011\006\003\125\004\006\023\002\124\122\061 +\050\060\046\006\003\125\004\012\023\037\105\154\145\153\164\162 +\157\156\151\153\040\102\151\154\147\151\040\107\165\166\145\156 +\154\151\147\151\040\101\056\123\056\061\074\060\072\006\003\125 +\004\003\023\063\145\055\107\165\166\145\156\040\113\157\153\040 +\105\154\145\153\164\162\157\156\151\153\040\123\145\162\164\151 +\146\151\153\141\040\110\151\172\155\145\164\040\123\141\147\154 +\141\171\151\143\151\163\151 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\020\104\231\215\074\300\003\047\275\234\166\225\271\352\333 +\254\265 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "GlobalSign Root CA - R3" +# +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "GlobalSign Root CA - R3" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +\004\003\023\012\107\154\157\142\141\154\123\151\147\156 +END +CKA_ID UTF8 "0" +CKA_ISSUER MULTILINE_OCTAL +\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +\004\003\023\012\107\154\157\142\141\154\123\151\147\156 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\013\004\000\000\000\000\001\041\130\123\010\242 +END +CKA_VALUE MULTILINE_OCTAL +\060\202\003\137\060\202\002\107\240\003\002\001\002\002\013\004 +\000\000\000\000\001\041\130\123\010\242\060\015\006\011\052\206 +\110\206\367\015\001\001\013\005\000\060\114\061\040\060\036\006 +\003\125\004\013\023\027\107\154\157\142\141\154\123\151\147\156 +\040\122\157\157\164\040\103\101\040\055\040\122\063\061\023\060 +\021\006\003\125\004\012\023\012\107\154\157\142\141\154\123\151 +\147\156\061\023\060\021\006\003\125\004\003\023\012\107\154\157 +\142\141\154\123\151\147\156\060\036\027\015\060\071\060\063\061 +\070\061\060\060\060\060\060\132\027\015\062\071\060\063\061\070 +\061\060\060\060\060\060\132\060\114\061\040\060\036\006\003\125 +\004\013\023\027\107\154\157\142\141\154\123\151\147\156\040\122 +\157\157\164\040\103\101\040\055\040\122\063\061\023\060\021\006 +\003\125\004\012\023\012\107\154\157\142\141\154\123\151\147\156 +\061\023\060\021\006\003\125\004\003\023\012\107\154\157\142\141 +\154\123\151\147\156\060\202\001\042\060\015\006\011\052\206\110 +\206\367\015\001\001\001\005\000\003\202\001\017\000\060\202\001 +\012\002\202\001\001\000\314\045\166\220\171\006\170\042\026\365 +\300\203\266\204\312\050\236\375\005\166\021\305\255\210\162\374 +\106\002\103\307\262\212\235\004\137\044\313\056\113\341\140\202 +\106\341\122\253\014\201\107\160\154\335\144\321\353\365\054\243 +\017\202\075\014\053\256\227\327\266\024\206\020\171\273\073\023 +\200\167\214\010\341\111\322\152\142\057\037\136\372\226\150\337 +\211\047\225\070\237\006\327\076\311\313\046\131\015\163\336\260 +\310\351\046\016\203\025\306\357\133\213\322\004\140\312\111\246 +\050\366\151\073\366\313\310\050\221\345\235\212\141\127\067\254 +\164\024\334\164\340\072\356\162\057\056\234\373\320\273\277\365 +\075\000\341\006\063\350\202\053\256\123\246\072\026\163\214\335 +\101\016\040\072\300\264\247\241\351\262\117\220\056\062\140\351 +\127\313\271\004\222\150\150\345\070\046\140\165\262\237\167\377 +\221\024\357\256\040\111\374\255\100\025\110\321\002\061\141\031 +\136\270\227\357\255\167\267\144\232\172\277\137\301\023\357\233 +\142\373\015\154\340\124\151\026\251\003\332\156\351\203\223\161 +\166\306\151\205\202\027\002\003\001\000\001\243\102\060\100\060 +\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060 +\017\006\003\125\035\023\001\001\377\004\005\060\003\001\001\377 +\060\035\006\003\125\035\016\004\026\004\024\217\360\113\177\250 +\056\105\044\256\115\120\372\143\232\213\336\342\335\033\274\060 +\015\006\011\052\206\110\206\367\015\001\001\013\005\000\003\202 +\001\001\000\113\100\333\300\120\252\376\310\014\357\367\226\124 +\105\111\273\226\000\011\101\254\263\023\206\206\050\007\063\312 +\153\346\164\271\272\000\055\256\244\012\323\365\361\361\017\212 +\277\163\147\112\203\307\104\173\170\340\257\156\154\157\003\051 +\216\063\071\105\303\216\344\271\127\154\252\374\022\226\354\123 +\306\055\344\044\154\271\224\143\373\334\123\150\147\126\076\203 +\270\317\065\041\303\311\150\376\316\332\302\123\252\314\220\212 +\351\360\135\106\214\225\335\172\130\050\032\057\035\336\315\000 +\067\101\217\355\104\155\327\123\050\227\176\363\147\004\036\025 +\327\212\226\264\323\336\114\047\244\114\033\163\163\166\364\027 +\231\302\037\172\016\343\055\010\255\012\034\054\377\074\253\125 +\016\017\221\176\066\353\303\127\111\276\341\056\055\174\140\213 +\303\101\121\023\043\235\316\367\062\153\224\001\250\231\347\054 +\063\037\072\073\045\322\206\100\316\073\054\206\170\311\141\057 +\024\272\356\333\125\157\337\204\356\005\011\115\275\050\330\162 +\316\323\142\120\145\036\353\222\227\203\061\331\263\265\312\107 +\130\077\137 +END + +# Trust for Certificate "GlobalSign Root CA - R3" +CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "GlobalSign Root CA - R3" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\326\233\126\021\110\360\034\167\305\105\170\301\011\046\337\133 +\205\151\166\255 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL +\305\337\270\111\312\005\023\125\356\055\272\032\303\076\260\050 +END +CKA_ISSUER MULTILINE_OCTAL +\060\114\061\040\060\036\006\003\125\004\013\023\027\107\154\157 +\142\141\154\123\151\147\156\040\122\157\157\164\040\103\101\040 +\055\040\122\063\061\023\060\021\006\003\125\004\012\023\012\107 +\154\157\142\141\154\123\151\147\156\061\023\060\021\006\003\125 +\004\003\023\012\107\154\157\142\141\154\123\151\147\156 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\013\004\000\000\000\000\001\041\130\123\010\242 +END +CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR +CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE ++++++ compareoldnew ++++++ --- /var/tmp/diff_new_pack.J1gA5f/_old 2010-09-27 17:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.J1gA5f/_new 2010-09-27 17:33:51.000000000 +0200 @@ -15,11 +15,15 @@ mkdir old new cd old echo old... -VERBOSE=1 ../extractcerts.pl < ../.osc/certdata.txt | sort > ../old.files +VERBOSE=1 ../extractcerts.pl --trustbits < ../.osc/certdata.txt > tmp +sort < tmp > ../old.files +rm -f tmp cd .. cd new echo new... -VERBOSE=1 ../extractcerts.pl < ../certdata.txt | sort > ../new.files +VERBOSE=1 ../extractcerts.pl --trustbits < ../certdata.txt > tmp +sort < tmp > ../new.files +rm -f tmp cd .. echo '----------------------------' while read line; do ++++++ extractcerts.pl ++++++ --- /var/tmp/diff_new_pack.J1gA5f/_old 2010-09-27 17:33:51.000000000 +0200 +++ /var/tmp/diff_new_pack.J1gA5f/_new 2010-09-27 17:33:51.000000000 +0200 @@ -75,6 +75,11 @@ $output_trustbits = 1; } +sub colonhex +{ + return join(':', unpack("(H2)*", $_[0])); +} + sub handle_object($) { my $object = shift; @@ -83,8 +88,9 @@ push @certificates, $object; } elsif ($object->{'CKA_CLASS'} eq 'CKO_NETSCAPE_TRUST') { my $label = $object->{'CKA_LABEL'}; - die "$label exists" if exists($trusts{$label}); - $trusts{$label} = $object; + my $serial = colonhex($object->{'CKA_SERIAL_NUMBER'}); + die "$label exists ($serial)" if exists($trusts{$label.$serial}); + $trusts{$label.$serial} = $object; } elsif ($object->{'CKA_CLASS'} eq 'CKO_NETSCAPE_BUILTIN_ROOT_LIST') { # ignore } else { @@ -116,11 +122,12 @@ } if( $fields[1] =~ /MULTILINE/ ) { + die "expected MULTILINE_OCTAL" unless $fields[1] eq 'MULTILINE_OCTAL'; $fields[2] = ""; while(<>) { last if /END/; chomp; - $fields[2] .= $_; + $fields[2] .= pack("C", oct($+)) while $_ =~ /\G\\([0-3][0-7][0-7])/g; } } @@ -133,17 +140,19 @@ $object->{$fields[0]} = $fields[2]; } handle_object($object); +undef $object; use MIME::Base64; for my $cert (@certificates) { my $alias = $cert->{'CKA_LABEL'}; - if(!exists($trusts{$alias})) { + my $serial = colonhex($cert->{'CKA_SERIAL_NUMBER'}); + if(!exists($trusts{$alias.$serial})) { print STDERR "NO TRUST: $alias\n"; next; } # check trust. We only include certificates that are trusted for identifying # web sites - my $trust = $trusts{$alias}; + my $trust = $trusts{$alias.$serial}; my @addtrust; my @addtrust_openssl; my $trusted; @@ -178,16 +187,22 @@ my $file = $alias; $alias =~ s/'/-/g; $file =~ s/[^[:alnum:]\\]+/_/g; - $file .= '.pem'; $file = Encode::encode("UTF-8", $file); + if (-e $file.'.pem') { + my $i = 1; + while (-e $file.".$i.pem") { + ++$i; + } + $file .= ".$i.pem"; + } else { + $file .= '.pem'; + } if (!open(O, '>', $file)) { print STDERR "$file: $!\n"; next; } print "$file\n" if $ENV{'VERBOSE'}; my $value = $cert->{'CKA_VALUE'}; - my $enc = ''; - $enc .= pack("C", oct($+)) while $value =~ /\G\\([0-3][0-7][0-7])/g; if ($output_trustbits) { print O "# alias=",Encode::encode("UTF-8", $alias),"\n"; print O "# trust=",join(" ", @addtrust),"\n"; @@ -196,7 +211,7 @@ } } print O "-----BEGIN CERTIFICATE-----\n"; - print O encode_base64($enc); + print O encode_base64($value); print O "-----END CERTIFICATE-----\n"; close O; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ca-certificates for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package ca-certificates for openSUSE:Factory checked in at Mon Sep 27 17:33:41 CEST 2010. -------- --- ca-certificates/ca-certificates.changes 2010-05-21 14:47:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/ca-certificates/ca-certificates.changes 2010-09-27 16:58:22.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 27 14:58:03 UTC 2010 - lnussel(a)suse.de + +- catch FileNotFoundException (bnc#623365) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ca-certificates.spec ++++++ --- /var/tmp/diff_new_pack.A4T5mQ/_old 2010-09-27 17:33:37.000000000 +0200 +++ /var/tmp/diff_new_pack.A4T5mQ/_new 2010-09-27 17:33:37.000000000 +0200 @@ -33,7 +33,7 @@ License: GPLv2+ Group: Productivity/Networking/Security Version: 1 -Release: 5 +Release: 8 Summary: Utilities for system wide CA certificate installation Source0: update-ca-certificates Source1: update-ca-certificates.8 ++++++ keystore.java ++++++ --- /var/tmp/diff_new_pack.A4T5mQ/_old 2010-09-27 17:33:37.000000000 +0200 +++ /var/tmp/diff_new_pack.A4T5mQ/_new 2010-09-27 17:33:37.000000000 +0200 @@ -51,7 +51,6 @@ throws java.security.KeyStoreException, java.security.NoSuchAlgorithmException, java.security.cert.CertificateException, - java.io.FileNotFoundException, java.io.IOException { char[] password = null; @@ -149,7 +148,13 @@ int removed = 0; for (int i = 0; i < certs.length; ++i) { - BufferedInputStream f = new BufferedInputStream(new FileInputStream(cadirname+"/"+certs[i])); + BufferedInputStream f; + try { + f = new BufferedInputStream(new FileInputStream(cadirname+"/"+certs[i])); + } catch (java.io.FileNotFoundException ex) { + System.err.println("skipping " + certs[i] + ": file not found"); + continue; + } String marker = "-----BEGIN CERTIFICATE-----"; boolean found = false; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit asusfan for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package asusfan for openSUSE:Factory checked in at Mon Sep 27 16:22:28 CEST 2010. -------- --- asusfan/asusfan.changes 2009-01-28 14:19:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/asusfan/asusfan.changes 2010-09-27 01:01:17.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 27 01:00:49 CEST 2010 - ro(a)suse.de + +- fix regex in configure for new grep(1) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asusfan.spec ++++++ --- /var/tmp/diff_new_pack.dRbvak/_old 2010-09-27 16:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.dRbvak/_new 2010-09-27 16:22:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package asusfan (Version 0.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,11 @@ Name: asusfan BuildRequires: xorg-x11-devel Url: http://www.consultmatt.co.uk/asusfan/ -License: GPL v2 or later +License: GPLv2+ Group: System/X11/Utilities AutoReqProv: on Version: 0.1 -Release: 182 +Release: 190 Summary: Fan Control for Nvidia-Based ASUS Graphics Cards Source: asusfan-0.1-nodocs.tar.bz2 Patch: asusfan-0.1.patch ++++++ asusfan-0.1.patch ++++++ --- /var/tmp/diff_new_pack.dRbvak/_old 2010-09-27 16:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.dRbvak/_new 2010-09-27 16:22:13.000000000 +0200 @@ -141,6 +141,17 @@ break; } return 0; +--- asusfan-0.1/configure ++++ asusfan-0.1/configure +@@ -6202,7 +6202,7 @@ + exit 1 + fi + gentoo_lt_version="1.5.10" +-gentoo_ltmain_version=`grep '^[:space:]*VERSION=' $ltmain | sed -e 's|^[:space:]*VERSION=||'` ++gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'` + if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 --- asusfan-0.1/libasus/detect.c +++ asusfan-0.1/libasus/detect.c @@ -25,11 +25,13 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grip for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package grip for openSUSE:Factory checked in at Mon Sep 27 16:22:00 CEST 2010. -------- --- GNOME/grip/grip.changes 2009-08-26 16:07:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/grip/grip.changes 2010-09-27 01:14:50.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 27 01:14:12 CEST 2010 - ro(a)suse.de + +- grip-vte_adjustment.diff: fix build with current vte that does + not directly expose the adjustment member any more + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- grip-vte_adjustment.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grip.spec ++++++ --- /var/tmp/diff_new_pack.2ix5hC/_old 2010-09-27 16:21:43.000000000 +0200 +++ /var/tmp/diff_new_pack.2ix5hC/_new 2010-09-27 16:21:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package grip (Version 3.2.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,11 @@ Name: grip BuildRequires: cdparanoia curl-devel fdupes gcc-c++ id3lib-devel libgnomeui-devel update-desktop-files vte-devel Url: http://www.nostatic.org/grip/ -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Multimedia/Sound/Utilities Requires: vorbis-tools Version: 3.2.0 -Release: 309 +Release: 317 Summary: An Audio CD Ripping Application Source: %{name}-%{version}.tar.bz2 Source1: hu.po @@ -43,6 +43,7 @@ Patch11: grip-errorhandling.patch Patch12: grip-url_launcher.patch Patch13: grip-3.2.0-hu_locale.patch +Patch14: grip-vte_adjustment.diff Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,6 +76,7 @@ %patch11 -p1 %patch12 %patch13 +%patch14 %build autoreconf -i -f ++++++ grip-vte_adjustment.diff ++++++ --- src/status_window.c +++ src/status_window.c @@ -73,7 +73,7 @@ gtk_box_pack_start(GTK_BOX(hbox),sw->term_widget,TRUE,TRUE,0); gtk_widget_show(sw->term_widget); - vscrollbar=gtk_vscrollbar_new(VTE_TERMINAL(sw->term_widget)->adjustment); + vscrollbar=gtk_vscrollbar_new(vte_terminal_get_adjustment(VTE_TERMINAL(sw->term_widget))); gtk_box_pack_start(GTK_BOX(hbox),vscrollbar,FALSE,FALSE,0); gtk_widget_show(vscrollbar); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openCryptoki for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package openCryptoki for openSUSE:Factory checked in at Mon Sep 27 16:18:48 CEST 2010. -------- --- openCryptoki/openCryptoki.changes 2009-02-20 06:02:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/openCryptoki/openCryptoki.changes 2010-09-27 08:15:52.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 27 08:02:22 CEST 2010 - meissner(a)suse.de + +- enable TPM support (bnc#641919) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openCryptoki.spec ++++++ --- /var/tmp/diff_new_pack.Drmduc/_old 2010-09-27 16:18:34.000000000 +0200 +++ /var/tmp/diff_new_pack.Drmduc/_new 2010-09-27 16:18:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openCryptoki (Version 2.2.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,8 +30,8 @@ BuildRequires: gcc-c++ libica openssl-devel pwdutils Summary: An Implementation of PKCS#11 (Cryptoki) v2.11 for IBM Cryptographic Hardware Version: 2.2.6 -Release: 10 -License: IBM Public License +Release: 17 +License: IBM PL Group: Productivity/Security # :pserver:anonymous@cvs.sourceforge.net:/cvsroot/opencryptoki # cvs co -r openCryptoki-2-1-5 -d openCryptoki-2-1-5 . @@ -55,7 +55,7 @@ %package devel -License: IBM Public License +License: IBM PL Summary: An Implementation of PKCS#11 (Cryptoki) v2.01 for IBM Cryptographic Hardware Group: Development/Languages/C and C++ Requires: openCryptoki = %{version}-%{release}, glibc-devel, openssl-devel @@ -71,7 +71,7 @@ %ifarch %openCryptoki_32bit_arch %package 32bit -License: IBM Public License +License: IBM PL Summary: An Implementation of PKCS#11 (Cryptoki) v2.11 for IBM Cryptographic Hardware Group: Productivity/Security # this is needed to make sure the pkcs11 group exists before @@ -94,7 +94,7 @@ %ifarch %openCryptoki_64bit_arch %package 64bit -License: IBM Public License +License: IBM PL Summary: An Implementation of PKCS#11 (Cryptoki) v2.11 for IBM Cryptographic Hardware Group: Productivity/Security # this is needed to make sure the pkcs11 group exists before @@ -122,7 +122,7 @@ %build autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -D__USE_BSD" ./configure --prefix=/usr --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -D__USE_BSD" ./configure --prefix=/usr --libdir=%{_libdir} --enable-tpmtok make %install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tpm-tools for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package tpm-tools for openSUSE:Factory checked in at Mon Sep 27 16:18:09 CEST 2010. -------- --- tpm-tools/tpm-tools.changes 2010-03-18 11:54:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/tpm-tools/tpm-tools.changes 2010-09-27 07:58:53.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 27 07:54:30 CEST 2010 - meissner(a)suse.de + +- add opencryptoki support (bnc#641919) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tpm-tools.spec ++++++ --- /var/tmp/diff_new_pack.cqkdE2/_old 2010-09-27 16:16:47.000000000 +0200 +++ /var/tmp/diff_new_pack.cqkdE2/_new 2010-09-27 16:16:47.000000000 +0200 @@ -17,7 +17,7 @@ # norootforbuild -BuildRequires: atk-devel expat fontconfig-devel freetype2-devel glib2-devel gtk2-devel libtspi1 openssl-devel pango-devel trousers-devel xorg-x11-devel xorg-x11-libs +BuildRequires: atk-devel expat fontconfig-devel freetype2-devel glib2-devel gtk2-devel libtspi1 openCryptoki-devel openssl-devel pango-devel trousers-devel xorg-x11-devel xorg-x11-libs Name: tpm-tools Url: http://trousers.sourceforge.net/ @@ -25,7 +25,7 @@ Group: Productivity/Security AutoReqProv: on Version: 1.3.5 -Release: 1 +Release: 4 Summary: Trusted Platform Module (TPM) administration tools Source0: %name-%version.tar.bz2 Source1: %name-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tulip for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at Mon Sep 27 16:16:26 CEST 2010. -------- --- tulip/tulip.changes 2010-05-17 19:24:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/tulip/tulip.changes 2010-09-27 13:53:19.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 27 13:53:06 CEST 2010 - dmueller(a)suse.de + +- update buildrequires for Factory + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.6pWczl/_old 2010-09-27 16:14:27.000000000 +0200 +++ /var/tmp/diff_new_pack.6pWczl/_new 2010-09-27 16:14:27.000000000 +0200 @@ -22,7 +22,7 @@ Name: tulip Summary: Visualization of huge graphs Version: 3.3.1 -Release: 2 +Release: 7 License: GPLv2+ Group: Productivity/Graphics/Visualization/Graph Url: http://www.tulip-software.org/ @@ -51,6 +51,9 @@ BuildRequires: xorg-x11-devel BuildRequires: cmake BuildRequires: fdupes +%if 0%{?suse_version} > 1130 +BuildRequires: qt4-assistant-adp-devel +%endif %if 0%{?suse_version} > 1110 BuildRequires: libgle-devel %else @@ -184,26 +187,31 @@ %build %{?suse_update_config:%{suse_update_config -f}} +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-deprecated" + %if 0%{?use_cmake} -cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + +cmake ./ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing -Wall -O2 -g" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-deprecated -Wall -O2 -g" \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=1 .. %else + autoreconf --force --install -#./gen-conf.sh -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-deprecated" +##./gen-conf.sh %configure \ --docdir=%{_docdir}/tulip \ --enable-shared \ --with-pic \ --disable-static \ - --enable-stats-gui + --enable-stats-gui \ + %endif # parallel make is not working, do not use it. -Marcus 20091115 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" + # generating docs during build is disabled #(cd docs; make html) # copy pre-generated docs instead ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit qt4-assistant-adp for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package qt4-assistant-adp for openSUSE:Factory checked in at Mon Sep 27 16:16:16 CEST 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/qt4-assistant-adp/qt4-assistant-adp.changes 2010-09-27 13:51:21.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Sep 27 13:50:55 CEST 2010 - dmueller(a)suse.de + +- Initial package (4.6.3) + calling whatdependson for head-i586 New: ---- add-camelcase-headers.diff baselibs.conf fix_build_system.diff hardcode-lib-version.diff qt4-assistant-adp.changes qt4-assistant-adp.spec qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt4-assistant-adp.spec ++++++ # # spec file for package qt4-assistant-adp (Version 4.6.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: qt4-assistant-adp BuildRequires: libqt4-devel BuildRequires: fdupes update-desktop-files Url: http://www.qtsoftware.com License: GPLv2 ; GPLv3 Group: System/Libraries Summary: C++ Program Library, Core Components Version: 4.6.3 Release: 1 Source: qt-assistant-qassistantclient-library-compat-src-%version.tar.bz2 Source2: baselibs.conf Patch0: fix_build_system.diff Patch1: hardcode-lib-version.diff Patch2: add-camelcase-headers.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libQtAssistantClient4 = %version Provides: libqt4-devel-doc:/usr/bin/assistant_adp %description Qt is a set of libraries for developing applications. This package contains base tools, like string, xml, and network handling. Authors: -------- Qt Software %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt-assistant-qassistantclient-library-compat-version-%version %patch0 -p1 %patch1 %patch2 %package devel License: GPLv2 ; GPLv3 Group: Development/Libraries/X11 Summary: Qt Development Kit Requires: %name = %version %description devel You need this package, if you want to compile programs with Qt. It contains the "Qt Crossplatform Development Kit". It does contain include files and development applications like GUI designers, translator tools and code generators. %package -n libQtAssistantClient4 License: GPLv2 ; GPLv3 Group: Development/Libraries/X11 Summary: Qt Development Kit %description -n libQtAssistantClient4 You need this package, if you want to compile programs with Qt. It contains the "Qt Crossplatform Development Kit". It does contain include files and development applications like GUI designers, translator tools and code generators. %build export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" qmake make %{?jobs:-j %jobs} pushd lib qmake make %{?jobs:-j %jobs} popd pushd translations lrelease assistant_adp_*.ts popd %install make INSTALL_ROOT=$RPM_BUILD_ROOT install pushd lib make INSTALL_ROOT=$RPM_BUILD_ROOT install popd mkdir -p %{buildroot}/usr/share/qt4/translations/ install -p -m 644 translations/assistant_adp_*.qm %{buildroot}/usr/share/qt4/translations/ %clean rm -rf $RPM_BUILD_ROOT %post -n libQtAssistantClient4 -p /sbin/ldconfig %postun -n libQtAssistantClient4 -p /sbin/ldconfig %files %defattr(-,root,root,755) /usr/bin/assistant_adp /usr/share/qt4/translations/assistant_adp_*.qm %files -n libQtAssistantClient4 %defattr(-,root,root,755) %_libdir/libQtAssistantClient.so.4* %files devel %defattr(644,root,root,755) /usr/include/QtAssistant %_libdir/libQtAssistantClient.so %changelog ++++++ add-camelcase-headers.diff ++++++ --- lib/lib.pro +++ lib/lib.pro @@ -62,7 +62,7 @@ } qt_install_headers { - assistant_headers.files = qassistantclient.h qassistantclient_global.h + assistant_headers.files = qassistantclient.h qassistantclient_global.h QtAssistant/QAssistantClient QtAssistant/QAssistant assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant INSTALLS += assistant_headers } --- lib/QtAssistant/QAssistantClient +++ lib/QtAssistant/QAssistantClient @@ -0,0 +1 @@ +#include "qassistantclient.h" --- lib/QtAssistant/QtAssistant +++ lib/QtAssistant/QtAssistant @@ -0,0 +1,5 @@ +#ifndef QT_QTASSISTANT_MODULE_H +#define QT_QTASSISTANT_MODULE_H +#include <QtNetwork/QtNetwork> +#include "qassistantclient.h" +#endif ++++++ baselibs.conf ++++++ libQtAssistantClient4 ++++++ fix_build_system.diff ++++++ Description: several workarounds for the build system which is completely broken Author: Fathi Boudra <fabo(a)debian.org> --- a/compat.pro +++ b/compat.pro @@ -66,8 +66,6 @@ TRANSLATIONS = translations/assistant_ad translations/assistant_adp_zh_CN.ts \ translations/assistant_adp_zh_TW.ts -unix:!contains(QT_CONFIG, zlib):LIBS += -lz - contains(CONFIG, static): { win32 { exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) { @@ -81,3 +79,7 @@ contains(CONFIG, static): { } } } + +target.path = $$[QT_INSTALL_BINS] +INSTALLS += target + --- a/lib/lib.pro +++ b/lib/lib.pro @@ -16,8 +16,8 @@ HEADERS = qassistantclient.h \ qassistantclient_global.h SOURCES = qassistantclient.cpp -DESTDIR = ../../../../lib -DLLDESTDIR = ../../../../bin +DESTDIR = lib +DLLDESTDIR = bin unix { QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB @@ -62,7 +62,7 @@ win32 { } qt_install_headers { - assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES + assistant_headers.files = qassistantclient.h qassistantclient_global.h assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant INSTALLS += assistant_headers } --- /dev/null +++ b/lib/QtAssistant/qassistantclient_global.h @@ -0,0 +1 @@ +#include "../qassistantclient_global.h" ++++++ hardcode-lib-version.diff ++++++ --- lib/lib.pro +++ lib/lib.pro @@ -1,11 +1,7 @@ TEMPLATE = lib QT += network TARGET = QtAssistantClient -isEmpty(QT_MAJOR_VERSION) { - VERSION=4.3.0 -} else { - VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} -} +VERSION=4.6.3 CONFIG += qt warn_on mac|win32:CONFIG += debug_and_release ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vusb-analyzer for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package vusb-analyzer for openSUSE:Factory checked in at Mon Sep 27 16:14:08 CEST 2010. -------- --- vusb-analyzer/vusb-analyzer.changes 2010-07-13 10:49:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/vusb-analyzer/vusb-analyzer.changes 2010-07-14 11:32:17.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 14 11:26:51 CEST 2010 - pth(a)suse.de + +- Noarch python packages are possible from openSUSE 11.2 onwards so + adaptr the spec accordingly. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vusb-analyzer.spec ++++++ --- /var/tmp/diff_new_pack.6vBDYK/_old 2010-09-27 16:12:21.000000000 +0200 +++ /var/tmp/diff_new_pack.6vBDYK/_new 2010-09-27 16:12:21.000000000 +0200 @@ -20,18 +20,31 @@ Name: vusb-analyzer Version: 1.1 -Release: 1 +Release: 2 License: MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Tools/Other Source: %{name}-%{version}.tar.gz Summary: A tool for viewing USB trace files from usbmon and other usb dump formats + +%if 0%{suse_version} >= 1120 BuildArch: noarch +%endif + Url: http://vusb-analyzer.sourceforge.net BuildRequires: python-gtk Requires: python-gtk %{py_requires} +%{!?python_sitelib: %global python_sitelib %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} + +%if 0%suse_version >= 1120 +%define py_inst_dir %python_sitelib +%else +%define py_inst_dir %python_sitearch +%endif + %description The Virtual USB Analyzer is a free and open source tool for visualizing logs of USB packets, from hardware or software USB sniffer tools. The @@ -43,7 +56,7 @@ Micah Dowty <micah(a)vmware.com> %prep -%setup -c %{name}-%{version} +%setup -q -c %{name}-%{version} %build @@ -51,8 +64,8 @@ cd vusb-analyzer-1.1 install -d $RPM_BUILD_ROOT/%{_bindir} install -m 0755 "vusb-analyzer" $RPM_BUILD_ROOT/%{_bindir} -install -d $RPM_BUILD_ROOT/%{python_sitelib} -cp -a VUsbTools $RPM_BUILD_ROOT/%{python_sitelib} +install -d $RPM_BUILD_ROOT/%{py_inst_dir} +cp -a VUsbTools $RPM_BUILD_ROOT/%{py_inst_dir} %clean rm -rf "$RPM_BUILD_ROOT" @@ -60,6 +73,6 @@ %files %defattr(-,root,root) %{_bindir}/vusb-analyzer -%{python_sitelib}/VUsbTools +%{py_inst_dir}/VUsbTools %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wdiff for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package wdiff for openSUSE:Factory checked in at Mon Sep 27 16:12:10 CEST 2010. -------- --- wdiff/wdiff.changes 2009-08-26 14:18:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/wdiff/wdiff.changes 2010-08-24 15:03:17.000000000 +0200 @@ -1,0 +2,22 @@ +Tue Aug 24 14:57:47 CEST 2010 - pgajdos(a)suse.cz + +- update to 0.6.3: + * `wdiff -d' to read input from single unified diff, perhaps stdin. + * Updated texinfo documentation taking experimental switch into account. + * Experimental programs (mdiff & friends) and a configure switch + --enable-experimental to control them. + * Recent imports from gnulib, use of recent autotools. + * Improved autodetection of termcap library like ncurses. + * Reformatted translations, still a number of fuzzy translations. + * Changed from CVS to bzr for source code version control. + * Various bug fixes. See ChangeLog for a more exhaustive list. + * Introduce --with-default-pager=PAGER configure switch. + * Fix missing newline in info dir entry list. + * Fix shell syntax in configure script + * Updated gnulib and gettext, the latter to 0.18 + * Updated Dutch translation + * Fixed a number of portability issues reported by maint.mk syntax checks + * Updated Italian and Swedish translations + * Updated gnulib + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- happy-gcc.patch linenumber_ansi.patch wdiff-0.5.93-diff.patch wdiff-0.5.93-lermen.patch wdiff-0.5.93.tar.bz2 New: ---- wdiff-0.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wdiff.spec ++++++ --- /var/tmp/diff_new_pack.b1USHv/_old 2010-09-27 16:10:38.000000000 +0200 +++ /var/tmp/diff_new_pack.b1USHv/_new 2010-09-27 16:10:38.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package wdiff (Version 0.5.93) +# spec file for package wdiff (Version 0.6.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,24 +20,17 @@ Name: wdiff BuildRequires: ncurses-devel -Url: http://www.gnu.org/software/wdiff/ +Url: ftp://mirrors.kernel.org/gnu/wdiff/ License: GPLv2+ Group: Productivity/Text/Utilities AutoReqProv: on -Version: 0.5.93 +Version: 0.6.3 Release: 1 Summary: Display Word Differences Between Text Files Source: http://alpha.gnu.org/gnu/wdiff/wdiff-%{version}.tar.bz2 -Patch: wdiff-%{version}-lermen.patch -Patch2: wdiff-%{version}-diff.patch -Patch3: happy-gcc.patch -Patch4: linenumber_ansi.patch -# upstreamed -# Patch1: wdiff-%{pversion}-tempfile.patch -# obsoleted by autoconf -# Patch3: wdiff-%{pversion}-nb.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq +Recommends: %{name}-lang %description wdiff compares two files and finds which words have been deleted or @@ -53,36 +46,42 @@ Francois Pinard <pinard(a)iro.umontreal.ca> Hans Lermen <lermen(a)fgan.de> +%package lang +License: GPLv2+ +Summary: Translations for Wdiff +Group: Productivity/Text/Utilities +Requires: %{name} = %{version} + +%description lang +Contains language specific files for of wdiff. + %prep %setup -q -%patch -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 %build # those autoconf tools never really work, do they? # error: AC_REQUIRE: circular dependency of AC_GNU_SOURCE # autoreconf -fi LIBS=-lncurses \ -CFLAGS="$RPM_OPT_FLAGS -pipe -DPROTOTYPES -DLERMEN_STUFF" \ +CFLAGS="$RPM_OPT_FLAGS -pipe -DPROTOTYPES" \ GETOPT="" \ %configure make %install make "DESTDIR=$RPM_BUILD_ROOT" install -install -m 755 src/xwdiff $RPM_BUILD_ROOT/usr/bin -rm -rf $RPM_BUILD_ROOT/usr/share/locale/no +%find_lang %{name}-gnulib %find_lang %{name} -%files -f %{name}.lang +%files %defattr(-,root,root) %doc BACKLOG ChangeLog NEWS README* THANKS TODO ABOUT-NLS AUTHORS COPYING %{_infodir}/wdiff.info* /usr/bin/* %{_mandir}/man1/* +%files lang -f %{name}-gnulib.lang -f %{name}.lang + %clean rm -rf %{buildroot} ++++++ wdiff-0.5.93.tar.bz2 -> wdiff-0.6.3.tar.bz2 ++++++ ++++ 185234 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package installation-images for openSUSE:Factory checked in at Mon Sep 27 16:10:24 CEST 2010. -------- --- installation-images/installation-images.changes 2010-09-24 15:16:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2010-09-27 15:12:05.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 27 15:11:20 CEST 2010 - snwint(a)suse.de + +- fix root image + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-12.64.tar.bz2 needed_space_in_mb New: ---- installation-images-12.65.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.jzbPie/_old 2010-09-27 16:08:01.000000000 +0200 +++ /var/tmp/diff_new_pack.jzbPie/_new 2010-09-27 16:08:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 12.64) +# spec file for package installation-images (Version 12.65) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -109,9 +109,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 12.64 +Version: 12.65 Release: 1 -Source: installation-images-12.64.tar.bz2 +Source: installation-images-12.65.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -195,7 +195,7 @@ # careful: will make all non-matching initrds fail hard # export instsys_complain_root=2 # beta only: ignore non-critical errors -export debug=ignore +# export debug=ignore %if %has_sles make %else ++++++ installation-images-12.64.tar.bz2 -> installation-images-12.65.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.64/changelog new/installation-images-12.65/changelog --- old/installation-images-12.64/changelog 2010-09-24 15:15:20.000000000 +0200 +++ new/installation-images-12.65/changelog 2010-09-27 15:11:12.000000000 +0200 @@ -1,4 +1,7 @@ -2010-09-24: HEAD +2010-09-27: HEAD + - fix root image + +2010-09-24: 12.64 - fix building of initrd & rescue image 2010-09-10: 12.63 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.64/data/initrd/biostest.file_list new/installation-images-12.65/data/initrd/biostest.file_list --- old/installation-images-12.64/data/initrd/biostest.file_list 2010-09-10 14:55:47.000000000 +0200 +++ new/installation-images-12.65/data/initrd/biostest.file_list 2010-09-27 12:40:19.000000000 +0200 @@ -15,8 +15,8 @@ libnewt0_52: /usr/lib*/libnewt.so.* -slang: - /usr/lib*/libslang.so.* +libslang2: + / terminfo-base: /usr/share/terminfo/l/linux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.64/data/root/gdb.file_list new/installation-images-12.65/data/root/gdb.file_list --- old/installation-images-12.64/data/root/gdb.file_list 2010-09-10 14:55:47.000000000 +0200 +++ new/installation-images-12.65/data/root/gdb.file_list 2010-09-27 14:40:12.000000000 +0200 @@ -1,15 +1,20 @@ gdb: /usr/bin/gdb -libpython2_6-1_0: - /usr/lib* +libpython*-*: + / + +if exists(valgrind) + valgrind: + / +endif + + +: x gdb.init .init x gdb.done .done -if exists(valgrind) -valgrind: - /usr/bin - /usr/lib* -endif +# remove, ehm, things... +r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.64/data/root/machbunt.file_list new/installation-images-12.65/data/root/machbunt.file_list --- old/installation-images-12.64/data/root/machbunt.file_list 2010-09-10 14:55:47.000000000 +0200 +++ new/installation-images-12.65/data/root/machbunt.file_list 2010-09-27 14:17:36.000000000 +0200 @@ -2,14 +2,16 @@ /bin/ash.static libfreetype6: - /usr/lib* + / ltrace: - /usr/bin/ltrace - /etc/ltrace.conf + / libelf0: - /usr/lib*/libelf.so.* + / + +libtalloc2: + / if with_yast2 ne 'no' if arch eq 's390' || arch eq 's390x' @@ -28,11 +30,7 @@ xorg-x11-server: /etc/X11/xorg.conf.d /usr/bin/Xorg - - /usr/lib*/xorg/modules/extensions - /usr/lib*/xorg/modules/linux/lib*.so - - /usr/lib*/xorg/modules/lib*.so + /usr/lib*/xorg/modules xorg-x11-driver-input: /etc/X11/xorg.conf.d @@ -97,7 +95,8 @@ xorg-x11-libX11: /usr/lib*/libX11.so.* - /usr/share/X11/{XErrorDB,XKeysymDB} + /usr/share/X11/XErrorDB + # /usr/share/X11/XKeysymDB /usr/share/X11/locale xorg-x11-libXau: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.64/data/root/root.file_list new/installation-images-12.65/data/root/root.file_list --- old/installation-images-12.64/data/root/root.file_list 2010-09-10 14:55:47.000000000 +0200 +++ new/installation-images-12.65/data/root/root.file_list 2010-09-27 14:29:12.000000000 +0200 @@ -3,9 +3,26 @@ # the 'root' system # -d bin dev etc lib mnt root sbin tmp usr var +d bin dev etc lib mnt root sbin tmp usr var proc c 1777 0 0 tmp +d /var/adm /var/tmp /var/lib/{amanda,gdm,news,pgsql,rpm,uucp/taylor_config} +d /var/lock/subsys +d /var/log/news /var/named /var/run /var/spool/{atjobs,fax,fnet,lpd,mail,postfix,rwho,uucp} + +s ../lock /var/spool/locks + +t /var/log/{faillog,lastlog,mail,messages,sendmail.st,wtmp,xdm.errors} +t /var/log/news/news.{crit,err,notice} + +c 1777 0 0 /var/tmp + +d /usr/{bin,lib,lib64,libexec,sbin,share} + +s ../var/spool /usr/spool +s ../var/tmp /usr/tmp + + # add some /etc files x /etc/* /etc r /etc/ssh @@ -16,6 +33,12 @@ r /etc/motd r /etc/issue +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# packages without scripts +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + fillup: /bin @@ -23,18 +46,6 @@ /etc /sbin -aaa_base: prein,postin -e prein - /etc/init.d - /etc/inputrc -e echo set bell-style none >>etc/inputrc - /etc/rc.status - /usr/bin/old - # /root/.gnupg/suse_build_key - /var/adm/fillup-templates -e postin -r /var/adm/fillup-templates - tar: /bin/tar @@ -75,7 +86,6 @@ /usr/bin/stat endif - gzip: bin/g{un,}zip @@ -126,15 +136,9 @@ dbus-1-glib: / -dbus-1: prein - / - e save_cfg etc/passwd etc/shadow etc/group - e prein - e restore_cfg etc/passwd etc/shadow etc/group - -if arch eq 'i386' || arch eq 'x86_64' || arch eq 'ia64' +if exists(libsmbios2) libsmbios2: - /usr/lib*/libsmbios.so.* + / endif dmraid: @@ -208,7 +212,7 @@ /usr/sbin/rpcinfo /usr/bin /etc/rpc -r /usr/bin/{catchsegv,gencat,getconf,getent,glibcbug,lddlibc4,mtrace,rpcgen,sprof} +r /usr/bin/{catchsegv,gencat,getconf,glibcbug,lddlibc4,mtrace,rpcgen,sprof} r /usr/sbin/{nscd,nscd_nischeck,utmpd} /lib*/libpthread{.,-}* /lib*/libthread_db{.,-}* @@ -216,7 +220,7 @@ libselinux1: / -if !(arch eq 's390' || arch eq 's390x') +if exists(hdparm) hdparm: /sbin/hdparm endif @@ -251,26 +255,12 @@ /sbin/activate endif -if arch eq 'ia64' +if exists(efibootmgr) efibootmgr: - /usr/sbin/efibootmgr + / libunwind: - /lib/libunwind.so* -endif - -if arch eq 's390' || arch eq 's390x' - s390-tools: postin - /sbin/zipl - /etc - /sbin/dasdfmt - /sbin/dasdview - /sbin/fdasd - /sbin/dasd_configure - /sbin/dasd_reload - /sbin/dasdro - /sbin/vmcp - e postin + / endif dosfstools: @@ -283,12 +273,6 @@ /sbin/plipconfig endif -rpcbind: postin - /etc - /sbin - /var/adm/fillup-templates -e postin - libtirpc1: /etc /lib* @@ -318,22 +302,6 @@ /usr/sbin/update_flash endif -d /var/adm /var/tmp /var/lib/{amanda,gdm,news,pgsql,rpm,uucp/taylor_config} -d /var/lock/subsys -d /var/log/news /var/named /var/run /var/spool/{atjobs,fax,fnet,lpd,mail,postfix,rwho,uucp} - -s ../lock /var/spool/locks - -t /var/log/{faillog,lastlog,mail,messages,sendmail.st,wtmp,xdm.errors} -t /var/log/news/news.{crit,err,notice} - -c 1777 0 0 /var/tmp - -d /usr/{bin,lib,lib64,libexec,sbin,share} - -s ../var/spool /usr/spool -s ../var/tmp /usr/tmp - grep: /bin/{,e,f}grep @@ -378,171 +346,172 @@ r /usr/lib/ia32el/auxapp endif -c 0755 0 0 /usr/bin -c 0755 0 0 /usr/lib* -c 0755 0 0 /usr/sbin -c 0755 0 0 /usr/share +yast2: + /etc/YaST2 + /sbin/save_y2logs + /usr + /var + r /usr/lib/YaST2/servers_non_y2/ag_cron + s /usr/lib/YaST2/startup/YaST2.First-Stage /sbin/yast + r /usr/lib/YaST2/bin/yast2 -x /etc/ld.so.conf /etc +yast2-add-on: + / +yast2-bootloader: + / -if with_yast2 ne 'no' - yast2: - /etc/YaST2 - /sbin/save_y2logs - /usr - /var - r /usr/lib/YaST2/servers_non_y2/ag_cron - s /usr/lib/YaST2/startup/YaST2.First-Stage /sbin/yast - r /usr/lib/YaST2/bin/yast2 +yast2-core: + / - yast2-add-on: - / - yast2-bootloader: - / - yast2-core: - / - yast2-country: - / - yast2-country-data: - / - yast2-devtools: - /usr/bin/y2tool - /usr/share/YaST2/data/devtools/bin/showy2log - yast2-installation: - / - # back to fullscreen - netpbm tools are in machbunt.file_list - r /usr/lib/YaST2/startup/InstallImages/* - # hack to make 'repair' option work - # p repair.diff +yast2-country: + / + +yast2-country-data: + / + +yast2-devtools: + /usr/bin/y2tool + /usr/share/YaST2/data/devtools/bin/showy2log + +yast2-installation: + / + # back to fullscreen - netpbm tools are in machbunt.file_list + r /usr/lib/YaST2/startup/InstallImages/* + # hack to make 'repair' option work + # p repair.diff + +yast2-iscsi-client: + / + +yast2-kdump: + / + +yast2-mouse: + / + +yast2-multipath: + / + +yast2-ncurses: + / + +yast2-network: + / + +yast2-nfs-client: + / + +yast2-ntp-client: + / + +yast2-packager: + / + +yast2-perl-bindings: + / + +yast2-pkg-bindings: + / + +yast2-runlevel: + / - yast2-iscsi-client: - / - yast2-kdump: - / - yast2-mouse: - / - yast2-multipath: - / - yast2-ncurses: - / - yast2-network: - / - yast2-nfs-client: - / - yast2-ntp-client: - / - yast2-packager: - / - yast2-perl-bindings: - / - yast2-pkg-bindings: - / -# yast2-repair: -# / - yast2-runlevel: - / if arch eq 's390' || arch eq 's390x' yast2-s390: / yast2-reipl: / endif - yast2-slp: - / - yast2-storage: postin - / - E postin - libstorage: postin - / - E postin - yast2-transfer: - / - yast2-tune: - / + +yast2-slp: + / + +yast2-transfer: + / + +yast2-tune: + / + if arch eq 'i386' || arch eq 'x86_64' yast2-vm: / endif - yast2-xml: - / - yast2-update: - / - yast2-users: - /usr/share/YaST2/clients/inst_root_first.ycp - /usr/share/YaST2/clients/inst_user_first.ycp - /usr/share/YaST2/clients/users_finish.ycp - /usr/share/YaST2/clients/users_proposal.ycp - /usr/share/YaST2/modules/UsersSimple.pm - /usr/share/YaST2/modules/UsersUI.* - /usr/share/YaST2/scrconf/crack.scr - /usr/lib*/YaST2/plugin/libpy2ag_crack.so* - yast2-libyui: - /usr/lib*/libyui* +yast2-xml: + / - yast2-ycp-ui-bindings: - /usr/lib*/YaST2/plugin/libpy2UI.so.* +yast2-update: + / - yast2-ncurses-pkg: - / +yast2-users: + /usr/share/YaST2/clients/inst_root_first.ycp + /usr/share/YaST2/clients/inst_user_first.ycp + /usr/share/YaST2/clients/users_finish.ycp + /usr/share/YaST2/clients/users_proposal.ycp + /usr/share/YaST2/modules/UsersSimple.pm + /usr/share/YaST2/modules/UsersUI.* + /usr/share/YaST2/scrconf/crack.scr + /usr/lib*/YaST2/plugin/libpy2ag_crack.so* - yast2-hardware-detection: - / +yast2-libyui: + /usr/lib*/libyui* - autoyast2-installation: - / +yast2-ycp-ui-bindings: + /usr/lib*/YaST2/plugin/libpy2UI.so.* - gpart: - /usr/bin +yast2-ncurses-pkg: + / - libcurl4: - /usr/lib*/libcurl.so* +yast2-hardware-detection: + / - libssh2-1: - / +autoyast2-installation: + / - libcares2: - /usr/lib*/libcares.so.* +gpart: + /usr/bin - openslp: - /etc/slp.spi - /etc/slp.conf - /usr/bin/slptool - /usr/lib*/libslp.so.* +libcurl4: + /usr/lib*/libcurl.so* - libblocxx6: - /usr/lib*/libblocxx.so.* +libssh2-1: + / - libpcre0: - /lib* +libcares2: + /usr/lib*/libcares.so.* - limal: - / +openslp: + /etc/slp.spi + /etc/slp.conf + /usr/bin/slptool + /usr/lib*/libslp.so.* - limal-perl: - / +libblocxx6: + /usr/lib*/libblocxx.so.* - libblocxx6: - / +libpcre0: + /lib* -endif +limal: + / + +limal-perl: + / + +libblocxx6: + / zlib: /lib*/libz.so.1* -c 0755 0 0 /usr - libstdc++45: /usr/<lib> eject: /bin/eject -# remove these: -r root mnt tmp usr/libexec - -if arch eq 'i386' +if exists(syslinux) syslinux: /usr/bin/syslinux endif @@ -573,8 +542,8 @@ gawk: /bin -# uses update-alternatives now -s gawk bin/awk + # uses update-alternatives now + s gawk bin/awk if arch eq 'ppc' || arch eq 'ppc64' pdisk: @@ -630,13 +599,12 @@ x etc/syslogd /sbin/syslogd if arch ne 's390' && arch ne 's390x' -libopensc2: - /usr/lib*/libopensc.so.* - /usr/lib*/libscconf.so.* - -libltdl7: - /usr/lib* + libopensc2: + /usr/lib*/libopensc.so.* + /usr/lib*/libscconf.so.* + libltdl7: + /usr/lib* endif pcsc-lite: @@ -645,17 +613,6 @@ libopenct1: /usr/lib*/libopenct.so* -openssh: prein - /etc/ssh - /etc/pam.d/sshd - /etc/init.d/sshd - d /etc/sysconfig - t /etc/sysconfig/ssh - /usr/bin - /usr/sbin - /usr/lib* - e prein - krb5: /etc /usr/lib*/libkrb5.so.* @@ -691,11 +648,6 @@ libxcrypt: /lib* -if 0 -cracklib-dict-full: - /usr/share/cracklib -endif - libcrack2: / @@ -718,9 +670,11 @@ x root/.bash_login /root x root/.vimrc /root +libparted0: + / + parted: - /usr/sbin - /usr/lib* + / jfsutils: /sbin/{fsck.jfs,mkfs.jfs,jfs_logdump,jfs_tune} @@ -786,11 +740,16 @@ /usr/sbin pwdutils: - /etc/pam.d/passwd - /etc/pam.d/shadow + /etc + /usr/bin + /usr/sbin/pwunconv /usr/sbin/chpasswd - /usr/bin/passwd -c 644 0 0 /etc/shadow + /usr/sbin/groupadd + /usr/sbin/groupadd.local + /usr/sbin/useradd + /usr/sbin/useradd.local + /usr/lib*/pwdutils/liblog_syslog.so.* + d /etc/skel ntfsprogs: /usr/sbin/ntfsresize @@ -829,6 +788,8 @@ /usr/lib/perl*/*/Class/Struct.pm /usr/lib/perl*/*/Exporter{,.pm} /usr/lib/perl*/*/File/Basename.pm + /usr/lib/perl*/*/File/Path.pm + /usr/lib/perl*/*/File/Temp.pm /usr/lib/perl*/*/*/File/Spec.pm /usr/lib/perl*/*/*/File/Spec /usr/lib/perl*/*/FileHandle.pm @@ -997,15 +958,63 @@ satsolver-tools: /usr/bin -r /usr/X11R6/bin/mkfontdir -r /usr/X11R6/bin/mkfontscale -r /usr/X11R6/bin/fc-cache +sed: + /bin/sed -x /usr/lib/YaST/.Reh /usr/lib/YaST2 -x etc/inst_setup /sbin/inst_setup -x etc/adddir /sbin/adddir -c 755 0 0 /sbin/inst_setup -c 755 0 0 /sbin/adddir + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# +# packages with scripts +# +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +aaa_base: prein,postin + E prein + / + E postin + +dbus-1: prein + / + E prein + +if exists(s390-tools) + s390-tools: postin + /sbin/zipl + /etc + /sbin/dasdfmt + /sbin/dasdview + /sbin/fdasd + /sbin/dasd_configure + /sbin/dasd_reload + /sbin/dasdro + /sbin/vmcp + E postin +endif + +rpcbind: postin + /etc + /sbin + /var/adm/fillup-templates + E postin + +yast2-storage: postin + / + E postin + +libstorage: postin + / + E postin + +openssh: prein + /etc/ssh + /etc/pam.d/sshd + /etc/init.d/sshd + d /etc/sysconfig + t /etc/sysconfig/ssh + /usr/bin + /usr/sbin + /usr/lib* + E prein if root_i18n include rooti18n.file_list @@ -1023,6 +1032,20 @@ # remove, ehm, things... r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates +# remove these: ########### ??? +r root mnt tmp proc usr/libexec + +# ???? +#r /usr/X11R6/bin/mkfontdir +#r /usr/X11R6/bin/mkfontscale +#r /usr/X11R6/bin/fc-cache + +x /usr/lib/YaST/.Reh /usr/lib/YaST2 +x etc/inst_setup /sbin/inst_setup +x etc/adddir /sbin/adddir +c 755 0 0 /sbin/inst_setup +c 755 0 0 /sbin/adddir + if instsys_complain_root e echo "InstsysComplain: <instsys_complain_root>" >>.instsys.config endif @@ -1031,6 +1054,8 @@ e echo "InstsysID: <instsys_build_id>" >>.instsys.config endif +x /etc/ld.so.conf /etc + # final clean up r /etc/X11/xserver/C r /sbin/insserv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.64/VERSION new/installation-images-12.65/VERSION --- old/installation-images-12.64/VERSION 2010-09-24 15:15:17.000000000 +0200 +++ new/installation-images-12.65/VERSION 2010-09-27 15:11:09.000000000 +0200 @@ -1 +1 @@ -12.64 +12.65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-DBD-SQLite for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package perl-DBD-SQLite for openSUSE:Factory checked in at Mon Sep 27 16:07:46 CEST 2010. -------- --- perl-DBD-SQLite/perl-DBD-SQLite.changes 2010-03-30 21:29:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-DBD-SQLite/perl-DBD-SQLite.changes 2010-09-15 17:28:24.000000000 +0200 @@ -1,0 +2,25 @@ +Wed Sep 15 15:24:49 UTC 2010 - chris(a)computersalat.de + +- fix FIXME: need a way of adding our RPM_OPT_FLAGS to CFLAGS without + overwriting its existing contents: + o perl Makefile.PL CCFLAGS="$RPM_OPT_FLAGS" + => + {__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +- fix devel deps + o Req: perl = {perl_version} + +------------------------------------------------------------------- +Wed Sep 15 11:08:43 UTC 2010 - jw(a)novell.com + +- Update to 1.31 + - Updated to SQLite 3.7.2 (DUNCAND) + - Resolved # 60860: Slow but steady memory leak on + last_insert_id calls (ISHIGAKI) + - Upgraded ppport.h to the latest version (ADAMK) + - Resolved #60698: "Test failures with SQLite 3.7", using included + patch by Niko Tyni (ntyni(a)debian.org) of t/lib/Test.pm (DUNCAND) + - Added support for FTS3 tokenizers written in Perl. Added tests + ... + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- DBD-SQLite-1.30_02.tar.bz2 New: ---- DBD-SQLite-1.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBD-SQLite.spec ++++++ --- /var/tmp/diff_new_pack.M6vrW5/_old 2010-09-27 16:06:44.000000000 +0200 +++ /var/tmp/diff_new_pack.M6vrW5/_new 2010-09-27 16:06:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-DBD-SQLite (Version 1.30_02) +# spec file for package perl-DBD-SQLite (Version 1.31) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,38 +21,41 @@ Name: perl-DBD-SQLite %define cpan_name DBD-SQLite Summary: Self-contained RDBMS in a DBI Driver -Version: 1.30_02 +Version: 1.31 Release: 1 -License: GPL/Artistic +License: GPL+ or Artistic Group: Development/Libraries/Perl -Url: http://www.cpan.org -Source0: http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/%{cpan_name}-%{version}.t… +Url: http://search.cpan.org/dist/DBD-SQLite/ +#Source: http://www.cpan.org/modules/by-module/DBD/DBD-SQLite-%{version}.tar.bz2 +Source: http://www.cpan.org/authors/id/A/AD/ADAMK/%{cpan_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl +%if 0%{?suse_version} < 1120 BuildRequires: perl-macros -#BuildRequires: perl(Module::Build) -BuildRequires: perl(Test::More) >= 0.42 -BuildRequires: perl(File::Spec) -# other not perl || perl-base -BuildRequires: perl-DBI >= 1.57 +%endif +BuildRequires: perl(DBI) >= 1.57 +BuildRequires: perl(File::Spec) >= 0.82 +BuildRequires: perl(Tie::Hash) +BuildRequires: perl(Test::More) >= 0.47 Requires: perl = %{perl_version} -Requires: perl(File::Spec) -# other not perl || perl-base -Requires: perl-DBI >= 1.57 +Requires: perl(DBI) >= 1.57 +Requires: perl(Tie::Hash) %description - SQLite is a small fast embedded SQL database engine. - - DBD::SQLite embeds that database engine into a DBD driver, so - if you want a relational database for your project, but don`t - want to install a large RDBMS system like MySQL or PostgreSQL, - then DBD::SQLite may be just what you need. - - It supports quite a lot of features, such as transactions (atomic - commit and rollback), indexes, DBA-free operation, a large subset - of SQL92 supported, and more. +SQLite is a small fast embedded SQL database engine. - Author: Matt Sergeant, matt(a)sergeant.org +DBD::SQLite embeds that database engine into a DBD driver, so +if you want a relational database for your project, but don`t +want to install a large RDBMS system like MySQL or PostgreSQL, +then DBD::SQLite may be just what you need. + +It supports quite a lot of features, such as transactions (atomic +commit and rollback), indexes, DBA-free operation, a large subset +of SQL92 supported, and more. + +Authors: +-------- + Matt Sergeant, matt(a)sergeant.org Perl extension functions contributed by Francis J. Lacoste <flacoste(a)logreport.org> @@ -63,16 +66,16 @@ License: GPL/Artistic Summary: Development files for %{name} Group: Development/Libraries/Perl +Requires: perl = %{perl_version} %description devel This package contains sqlite3.c / sqlite3.h files for development. - %prep %setup -q -n %{cpan_name}-%{version} %build -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" %{__make} %{?_smp_mflags} %check @@ -91,8 +94,8 @@ %{__rm} -rf $RPM_BUILD_ROOT %files -f %{name}.files -%defattr(-,root,root) -%doc Changes README LICENSE +%defattr(-,root,root,-) +%doc Changes LICENSE README %files devel -f %{name}-devel.files %defattr(-,root,root) ++++++ DBD-SQLite-1.30_02.tar.bz2 -> DBD-SQLite-1.31.tar.bz2 ++++++ ++++ 39647 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-IO-Tty for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package perl-IO-Tty for openSUSE:Factory checked in at Mon Sep 27 16:06:27 CEST 2010. -------- --- perl-IO-Tty/perl-IO-Tty.changes 2009-08-30 16:28:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-IO-Tty/perl-IO-Tty.changes 2010-09-17 17:39:15.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 17 15:37:54 UTC 2010 - chris(a)computersalat.de + +- recreated by cpanspec 1.78 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-IO-Tty.spec ++++++ --- /var/tmp/diff_new_pack.YMC3L9/_old 2010-09-27 16:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.YMC3L9/_new 2010-09-27 16:05:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-IO-Tty (Version 1.08) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,20 +19,26 @@ Name: perl-IO-Tty -Summary: Provides an Interface to Pseudo Tty's +%define cpan_name IO-Tty +Summary: Low-level allocate a pseudo-Tty, import constants Version: 1.08 -Release: 2 -Url: http://search.cpan.org/search?module=IO::Tty -License: GPL v2 or later +Release: 9 +License: GPL+ or Artistic Group: Development/Libraries/Perl -Requires: perl = %{perl_version} -Source: IO-Tty-%{version}.tar.bz2 +Url: http://search.cpan.org/dist/IO-Tty/ +#Source: http://www.cpan.org/authors/id/R/RG/RGIERSIG/IO-Tty-%{version}.tar.gz +Source: %{cpan_name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl +%if 0%{?suse_version} < 1120 +BuildRequires: perl-macros +%endif +Requires: perl = %{perl_version} %description -IO::Tty is a Perl module that provides an interface to pseudo tty's. - - +IO::Tty is used internally by IO::Pty to create a pseudo-tty. You wouldn't + want to use it directly except to import constants, use IO::Pty. For a + list of importable constants, see IO::Tty::Constant. Authors: -------- @@ -40,14 +46,14 @@ Nick Ing-Simmons <nik(a)tiuk.ti.com> %prep -%setup -n IO-Tty-%{version} +%setup -q -n %{cpan_name}-%{version} %build -perl Makefile.PL -make %{?jobs:-j%jobs} +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +%{__make} %{?_smp_mflags} %check -make test +%{__make} test %install %perl_make_install @@ -55,10 +61,10 @@ %perl_gen_filelist %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -%files -f %name.files -%defattr(-,root,root) -%doc ChangeLog MANIFEST README +%files -f %{name}.files +%defattr(-,root,root,-) +%doc ChangeLog README try %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit splashy for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package splashy for openSUSE:Factory checked in at Mon Sep 27 16:05:30 CEST 2010. -------- --- splashy/splashy.changes 2010-06-18 02:49:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/splashy/splashy.changes 2010-09-27 11:57:15.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 27 11:58:40 CEST 2010 - hmacht(a)suse.de + +- update libpng to libpng14 in setup-splashy.sh (bnc#634667) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ splashy.spec ++++++ --- /var/tmp/diff_new_pack.vnmES2/_old 2010-09-27 16:05:04.000000000 +0200 +++ /var/tmp/diff_new_pack.vnmES2/_new 2010-09-27 16:05:04.000000000 +0200 @@ -20,7 +20,7 @@ Name: splashy Summary: A complete user-space boot splash system Version: 0.3.13 -Release: 6 +Release: 13 License: GPLv2+ Group: System/Boot Url: http://splashy.alioth.debian.org/wiki/doku.php ++++++ setup-splashy.sh ++++++ --- /var/tmp/diff_new_pack.vnmES2/_old 2010-09-27 16:05:04.000000000 +0200 +++ /var/tmp/diff_new_pack.vnmES2/_new 2010-09-27 16:05:04.000000000 +0200 @@ -29,7 +29,7 @@ /usr/$LIBDIR/libdirect-1.2.so.9 \ /usr/$LIBDIR/libdirectfb-1.2.so.9 \ /usr/$LIBDIR/libfusion-1.2.so.9 \ -/usr/$LIBDIR/libpng12.so.0 \ +/usr/$LIBDIR/libpng14.so.14 \ /usr/$LIBDIR/libglib-2.0.so.0 \ /usr/$LIBDIR/libsplashy.so.1 \ /usr/$LIBDIR/libsplashycnf.so.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

commit perl-Test-NoWarnings for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package perl-Test-NoWarnings for openSUSE:Factory checked in at Mon Sep 27 16:04:43 CEST 2010. -------- --- perl-Test-NoWarnings/perl-Test-NoWarnings.changes 2010-01-10 16:08:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Test-NoWarnings/perl-Test-NoWarnings.changes 2010-09-13 14:55:57.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Sep 13 12:51:49 UTC 2010 - lars(a)linux-schulserver.de + +- update to 1.02: + + Remove the need for a private variable when detecting + Devel::StackTrace support + + Don't import unused functions from Carp or Test::Builder + + Minor documentation tweaks + + Correct the repository metadata in META.yml + + Minor cleanups in the eumm-update generated code + + Added a dedicated compile test + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Test-NoWarnings-0.084.tar.bz2 New: ---- Test-NoWarnings-1.02.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-NoWarnings.spec ++++++ --- /var/tmp/diff_new_pack.XtxzRP/_old 2010-09-27 16:04:13.000000000 +0200 +++ /var/tmp/diff_new_pack.XtxzRP/_new 2010-09-27 16:04:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Test-NoWarnings (Version 0.084) +# spec file for package perl-Test-NoWarnings (Version 1.02) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: perl-Test-NoWarnings %define cpan_name %( echo %{name} | %{__sed} -e 's,perl-,,' ) Summary: Make sure you didn't emit any warnings while testing -Version: 0.084 -Release: 3 +Version: 1.02 +Release: 1 License: Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/perldoc?Test::NoWarnings @@ -71,6 +71,6 @@ %files -f %{name}.files # normally you only need to check for doc files %defattr(-,root,root) -%doc CHANGES README +%doc Changes LICENSE README %changelog ++++++ Test-NoWarnings-0.084.tar.bz2 -> Test-NoWarnings-1.02.tar.bz2 ++++++ ++++ 2273 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit strace for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package strace for openSUSE:Factory checked in at Mon Sep 27 16:04:02 CEST 2010. -------- --- strace/strace.changes 2010-04-15 14:42:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/strace/strace.changes 2010-07-07 01:20:20.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 6 23:19:50 UTC 2010 - jengelh(a)medozas.de + +- SPARC compile fixes +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- strace-sparc-proto.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strace.spec ++++++ --- /var/tmp/diff_new_pack.6BcVtl/_old 2010-09-27 16:03:03.000000000 +0200 +++ /var/tmp/diff_new_pack.6BcVtl/_new 2010-09-27 16:03:03.000000000 +0200 @@ -28,11 +28,12 @@ %endif # Version: 4.5.20 -Release: 1 +Release: 4 Summary: A utility to trace the system calls of a program Source: http://dl.sourceforge.net/strace/strace-%{version}.tar.bz2 Source2: baselibs.conf Patch: strace-%{version}.diff +Patch2: strace-sparc-proto.diff Url: http://sourceforge.net/projects/strace/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,14 +53,19 @@ %prep %setup -q %patch -p1 +%patch2 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" %ifarch alpha CFLAGS="$CFLAGS -ffixed-8" %endif -./configure --prefix=%{_prefix} --mandir=%{_mandir} -make +./configure \ +%ifarch %sparc + --host=%_target_platform \ +%endif + --prefix=%{_prefix} --mandir=%{_mandir} +make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT ++++++ strace-sparc-proto.diff ++++++ --- linux/sparc/syscall.h | 6 ++++++ 1 file changed, 6 insertions(+) Index: strace-4.5.20/linux/sparc/syscall.h =================================================================== --- strace-4.5.20.orig/linux/sparc/syscall.h +++ strace-4.5.20/linux/sparc/syscall.h @@ -215,6 +215,12 @@ int sys_move_pages(), sys_getcpu(); int sys_epoll_pwait(); int sys_signalfd(), sys_timerfd(), sys_eventfd(); +int sys_mbind(), sys_get_mempolicy(), sys_set_mempolicy(); +int sys_utimensat(), sys_timerfd_create(), sys_fallocate(); +int sys_timerfd_settime(), sys_timerfd_gettime(), sys_signalfd4(); +int sys_eventfd2(), sys_epoll_create1(), sys_dup3(), sys_pipe2(); +int sys_inotify_init1(); + # define SYS_socket_subcall 353 #define SYS_sub_socket (SYS_socket_subcall + 1) #define SYS_sub_bind (SYS_socket_subcall + 2) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk-vnc for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package gtk-vnc for openSUSE:Factory checked in at Mon Sep 27 16:02:52 CEST 2010. -------- --- GNOME/gtk-vnc/gtk-vnc.changes 2010-08-09 15:31:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/gtk-vnc/gtk-vnc.changes 2010-09-27 14:57:35.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 27 12:21:49 UTC 2010 - seife(a)opensuse.org + +- Add gtk-vnc-0.4.1-close-buffer.patch to fix virt-manager crashes + (bnc#641981, rh#620843). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gtk-vnc-0.4.1-close-buffer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-vnc.spec ++++++ --- /var/tmp/diff_new_pack.9K79rm/_old 2010-09-27 16:02:29.000000000 +0200 +++ /var/tmp/diff_new_pack.9K79rm/_new 2010-09-27 16:02:29.000000000 +0200 @@ -28,11 +28,13 @@ BuildRequires: python-gtk-devel Summary: A GTK widget for VNC clients Version: 0.4.1 -Release: 1 +Release: 2 # FIXME: see if the browser plugin can be built (last try 0.4.1) License: LGPLv2.1 ; LGPLv2.1+ Group: Development/Libraries/X11 Source: http://downloads2.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gtk-vnc-0.4.1-close-buffer.patch bnc#641981 seife(a)opensuse.org -- Taken from upstream, 55d0ee7b +Patch1: gtk-vnc-0.4.1-close-buffer.patch Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://gtk-vnc.sf.net/ @@ -111,6 +113,7 @@ %lang_package %prep %setup -q +%patch1 -p1 %build # We use --with-examples since this will build gvncviewer, which is neat ++++++ gtk-vnc-0.4.1-close-buffer.patch ++++++ diff -rup gtk-vnc-0.4.1.orig/src/vncconnection.c gtk-vnc-0.4.1.new/src/vncconnection.c --- gtk-vnc-0.4.1.orig/src/vncconnection.c 2010-07-14 11:28:15.000000000 +0100 +++ gtk-vnc-0.4.1.new/src/vncconnection.c 2010-08-06 10:12:27.621989062 +0100 @@ -4191,7 +4191,12 @@ static void vnc_connection_close(VncConn priv->name = NULL; } - g_free (priv->xmit_buffer); + if (priv->xmit_buffer) { + g_free(priv->xmit_buffer); + priv->xmit_buffer = NULL; + priv->xmit_buffer_size = 0; + priv->xmit_buffer_capacity = 0; + } if (priv->cred_username) { g_free(priv->cred_username); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit git for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at Mon Sep 27 16:02:05 CEST 2010. -------- New Changes file: --- /dev/null 2010-07-09 01:59:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/git/cgit.changes 2010-08-20 17:43:00.000000000 +0200 @@ -0,0 +1,46 @@ +------------------------------------------------------------------- +Fri Aug 20 17:41:32 CEST 2010 - anschneider(a)exsuse.de + +- fixed more segfaults in cgit. + +------------------------------------------------------------------- +Fri Aug 20 16:29:03 CEST 2010 - anschneider(a)exsuse.de + +- fix cgit segfault when using git > 1.7 +- update to version 0.8.3.3 +- get debuginfo working, don't strip binaries. + +------------------------------------------------------------------- +Fri Aug 20 10:02:44 CEST 2010 - tiwai(a)suse.de + +- updated to git 1.7.2.2 + +------------------------------------------------------------------- +Thu Jul 29 13:52:36 CEST 2010 - tiwai(a)suse.de + +- fix missing link with libpthread + +------------------------------------------------------------------- +Thu Jul 29 13:43:28 CEST 2010 - tiwai(a)suse.de + +- updated to git 1.7.2.1: minor fixes for git-instaweb, git-web, + git-config. See release note: + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.1.txt + +------------------------------------------------------------------- +Thu Jul 22 12:19:02 CEST 2010 - tiwai(a)suse.de + +- updated to git 1.7.2: mostly bug fixes and small enhancements; + see the release note: + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.txt +- gitweb stuff is moved to /usr/share/gitweb + +------------------------------------------------------------------- +Sun Apr 25 18:29:34 UTC 2010 - poletti.marco(a)gmail.com + +- Build against version 1.7.0.3 of git instead of 1.6.4.3. + +------------------------------------------------------------------- +Fri Feb 5 16:37:58 UTC 2010 - poletti.marco(a)gmail.com + +- Initial release, version 0.8.3.1 --- git/git.changes 2010-06-01 03:35:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/git/git.changes 2010-08-20 10:02:32.000000000 +0200 @@ -1,0 +2,24 @@ +Fri Aug 20 09:54:04 CEST 2010 - tiwai(a)suse.de + +- updated to git 1.7.2.2: + This is primarily for fixing a hanging bug in the smart http + transport, but also comes with a lot of documentation udpates. + See release note: + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.2.txt + +------------------------------------------------------------------- +Thu Jul 29 13:43:28 CEST 2010 - tiwai(a)suse.de + +- updated to git 1.7.2.1: minor fixes for git-instaweb, git-web, + git-config. See release note: + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.1.txt + +------------------------------------------------------------------- +Thu Jul 22 12:19:02 CEST 2010 - tiwai(a)suse.de + +- updated to git 1.7.2: mostly bug fixes and small enhancements; + see the release note: + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.txt +- gitweb stuff is moved to /usr/share/gitweb + +------------------------------------------------------------------- @@ -8,0 +33,5 @@ + +------------------------------------------------------------------- +Tue May 18 20:14:19 UTC 2010 - chris(a)computersalat.de + +- install missing gitweb.js calling whatdependson for head-i586 Old: ---- git-1.7.1.tar.bz2 New: ---- cgit-0.8.3.3.tar.bz2 cgit.changes cgit_fix_stringlist.patch cgit-link-fixes.diff cgitrc cgit.spec git-1.7.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cgit.spec ++++++ # # spec file for package cgit (Version 0.8.3.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %define git_version 1.7.2.2 Name: cgit Url: http://hjemli.net/git/cgit/ License: GPLv2 Group: Development/Libraries/C and C++ AutoReqProv: on Version: 0.8.3.3 Release: 1 Summary: A web frontend for git repositories Source0: %{name}-%{version}.tar.bz2 Source1: git-%{git_version}.tar.bz2 Source2: cgitrc Patch0: cgit-link-fixes.diff Patch1: cgit_fix_stringlist.patch # Requirements for cgit BuildRequires: git >= 1.7.1 BuildRequires: gnu-crypto libopenssl-devel libzip-devel # Requirements for cgitrc man page generation BuildRequires: asciidoc libxslt BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is an attempt to create a fast web interface for the git scm, using a builtin cache to decrease server io-pressure. Authors: -------- Lars Hjemli (hjemli(a)gmail.com) %prep %setup -q %setup -q -T -D -a 1 rm -rf git mv git-%{git_version} git %patch0 -p1 %patch1 -p1 %build make make man-doc %install make install CGIT_SCRIPT_PATH="%{buildroot}"/srv/www/htdocs/cgit mkdir -p "%{buildroot}"/srv/www/cgi-bin/cgit/ mv "%{buildroot}"/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi mkdir -p "%{buildroot}%{_mandir}"/man5/ cp cgitrc.5 "%{buildroot}%{_mandir}"/man5/cgitrc.5 mkdir -p "%{buildroot}"/etc cp %{SOURCE2} "%{buildroot}"/etc/cgitrc %clean make clean %files %defattr(-,root,root) %dir /srv/www/htdocs/cgit %dir /srv/www/cgi-bin/cgit /srv/www/cgi-bin/cgit/cgit.cgi /srv/www/htdocs/cgit/cgit.css /srv/www/htdocs/cgit/cgit.png %doc %{_mandir}/man5/cgitrc.5.gz %config(noreplace) /etc/cgitrc %changelog ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.W5eX0c/_old 2010-09-27 16:00:27.000000000 +0200 +++ /var/tmp/diff_new_pack.W5eX0c/_new 2010-09-27 16:00:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package git (Version 1.7.1) +# spec file for package git (Version 1.7.2.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,7 +38,7 @@ BuildRequires: xmlto BuildRequires: python BuildRequires: perl-Error -Version: 1.7.1 +Version: 1.7.2.2 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPLv2+ @@ -288,11 +288,7 @@ cp gitweb/README README.gitweb install -d ${RPM_BUILD_ROOT}/usr/share/git-web install -d ${RPM_BUILD_ROOT}/etc/apache2/conf.d -install -m 755 gitweb/gitweb.cgi $RPM_BUILD_ROOT/usr/share/git-web/gitweb.cgi install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/gitweb.conf -for i in git-favicon.png git-logo.png gitweb.css; do - install -m 644 gitweb/$i $RPM_BUILD_ROOT/usr/share/git-web -done ### git-daemon install -d -m 755 $RPM_BUILD_ROOT/etc/init.d install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/git-daemon @@ -419,7 +415,7 @@ %dir /etc/apache2 %dir /etc/apache2/conf.d %config(noreplace) /etc/apache2/conf.d/gitweb.conf -/usr/share/git-web +/usr/share/gitweb /etc/apparmor.d %files remote-helpers ++++++ apache2-gitweb.conf ++++++ --- /var/tmp/diff_new_pack.W5eX0c/_old 2010-09-27 16:00:27.000000000 +0200 +++ /var/tmp/diff_new_pack.W5eX0c/_new 2010-09-27 16:00:27.000000000 +0200 @@ -1,6 +1,6 @@ -Alias /git/ "/usr/share/git-web/" +Alias /git/ "/usr/share/gitweb/" -<Directory "/usr/share/git-web"> +<Directory "/usr/share/gitweb"> Options ExecCGI AllowOverride None AddHandler cgi-script .cgi ++++++ cgit_fix_stringlist.patch ++++++ Index: cgit-0.8.3.3/cgit.c =================================================================== --- cgit-0.8.3.3.orig/cgit.c +++ cgit-0.8.3.3/cgit.c @@ -21,7 +21,7 @@ void add_mimetype(const char *name, cons { struct string_list_item *item; - item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes); + item = string_list_insert(&ctx.cfg.mimetypes, xstrdup(name)); item->util = xstrdup(value); } Index: cgit-0.8.3.3/ui-stats.c =================================================================== --- cgit-0.8.3.3.orig/ui-stats.c +++ cgit-0.8.3.3/ui-stats.c @@ -175,7 +175,7 @@ static void add_commit(struct string_lis info = cgit_parse_commit(commit); tmp = xstrdup(info->author); - author = string_list_insert(tmp, authors); + author = string_list_insert(authors, tmp); if (!author->util) author->util = xcalloc(1, sizeof(struct authorstat)); else @@ -186,7 +186,7 @@ static void add_commit(struct string_lis date = gmtime(&t); period->trunc(date); tmp = xstrdup(period->pretty(date)); - item = string_list_insert(tmp, items); + item = string_list_insert(items, tmp); if (item->util) free(tmp); item->util++; @@ -279,7 +279,7 @@ void print_combined_authorrow(struct str author = &authors->items[i]; authorstat = author->util; items = &authorstat->list; - date = string_list_lookup(tmp, items); + date = string_list_lookup(items, tmp); if (date) subtotal += (size_t)date->util; } @@ -331,7 +331,7 @@ void print_authors(struct string_list *a for (j = 0; j < period->count; j++) { tmp = period->pretty(tm); period->inc(tm); - date = string_list_lookup(tmp, items); + date = string_list_lookup(items, tmp); if (!date) html("<td>0</td>"); else { Index: cgit-0.8.3.3/ui-plain.c =================================================================== --- cgit-0.8.3.3.orig/ui-plain.c +++ cgit-0.8.3.3/ui-plain.c @@ -35,7 +35,7 @@ static void print_object(const unsigned ctx.page.mimetype = NULL; ext = strrchr(path, '.'); if (ext && *(++ext)) { - mime = string_list_lookup(ext, &ctx.cfg.mimetypes); + mime = string_list_lookup(&ctx.cfg.mimetypes, ext); if (mime) ctx.page.mimetype = (char *)mime->util; } ++++++ cgit-link-fixes.diff ++++++ --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< -EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto +EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread OBJECTS = OBJECTS += cache.o OBJECTS += cgit.o ++++++ cgitrc ++++++ # Enable caching of up to 1000 output entriess cache-size=1000 # Specify some default clone prefixes clone-prefix=ssh://domain.com/var/git # Specify the css url css=/git/cgit.css # Specify the logo url logo=/git/cgit.png # Show extra links for each repository on the index page enable-index-links=1 # Show number of affected files per commit on the log pages enable-log-filecount=1 # Show number of added/removed lines per commit on the log pages enable-log-linecount=1 # Set the title and heading of the repository index page root-title=git repositories # Allow download of tar.gz, tar.bz2 and zip-files snapshots=tar.gz tar.bz2 zip ## ## List of common mimetypes ## mimetype.git=image/git mimetype.html=text/html mimetype.jpg=image/jpeg mimetype.jpeg=image/jpeg mimetype.pdf=application/pdf mimetype.png=image/png mimetype.svg=image/svg+xml ## ## List of repositories. ## PS: Any repositories listed when section is unset will not be ## displayed under a section heading ## PPS: This list could be kept in a different file (e.g. '/etc/cgitrepos') ## and included like this: ## include=/etc/cgitrepos ## # Add your repositories here. # # Examples: # # repo.url=main # repo.path=/var/git/main.git # repo.desc=Main repository # repo.owner=your.email(a)domain.com # # repo.url=secondary # repo.path=/var/git/ut.git # repo.desc=Secondary repository # repo.owner=another.email(a)domain.com ++++++ completion-wordbreaks.diff ++++++ --- /var/tmp/diff_new_pack.W5eX0c/_old 2010-09-27 16:00:27.000000000 +0200 +++ /var/tmp/diff_new_pack.W5eX0c/_new 2010-09-27 16:00:27.000000000 +0200 @@ -1,6 +1,10 @@ ---- a/contrib/completion/git-completion.bash~ 2010-06-01 03:09:24.371191000 +0200 -+++ b/contrib/completion/git-completion.bash 2010-06-01 03:09:25.180182000 +0200 -@@ -54,10 +54,12 @@ +--- + contrib/completion/git-completion.bash | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/contrib/completion/git-completion.bash ++++ b/contrib/completion/git-completion.bash +@@ -72,10 +72,12 @@ # git(a)vger.kernel.org # ++++++ git-1.7.1.tar.bz2 -> git-1.7.2.2.tar.bz2 ++++++ ++++ 37923 lines of diff (skipped) ++++++ git-nohardlink.diff ++++++ --- /var/tmp/diff_new_pack.W5eX0c/_old 2010-09-27 16:00:29.000000000 +0200 +++ /var/tmp/diff_new_pack.W5eX0c/_new 2010-09-27 16:00:29.000000000 +0200 @@ -6,11 +6,11 @@ --- a/Makefile +++ b/Makefile -@@ -1667,7 +1667,6 @@ +@@ -2081,7 +2081,6 @@ cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \ - { for p in $(BUILT_INS); do \ + for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ - done; } && \ + done && \ ++++++ git-python-install-fix.diff ++++++ --- /var/tmp/diff_new_pack.W5eX0c/_old 2010-09-27 16:00:29.000000000 +0200 +++ /var/tmp/diff_new_pack.W5eX0c/_new 2010-09-27 16:00:29.000000000 +0200 @@ -1,10 +1,11 @@ --- + Makefile | 2 +- git_remote_helpers/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 2 files changed, 2 insertions(+), 2 deletions(-) --- a/git_remote_helpers/Makefile +++ b/git_remote_helpers/Makefile -@@ -25,7 +25,7 @@ +@@ -29,7 +29,7 @@ $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build install: $(pysetupfile) @@ -13,3 +14,14 @@ instlibdir: $(pysetupfile) @echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)" +--- a/Makefile ++++ b/Makefile +@@ -1700,7 +1700,7 @@ + $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py + $(QUIET_GEN)$(RM) $@ $@+ && \ + INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \ +- --no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \ ++ --no-print-directory prefix='$(prefix_SQ)' DESTDIR=\ + instlibdir` && \ + sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \ + -e 's|$os\.getenv("GITPYTHONLIB"$[^)]*)|\1,"@@INSTLIBDIR@@")|' \ ++++++ usr.share.git-web.gitweb.cgi ++++++ --- /var/tmp/diff_new_pack.W5eX0c/_old 2010-09-27 16:00:29.000000000 +0200 +++ /var/tmp/diff_new_pack.W5eX0c/_new 2010-09-27 16:00:29.000000000 +0200 @@ -1,7 +1,7 @@ # Last Modified: Fri Dec 19 11:03:49 2008 #include <tunables/global> -/usr/share/git-web/gitweb.cgi { +/usr/share/gitweb/gitweb.cgi { #include <abstractions/base> #include <abstractions/bash> #include <abstractions/nameservice> @@ -18,5 +18,6 @@ /usr/bin/perl ix, /usr/lib/git/git rix, /usr/bin/git-receive-pack rix, - /usr/share/git-web/* r, + /usr/share/gitweb/* r, + /usr/share/gitweb/static/* r, } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit subversion for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package subversion for openSUSE:Factory checked in at Mon Sep 27 15:53:01 CEST 2010. -------- --- subversion/subversion.changes 2010-01-24 01:46:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/subversion/subversion.changes 2010-09-20 18:23:46.000000000 +0200 @@ -1,0 +2,49 @@ +Mon Sep 20 16:22:25 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Do not include build date in binaries +- refresh patches + +------------------------------------------------------------------- +Tue Jun 22 21:50:10 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.6.12: + * further improvements for issue #3242 ("Subversion demands unnecessary access to parent directories of operations") + * allow deletion of uris which need character escaping (issue #3636) + * fix errors with 'svn mkdir --parents' (issue #3649) + * update address to which crash reports are sent (r901304) + * fix handling of peg revision'd copy targets (issue #3651) + * more improvements to 'svn merge --reintegrate' (r935631) + * allow copying of broken symlinks (issue #3303) + * improve rep-sharing performance on high-concurrency repos (issue #3506) + * fixed: added subtrees with mergeinfo break reintegrate (issue #3654) + * fixed: assertion triggered by tree-conflicted externals (issue #3469) + +- rolling back the in-tree sqlite-amalgamation from 3.6.17 to 3.6.13 (which is the version recommended by upstream) + +- added check in spec file to make sure we use the recommended sqlite (-amalgamation) version + +------------------------------------------------------------------- +Sun Apr 18 20:22:23 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 1.6.11: + * fix for repositories mounted via NFS + * enable TCP keep-alives in svnserve + * tighten restrictions on revprops for 'svnadmin verify' + * make ra_serf give better out-of-date information + * improve error message upon connection failure with svn+ssh:// + * allow 'svn log' on an uncommitted copy/move destination + * make 'svnadmin hotcopy' copy the fsfs config file + * mergeinfo improvements with non-inheritable mergeinfo + * make mergeinfo queries not require access to the repo root + * update URLs to refer the the new apache.org repository + * update relative externals during a switch + * fix 'merge --reintegrate' with self-referential mergeinfo + * improve wc-ng working copy detection + * improve handling of mergeinfo when using serf + * fixed: 'svnlook plist --revprop' with '-t TXN_NAME' + * fixed: file external from URL cannot overwrite existing item + * fixed: potential memory error in 'svn status' + * fixed: merge records mergeinfo from natural history gaps + * fixed: theoretical possibility of DB corruption + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sqlite-amalgamation-3.6.17.tar.bz2 subversion-1.6.9.tar.bz2 New: ---- sqlite-amalgamation-3.6.13.tar.bz2 subversion-1.6.12.tar.bz2 subversion-no-build-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.SgV6bV/_old 2010-09-27 15:51:37.000000000 +0200 +++ /var/tmp/diff_new_pack.SgV6bV/_new 2010-09-27 15:51:37.000000000 +0200 @@ -1,8 +1,8 @@ # -# spec file for package subversion (Version 1.6.9) +# spec file for package subversion (Version 1.6.12) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2009 Pascal Bleser <pascal.bleser(a)opensuse.org> +# Copyright (c) 2009-2010 Pascal Bleser <pascal.bleser(a)opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,11 +41,11 @@ %endif # suse_version > 1030 Name: subversion -Version: 1.6.9 +Version: 1.6.12 Release: 1 # in-tree SWIG version to use for the build: %define swig_version 1.3.36 -%define sqlite_version 3.6.17 +%define sqlite_version 3.6.13 %if 0%{?suse_version} > 910 BuildRequires: update-alternatives %endif # suse_version > 910 @@ -126,7 +126,7 @@ # Summary: A Concurrent Versioning system similar to but better than CVS BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: Subversion license, http://subversion.tigris.org/license-1.html +License: ASLv2 Group: Development/Tools/Version Control Url: http://subversion.tigris.org Source0: http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2 @@ -158,6 +158,7 @@ Patch33: subversion.header_wrappers.patch Patch35: subversion.java14.patch Patch36: subversion-ctypes-remove_shebang.patch +Patch37: subversion-no-build-date.patch # %if %with_ruby %if %{!?rb_arch:1}0 @@ -182,7 +183,7 @@ %package devel -License: ASLv.. +License: ASLv2 Group: Development/Libraries/C and C++ Summary: Development package for Subversion developers Requires: subversion = %{version} @@ -196,7 +197,7 @@ %package tools -License: ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html +License: ASLv2 ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control Summary: Tools for Subversion @@ -224,9 +225,10 @@ %package perl License: ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control -Summary: Allows Perl scripts to directly use Subversion repositories. +Summary: Allows Perl scripts to directly use Subversion repositories Requires: subversion = %{version} Requires: perl >= 5.8 +Requires: perl = %{perl_version} %description perl Provides Perl (SWIG) support for Subversion. @@ -236,7 +238,7 @@ %package python License: ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control -Summary: Allows Python scripts to directly use Subversion repositories. +Summary: Allows Python scripts to directly use Subversion repositories Requires: subversion = %{version} %if 0%{?sles_version} == 9 Requires: python25 @@ -264,7 +266,7 @@ %package ruby License: Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html Group: Development/Tools/Version Control -Summary: Allows Ruby scripts to directly use Subversion repositories. +Summary: Allows Ruby scripts to directly use Subversion repositories Requires: subversion = %{version} %description ruby @@ -275,7 +277,7 @@ %endif # with_ruby %package server -License: ASLv.. +License: ASLv2 Group: Development/Tools/Version Control Summary: Apache server module for Subversion server Requires: subversion = %{version} apache2 %{apache_mmn} @@ -334,19 +336,27 @@ %patch11 -p0 %patch12 -p0 # -%patch20 -p1 +%patch20 %if 0%{?suse_version} > 930 %patch23 -p0 %endif -%patch31 -p1 -%patch33 -p1 -%patch35 -p1 +%patch31 +%patch33 +%patch35 %patch36 -p0 +%patch37 %if 0%{?sles_version} == 9 %__grep -rwl '/usr/bin/python' . | xargs %__sed -i 's|/usr/bin/python|%{_usr}/bin/python2.5|g' %__grep -rwl '/usr/bin/env python' . | xargs %__sed -i 's|/usr/bin/env python|%{_usr}/bin/python2.5|g' %endif +SQLITE_RECOMMENDED_VER=$(grep -E '^SQLITE_RECOMMENDED_VER=' configure.ac|cut -f2 -d=|cut -f2 -d\") +#" +[ "$SQLITE_RECOMMENDED_VER" = "%{sqlite_version}" ] || { + echo "ERROR: recommended sqlite version is $SQLITE_RECOMMENDED_VER, but we're using %{sqlite_version}" >&2; + exit 1; +} + %build # This package failed when testing with -Wl,-as-needed being default. # So we disable it here, if you want to retest, just delete this comment and the line below. ++++++ sqlite-amalgamation-3.6.17.tar.bz2 -> sqlite-amalgamation-3.6.13.tar.bz2 ++++++ ++++ 91130 lines of diff (skipped) ++++++ subversion-1.6.9.tar.bz2 -> subversion-1.6.12.tar.bz2 ++++++ ++++ 7574 lines of diff (skipped) ++++++ subversion-ctypes-remove_shebang.patch ++++++ --- /var/tmp/diff_new_pack.SgV6bV/_old 2010-09-27 15:51:43.000000000 +0200 +++ /var/tmp/diff_new_pack.SgV6bV/_new 2010-09-27 15:51:43.000000000 +0200 @@ -1,5 +1,5 @@ ---- subversion/bindings/ctypes-python/csvn/core/__init__.py.orig 2009-03-30 15:16:52.000000000 +0200 -+++ subversion/bindings/ctypes-python/csvn/core/__init__.py 2009-03-30 15:17:11.000000000 +0200 +--- subversion/bindings/ctypes-python/csvn/core/__init__.py.orig ++++ subversion/bindings/ctypes-python/csvn/core/__init__.py @@ -1,5 +1,3 @@ -#!/home/djames/bin/python - ++++++ subversion-fix_nonvoid_function_without_return.patch ++++++ --- /var/tmp/diff_new_pack.SgV6bV/_old 2010-09-27 15:51:43.000000000 +0200 +++ /var/tmp/diff_new_pack.SgV6bV/_new 2010-09-27 15:51:43.000000000 +0200 @@ -1,6 +1,6 @@ ---- subversion/bindings/javahl/native/EnumMapper.cpp.orig 2009-04-30 01:40:36.000000000 +0200 -+++ subversion/bindings/javahl/native/EnumMapper.cpp 2009-04-30 01:40:50.000000000 +0200 -@@ -497,6 +497,7 @@ +--- subversion/bindings/javahl/native/EnumMapper.cpp.orig ++++ subversion/bindings/javahl/native/EnumMapper.cpp +@@ -497,6 +497,7 @@ jint EnumMapper::mapOperation(svn_wc_ope switch (operation) { case svn_wc_operation_none: ++++++ subversion.header_wrappers.patch ++++++ --- /var/tmp/diff_new_pack.SgV6bV/_old 2010-09-27 15:51:43.000000000 +0200 +++ /var/tmp/diff_new_pack.SgV6bV/_new 2010-09-27 15:51:43.000000000 +0200 @@ -8,8 +8,8 @@ build/generator/swig/header_wrappers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---- a/build/generator/swig/header_wrappers.py -+++ b/build/generator/swig/header_wrappers.py +--- build/generator/swig/header_wrappers.py.orig ++++ build/generator/swig/header_wrappers.py @@ -239,7 +239,7 @@ class Generator(generator.swig.Generator self.proxy_filename(base_fname)) ++++++ subversion.java14.patch ++++++ --- /var/tmp/diff_new_pack.SgV6bV/_old 2010-09-27 15:51:43.000000000 +0200 +++ /var/tmp/diff_new_pack.SgV6bV/_new 2010-09-27 15:51:43.000000000 +0200 @@ -3,9 +3,9 @@ subversion/bindings/javahl/build/build.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---- a/configure.ac -+++ b/configure.ac -@@ -539,7 +539,7 @@ fi +--- configure.ac.orig ++++ configure.ac +@@ -781,7 +781,7 @@ fi AC_PATH_PROGS(PYTHON, "$PYTHON", none) # The minimum version for the JVM runtime for our Java bytecode. @@ -14,8 +14,8 @@ # SVN_CHECK_JDK sets $JAVA_CLASSPATH SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER) ---- a/subversion/bindings/javahl/build/build.xml -+++ b/subversion/bindings/javahl/build/build.xml +--- subversion/bindings/javahl/build/build.xml.orig ++++ subversion/bindings/javahl/build/build.xml @@ -21,7 +21,7 @@ <target name="compile" unless="junit.path" ++++++ subversion.libtool-pie-flags.patch ++++++ --- /var/tmp/diff_new_pack.SgV6bV/_old 2010-09-27 15:51:43.000000000 +0200 +++ /var/tmp/diff_new_pack.SgV6bV/_new 2010-09-27 15:51:43.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2009-03-21 11:01:46.000000000 +0100 -+++ Makefile.in 2009-03-21 11:06:08.000000000 +0100 -@@ -163,42 +163,45 @@ +--- Makefile.in.orig ++++ Makefile.in +@@ -163,42 +163,45 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) SWIG_LDFLAGS = @SWIG_LDFLAGS@ $(EXTRA_SWIG_LDFLAGS) ++++++ subversion.libtool-verbose.patch ++++++ --- /var/tmp/diff_new_pack.SgV6bV/_old 2010-09-27 15:51:43.000000000 +0200 +++ /var/tmp/diff_new_pack.SgV6bV/_new 2010-09-27 15:51:43.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2009-03-21 11:08:29.000000000 +0100 -+++ Makefile.in 2009-03-21 11:08:46.000000000 +0100 -@@ -103,8 +103,8 @@ +--- Makefile.in.orig ++++ Makefile.in +@@ -103,8 +103,8 @@ EXEEXT = @EXEEXT@ SHELL = @SHELL@ LIBTOOL = @SVN_LIBTOOL@ ++++++ subversion-no-build-date.patch ++++++ --- subversion/libsvn_subr/opt.c.orig +++ subversion/libsvn_subr/opt.c @@ -965,9 +965,8 @@ svn_opt__print_version_info(const char * if (quiet) return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER); - SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n" - " compiled %s, %s\n\n"), pgm_name, - SVN_VERSION, __DATE__, __TIME__)); + SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n\n"), pgm_name, + SVN_VERSION)); SVN_ERR(svn_cmdline_fputs(_("Copyright (C) 2000-2009 CollabNet.\n" "Subversion is open source software, see" " http://subversion.tigris.org/\n" ++++++ subversion.perl.LD_RUN_PATH.patch ++++++ --- /var/tmp/diff_new_pack.SgV6bV/_old 2010-09-27 15:51:43.000000000 +0200 +++ /var/tmp/diff_new_pack.SgV6bV/_new 2010-09-27 15:51:43.000000000 +0200 @@ -6,9 +6,9 @@ Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/Makefile.in -+++ b/Makefile.in -@@ -641,7 +641,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI +--- Makefile.in.orig ++++ Makefile.in +@@ -680,7 +680,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL ++++++ subversion-swig-perl-install_vendor.patch ++++++ --- /var/tmp/diff_new_pack.SgV6bV/_old 2010-09-27 15:51:43.000000000 +0200 +++ /var/tmp/diff_new_pack.SgV6bV/_new 2010-09-27 15:51:43.000000000 +0200 @@ -1,9 +1,9 @@ Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/Makefile.in -+++ b/Makefile.in -@@ -652,7 +652,7 @@ check-swig-pl: swig-pl swig-pl-lib +--- Makefile.in.orig ++++ Makefile.in +@@ -691,7 +691,7 @@ check-swig-pl: swig-pl swig-pl-lib cd $(SWIG_PL_DIR)/native; $(MAKE) test install-swig-pl: swig-pl install-swig-pl-lib ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patch for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package patch for openSUSE:Factory checked in at Mon Sep 27 15:51:14 CEST 2010. -------- --- patch/patch.changes 2010-05-05 01:37:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/patch/patch.changes 2010-07-02 08:57:54.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 2 06:57:49 UTC 2010 - jengelh(a)medozas.de + +- Use %_smp_mflags + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patch.spec ++++++ --- /var/tmp/diff_new_pack.F5k78c/_old 2010-09-27 15:51:02.000000000 +0200 +++ /var/tmp/diff_new_pack.F5k78c/_new 2010-09-27 15:51:02.000000000 +0200 @@ -25,7 +25,7 @@ Group: Productivity/Text/Utilities AutoReqProv: on Version: 2.6.1.81 -Release: 1 +Release: 4 Summary: GNU patch Source: ftp://alpha.gnu.org/gnu/patch/patch-%version%hash.tar.bz2 Patch: unified-reject-files-compat.diff @@ -49,7 +49,7 @@ %build CFLAGS="$RPM_OPT_FLAGS -Wall -O2 -pipe" \ ./configure --prefix=%{_prefix} -make %{?jobs:-j%jobs} %{verbose:V=1}; +make %{?_smp_mflags} %{verbose:V=1}; %check make check %{verbose:V=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

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 27 Sep '10

27 Sep '10

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Mon Sep 27 15:50:49 CEST 2010. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-09-03 14:11:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-09-27 15:49:17.899315000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 27 09:03:55 UTC 2010 - wittemar(a)googlemail.com + +- Split liboxygenstyle in an own package + +------------------------------------------------------------------- +Tue Sep 7 15:59:58 UTC 2010 - llunak(a)novell.com + +- DISPLAYMANAGER_ROOT_LOGIN_LOCAL in /etc/sysconfig (bnc#626433) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 New: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.rpSrx6/_old 2010-09-27 15:49:46.000000000 +0200 +++ /var/tmp/diff_new_pack.rpSrx6/_new 2010-09-27 15:49:46.000000000 +0200 @@ -31,7 +31,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.5.1 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.rpSrx6/_old 2010-09-27 15:49:46.000000000 +0200 +++ /var/tmp/diff_new_pack.rpSrx6/_new 2010-09-27 15:49:46.000000000 +0200 @@ -22,16 +22,12 @@ BuildRequires: libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel BuildRequires: audit-devel libQtWebKit-devel libsoprano-devel pam-devel soprano-backend-redland BuildRequires: libdbusmenu-qt-devel libkdepimlibs4-devel -%if %suse_version > 1100 +BuildRequires: libqalculate-devel BuildRequires: google-gadgets-devel -%endif -%if %suse_version > 1030 -BuildRequires: ConsoleKit-devel gpsd-devel liblazy-devel +BuildRequires: ConsoleKit-devel fdupes gpsd-devel liblazy liblazy-devel %ifnarch s390 s390x BuildRequires: libsensors4-devel %endif -%endif -BuildRequires: ConsoleKit-devel fdupes liblazy libusb-devel %if %suse_version > 1110 Requires: polkit-kde-1 %endif @@ -40,7 +36,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.5.1 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd Source2: titlebar_decor.png @@ -91,6 +87,7 @@ Patch211: disable-python-support.diff Patch212: build-final.diff Requires: kde4-kgreeter-plugins = %version +Requires: kdebase4-workspace-liboxygenstyle = %version %kde4_runtime_requires %if %suse_version == 1110 Requires: %name-branding = 11.1 @@ -495,6 +492,22 @@ %postun -n kdm -p /sbin/ldconfig +%package liboxygenstyle +License: GPLv2+ +Requires: kdebase4-workspace = %version +Summary: The Libraries of the oxygen-style +Group: System/GUI/KDE + +%description liboxygenstyle +This package contains the libraries of the oxygen style. + + + +Authors: +-------- + The KDE Team <kde(a)kde.org> + + %files branding-upstream %defattr(-,root,root) %doc COPYING @@ -593,6 +606,13 @@ %defattr(-,root,root) %_kde4_modulesdir/kgreet_*.so +%files liboxygenstyle +%defattr(-,root,root) +%doc COPYING COPYING.DOC README +%_kde4_libdir/liboxygenstyle.* +%dir %_kde4_modulesdir/plugins/styles +%_kde4_modulesdir/plugins/styles/oxygen.so + %files -f filelists/exclude %defattr(-,root,root) #positives @@ -693,5 +713,8 @@ %exclude %_kde4_appsdir/kwin/cubecap.png %exclude %_kde4_appsdir/kwin/titlebar_decor.png %exclude %_kde4_appsdir/ksplash/Themes/Default +%exclude %_kde4_libdir/liboxygenstyle.* +%exclude %_kde4_modulesdir/plugins/styles +%exclude %_kde4_modulesdir/plugins/styles/oxygen.so %changelog ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.rpSrx6/_old 2010-09-27 15:49:46.000000000 +0200 +++ /var/tmp/diff_new_pack.rpSrx6/_new 2010-09-27 15:49:46.000000000 +0200 @@ -29,7 +29,7 @@ Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ Version: 4.5.1 -Release: 1 +Release: 2 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} ++++++ baselibs.conf ++++++ kdebase4-workspace-liboxygenstyle ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.rpSrx6/_old 2010-09-27 15:49:46.000000000 +0200 +++ /var/tmp/diff_new_pack.rpSrx6/_new 2010-09-27 15:49:46.000000000 +0200 @@ -1,6 +1,6 @@ ---- kdm/config.def -+++ kdm/config.def -@@ -168,6 +168,9 @@ +--- kdm/config.def.sav 2009-08-27 10:17:39.000000000 +0200 ++++ kdm/config.def 2010-08-31 14:24:02.948540554 +0200 +@@ -166,6 +166,9 @@ Core config for 1st local display [X-:0-Core] @@ -10,7 +10,7 @@ Greeter config for 1st local display [X-:0-Greeter] </kdmrc> -@@ -791,6 +794,21 @@ +@@ -791,6 +794,21 @@ Description: <emphasis>Do not</emphasis> change it, you may interfere with future upgrades and this could result in &kdm; failing to run. @@ -32,7 +32,7 @@ Key: PAMService If: defined(USE_PAM) Type: string -@@ -873,10 +891,10 @@ +@@ -873,10 +891,10 @@ Description: Key: PidFile Type: string @@ -46,7 +46,7 @@ Comment: Where &kdm; should store its PID (do not store if empty). Description: -@@ -900,10 +918,10 @@ +@@ -900,10 +918,10 @@ Description: Key: AuthDir Type: path # differs from XDM @@ -60,7 +60,7 @@ Comment: Where to store authorization files. Description: -@@ -929,7 +947,7 @@ +@@ -929,7 +947,7 @@ Description: Key: ExportList Type: list @@ -69,7 +69,7 @@ User: core Instance: #"LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR" Merge: xdm(P_list) -@@ -1073,9 +1091,10 @@ +@@ -1062,9 +1080,10 @@ Description: Key: Enable Type: bool @@ -81,7 +81,7 @@ Comment: & Description: Whether &kdm; should listen to incoming &XDMCP; requests. -@@ -1096,7 +1115,7 @@ +@@ -1085,7 +1104,7 @@ Description: Key: KeyFile Type: string @@ -90,7 +90,7 @@ User: core Instance: #KDMCONF "/kdmkeys" Update: cp_keyfile -@@ -1112,11 +1131,10 @@ +@@ -1101,11 +1120,10 @@ Description: Key: Xaccess Type: string # differs from xdm @@ -105,7 +105,7 @@ Comment: &XDMCP; access control file in the usual XDM-Xaccess format. Description: -@@ -1174,13 +1192,11 @@ +@@ -1163,13 +1181,11 @@ Description: Key: Willing Type: string @@ -121,7 +121,7 @@ Comment: The program which is invoked to dynamically generate replies to &XDMCP; DirectQuery or BroadcastQuery requests. -@@ -1254,7 +1270,7 @@ +@@ -1243,7 +1259,7 @@ Type: enum None/BO_NONE: no boot manager Grub/BO_GRUB: Grub boot manager Lilo/BO_LILO: Lilo boot manager (Linux on i386 & x86-64 only) @@ -130,7 +130,7 @@ User: core User: greeter Instance: #Grub -@@ -1356,7 +1372,7 @@ +@@ -1345,7 +1361,7 @@ Type: string Default: DEF_SERVER_CMD DDefault: - User: core @@ -139,7 +139,7 @@ Update: upd_servercmd Comment: The command line to start the &X-Server;, without display number and VT spec. -@@ -1369,13 +1385,13 @@ +@@ -1355,13 +1371,13 @@ Description: This string is subject to word splitting. </para><para> The default is something reasonable for the system on which &kdm; was built, @@ -155,7 +155,7 @@ Comment: & Description: Additional arguments for the &X-Server;s for local sessions. -@@ -1474,6 +1490,8 @@ +@@ -1451,6 +1467,8 @@ Type: bool Default: false User: core Instance: #:*/! @@ -164,7 +164,7 @@ Merge: xdm Comment: Restart instead of resetting the local &X-Server; after session exit. -@@ -1572,11 +1590,10 @@ +@@ -1549,11 +1567,10 @@ Description: Key: Resources # XXX strictly speaking this is supposed to be a string list, i think. Type: string @@ -178,7 +178,7 @@ Comment: Specify a file with X-resources for the greeter, chooser and background. The KDE frontend does not use this file, so you do not need it unless you -@@ -1604,12 +1621,11 @@ +@@ -1581,12 +1598,11 @@ Description: Key: Setup Type: string @@ -193,7 +193,7 @@ Comment: A program to run before the greeter is shown. Can be used to start an xconsole or an alternative background generator. Subject to word splitting. -@@ -1625,12 +1641,11 @@ +@@ -1602,12 +1618,11 @@ Description: Key: Startup Type: string @@ -208,7 +208,7 @@ Comment: A program to run before a user session starts. Subject to word splitting. Description: -@@ -1643,12 +1658,11 @@ +@@ -1620,12 +1635,11 @@ Description: Key: Reset Type: string @@ -223,7 +223,7 @@ Comment: A program to run after a user session exits. Subject to word splitting. Description: -@@ -1661,12 +1675,12 @@ +@@ -1638,12 +1652,12 @@ Description: Key: Session Type: string @@ -238,7 +238,7 @@ Comment: The program which is run as the user which logs in. It is supposed to interpret the session argument (see SessionsDirs) and start an appropriate -@@ -1778,10 +1792,11 @@ +@@ -1755,10 +1769,11 @@ Description: Key: AllowRootLogin Type: bool @@ -252,7 +252,7 @@ Merge: xdm Comment: Allow root logins? -@@ -1796,6 +1811,7 @@ +@@ -1773,6 +1788,7 @@ User: core # sensible? Instance: */false Instance: :*/true @@ -260,7 +260,7 @@ Merge: xdm Comment: Allow to log in, when user has set an empty password? -@@ -1807,12 +1823,13 @@ +@@ -1784,12 +1800,13 @@ Type: enum None/SHUT_NONE: no <guilabel>Shutdown...</guilabel> menu entry is shown at all Root/SHUT_ROOT: the <systemitem class="username">root</systemitem> password must be entered to shut down All/SHUT_ALL: everybody can shut down the machine @@ -277,7 +277,7 @@ Comment: & Description: Who is allowed to shut down the system. This applies both to the -@@ -1902,6 +1919,7 @@ +@@ -1866,6 +1883,7 @@ Type: bool Default: false User: dep Instance: #:0/true @@ -285,7 +285,7 @@ Comment: & Description: Enable automatic login. <emphasis>Use with extreme care!</emphasis> -@@ -1935,7 +1953,7 @@ +@@ -1899,7 +1917,7 @@ Default: "" PostProc: PautoLoginX User: core(autoUser) User: greeter @@ -294,7 +294,7 @@ Merge: xdm:autoUser(P_autoUser) Comment: & Description: -@@ -1966,10 +1984,10 @@ +@@ -1930,10 +1948,10 @@ Description: Key: SessionsDirs Type: list @@ -307,7 +307,7 @@ Update: upd_sessionsdirs Comment: The directories containing session type definitions in .desktop format, -@@ -2038,7 +2056,7 @@ +@@ -2002,7 +2020,7 @@ Description: Key: UseSessReg Type: bool @@ -316,7 +316,7 @@ User: core Instance: #*/! Comment: -@@ -2084,7 +2102,8 @@ +@@ -2048,7 +2066,8 @@ Type: enum Clock/LOGO_CLOCK: a neat analog clock Default: Clock User: greeter @@ -326,7 +326,7 @@ Comment: What should be shown in the greeter's logo are: Description: -@@ -2300,7 +2319,7 @@ +@@ -2264,7 +2283,7 @@ Description: Key: HiddenUsers Type: list @@ -335,7 +335,7 @@ User: greeter-c(noUsers) Instance: #*/"root" # depends on {Min,Max}ShowUID -@@ -2446,7 +2465,7 @@ +@@ -2408,7 +2427,7 @@ Description: Key: UseBackground Type: bool @@ -344,7 +344,7 @@ User: greeter Instance: #*/! Comment: -@@ -2606,6 +2625,7 @@ +@@ -2546,6 +2565,7 @@ Type: bool Default: false User: greeter Instance: :0/true @@ -352,7 +352,7 @@ Comment: Enable &kdm;'s built-in xconsole. Note that this can be enabled for only one display at a time. -@@ -2694,9 +2714,9 @@ +@@ -2634,9 +2654,9 @@ Description: Key: Preloader Type: string @@ -364,7 +364,7 @@ Update: upd_preloader Comment: & Description: -@@ -2706,7 +2726,7 @@ +@@ -2646,7 +2666,7 @@ Description: Key: UseTheme Type: bool @@ -373,7 +373,7 @@ User: greeter Instance: */true Comment: & -@@ -2715,9 +2735,10 @@ +@@ -2655,9 +2675,10 @@ Description: Key: Theme Type: string @@ -602,11 +602,9 @@ static Entry * findGEnt(int id) { -Index: kdm/kfrontend/read_sysconfig.sh -=================================================================== ---- /dev/null -+++ kdm/kfrontend/read_sysconfig.sh -@@ -0,0 +1,155 @@ +--- kdm/kfrontend/read_sysconfig.sh.sav 2010-08-31 14:24:02.949538639 +0200 ++++ kdm/kfrontend/read_sysconfig.sh 2010-08-31 17:32:11.866195161 +0200 +@@ -0,0 +1,160 @@ +#!/bin/bash +# +# Copyright (c) 2006 SUSE Linux Products GmbH Nuernberg, Germany. @@ -644,7 +642,12 @@ +# Set Style of Shutdown +# +ECHO_MODE="OneStar" -+ALLOW_ROOT_LOGIN="true" ++if test "$DISPLAYMANAGER_ROOT_LOGIN_LOCAL" = "yes"; then ++ ALLOW_ROOT_LOGIN="true" ++else ++ ALLOW_ROOT_LOGIN="false" ++fi ++ +case "$DISPLAYMANAGER_SHUTDOWN" in + all|ALL|All) + DISPLAYMANAGER_SHUTDOWN=All;; ++++++ sysconfig.displaymanager-kdm ++++++ --- /var/tmp/diff_new_pack.rpSrx6/_old 2010-09-27 15:49:46.000000000 +0200 +++ /var/tmp/diff_new_pack.rpSrx6/_new 2010-09-27 15:49:46.000000000 +0200 @@ -32,3 +32,13 @@ # window is used (which lacks some features) # DISPLAYMANAGER_KDM_THEME="oxygen-air" + +## Type: yesno +## Default: yes +# +# Allow local access of the user root to your display manager. Note +# that root can never login if DISPLAYMANAGER_SHUTDOWN is "auto" and +# System/Security/Permissions/PERMISSION_SECURITY is "paranoid". +# This settings currently works only with KDM. +# +DISPLAYMANAGER_ROOT_LOGIN_LOCAL="yes" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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